Merge branch 'master' into require-5-blocks-mainnet

Kodylow · Aug 18, 2024 · 24f6f1f · 24f6f1f
2 parents 74d4c69 + 39a063c
commit 24f6f1f
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 21 deletions.
diff --git 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
@@ -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/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)} />
         </>
       )}

diff --git a/mprocs.yml → mprocs-docker.yml b/mprocs.yml → mprocs-docker.yml
diff --git 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": {

diff --git 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