From 31a9bd2efa39677543a4f3d77c77d3ac83704564 Mon Sep 17 00:00:00 2001
From: "kody.low" <kodylow7@gmail.com>
Date: Fri, 16 Aug 2024 11:46:22 -0700
Subject: [PATCH 1/3] fix: rename mprocs to docker where docker used

---
 JUSTFILE                        | 4 ++--
 README.md                       | 6 +++---
 mprocs.yml => mprocs-docker.yml | 0
 package.json                    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename mprocs.yml => mprocs-docker.yml (100%)

diff --git a/JUSTFILE b/JUSTFILE
index df192aa9..5e235c02 100644
--- a/JUSTFILE
+++ b/JUSTFILE
@@ -1,7 +1,7 @@
 default:
   @just --list
-mprocs:
-    mprocs -c mprocs.yml
+docker:
+    mprocs -c mprocs-docker.yml
 rotate:
     mprocs -c mprocs-rotate.yml
 restart:
diff --git a/README.md b/README.md
index 284008c5..3a7fa7b6 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ Replace `-p 3000:3000` with a port of your choice, `REACT_APP_FM_GATEWAY_API` wi
 ## Development
 
 The development password for the gateway is `thereisnosecondbest`.
-The development password for the guardians when using the `nix-gateway` or `mprocs` development environments is `pass`.
+The development password for the guardians when using the `nix-gateway` or `docker` development environments is `pass`.
 
 ### Option 1 - Running with Nix (preferred)
 
@@ -146,11 +146,11 @@ nix-guardian spins up these instances
 | guardian-ui-3 | http://127.0.0.1:3002/ |
 | guardian-ui-4 | http://127.0.0.1:3003/ |
 
-### Option 2 - Running with mprocs
+### Option 2 - Running with docker
 
 1. Install [mprocs](https://github.com/pvolok/mprocs)
 1. In terminal `cd` to the fedimint-ui repo root directory and run `yarn install`
-1. Run `yarn mprocs`
+1. Run `yarn docker`
 
 After running this command, you'll be present with the mprocs display. Along the left side are the list of processes currently available by mprocs. Along the bottom are hotkeys for navigating/interacting with mprocs. The main pane shows the shell output for the currently selected process.
 
diff --git a/mprocs.yml b/mprocs-docker.yml
similarity index 100%
rename from mprocs.yml
rename to mprocs-docker.yml
diff --git a/package.json b/package.json
index b847dd03..3bf1cee4 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
     "prepare": "husky install",
     "nix-guardian": "./scripts/mprocs-nix.sh run-ui mprocs-nix-guardian.yml",
     "nix-gateway": "./scripts/mprocs-nix.sh dev-fed mprocs-nix-gateway.yml",
-    "mprocs": "mprocs -c ./mprocs.yml",
+    "docker": "mprocs -c ./mprocs-docker.yml",
     "translate": "node scripts/translate.js"
   },
   "devDependencies": {

From 1b4f3d4328b52270f3e1e650af72c69d3d7e36f9 Mon Sep 17 00:00:00 2001
From: "kody.low" <kodylow7@gmail.com>
Date: Fri, 16 Aug 2024 14:29:12 -0700
Subject: [PATCH 2/3] fix: show federation name option for solo feds

---
 .../FederationSettingsForm.tsx                | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/apps/guardian-ui/src/components/setup/screens/setConfiguration/FederationSettingsForm.tsx b/apps/guardian-ui/src/components/setup/screens/setConfiguration/FederationSettingsForm.tsx
index 051e044a..fa44aedc 100644
--- a/apps/guardian-ui/src/components/setup/screens/setConfiguration/FederationSettingsForm.tsx
+++ b/apps/guardian-ui/src/components/setup/screens/setConfiguration/FederationSettingsForm.tsx
@@ -43,7 +43,7 @@ export const FederationSettingsForm: React.FC<FederationSettingsFormProps> = ({
       title={`${t('set-config.federation-settings')}`}
       isOpen={true}
     >
-      {isHost && (
+      {!isFollower && (
         <>
           <FormControl>
             <FormLabel>{t('set-config.federation-name')}</FormLabel>
@@ -52,19 +52,21 @@ export const FederationSettingsForm: React.FC<FederationSettingsFormProps> = ({
               onChange={handleChangeFederationName}
             />
           </FormControl>
-          <FormControl>
-            <FormLabel>{t('set-config.guardian-number')}</FormLabel>
-            <Select
-              value={numPeers}
-              onChange={(e) => setNumPeers(e.target.value)}
-            >
-              {BFT_NUMBERS.map((num) => (
-                <option key={num} value={num.toString()}>
-                  {num}
-                </option>
-              ))}
-            </Select>
-          </FormControl>
+          {isHost && (
+            <FormControl>
+              <FormLabel>{t('set-config.guardian-number')}</FormLabel>
+              <Select
+                value={numPeers}
+                onChange={(e) => setNumPeers(e.target.value)}
+              >
+                {BFT_NUMBERS.map((num) => (
+                  <option key={num} value={num.toString()}>
+                    {num}
+                  </option>
+                ))}
+              </Select>
+            </FormControl>
+          )}
           <BftInfo numPeers={parseInt(numPeers)} />
         </>
       )}

From 7263af4df24d74df95ae19baa48ab7fc42df7a1c Mon Sep 17 00:00:00 2001
From: Stephen DeLorme <stephen@d.elor.me>
Date: Fri, 16 Aug 2024 17:54:46 -0400
Subject: [PATCH 3/3] feat: reduce gateway login width

---
 packages/ui/src/Login.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ui/src/Login.tsx b/packages/ui/src/Login.tsx
index 08cbcb7f..2661a5c5 100644
--- a/packages/ui/src/Login.tsx
+++ b/packages/ui/src/Login.tsx
@@ -62,7 +62,7 @@ export const Login: React.FC<LoginProps> = ({
             {t('login.subtitle')}
           </Text>
         </Flex>
-        <FormControl isInvalid={!!error}>
+        <FormControl isInvalid={!!error} maxW='480px'>
           <FormLabel>{t('login.password')}</FormLabel>
           <InputGroup size='md'>
             <Input