Merge pull request #1168 from yieldprotocol/feat/issues-1167-1166

remove collateral text, banner fix
yieldprotocol · Mar 23, 2023 · b987766 · b987766
2 parents 195dab7 + c6c8450
commit b987766
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 80 deletions.
diff --git a/src/components/FooterInfo.tsx b/src/components/FooterInfo.tsx
@@ -27,92 +27,92 @@ const FooterInfo = () => {
 
   return (
     <>
-
-    <Box gap="small" align="end" style={{ position: 'absolute', bottom: '3em', right: '3em' }}>
+      <Box gap="small" align="end" width="20%" style={{ position: 'absolute', bottom: '3em', right: '3em' }}>
+        <Box alignSelf="end" width="225px">
+          <PublicNotification />{' '}
+        </Box>
+        <Box alignSelf="end">
+          <Text size="xsmall" color="text-weak">
+            App version: v{process.env.REACT_APP_VERSION}
+          </Text>
+        </Box>
+        <Box direction="row" gap={IconGap}>
+          <BoxWrap>
+            <Tip content={<Text size="small">Github</Text>}>
+              <Anchor
+                color="text-weak"
+                href="https://github.com/yieldprotocol"
+                target="_blank"
+                onClick={() => handleExternal('Github')}
+              >
+                <Github size={IconSize} />
+              </Anchor>
+            </Tip>
+          </BoxWrap>
 
-      <Box width='50%' alignSelf="end"><PublicNotification /> </Box>
-      <Box alignSelf="end">
-        <Text size="xsmall" color="text-weak">
-          App version: v{process.env.REACT_APP_VERSION}
-        </Text>
-      </Box>
-      <Box direction="row" gap={IconGap}>
-        <BoxWrap>
-          <Tip content={<Text size="small">Github</Text>}>
-            <Anchor
-              color="text-weak"
-              href="https://github.com/yieldprotocol"
-              target="_blank"
-              onClick={() => handleExternal('Github')}
-            >
-              <Github size={IconSize} />
-            </Anchor>
-          </Tip>
-        </BoxWrap>
+          <BoxWrap>
+            <Tip content={<Text size="small">Docs</Text>}>
+              <Anchor
+                color="text-weak"
+                href="http://docs.yieldprotocol.com"
+                target="_blank"
+                onClick={() => handleExternal('Docs')}
+              >
+                <Docs size={IconSize} />
+              </Anchor>
+            </Tip>
+          </BoxWrap>
 
-        <BoxWrap>
-          <Tip content={<Text size="small">Docs</Text>}>
-            <Anchor
-              color="text-weak"
-              href="http://docs.yieldprotocol.com"
-              target="_blank"
-              onClick={() => handleExternal('Docs')}
-            >
-              <Docs size={IconSize} />
-            </Anchor>
-          </Tip>
-        </BoxWrap>
+          <BoxWrap>
+            <Tip content={<Text size="small">Discord</Text>}>
+              <Anchor
+                color="text-weak"
+                href="https://discord.gg/JAFfDj5"
+                target="_blank"
+                onClick={() => handleExternal('Discord')}
+              >
+                <Discord size={IconSize} />
+              </Anchor>
+            </Tip>
+          </BoxWrap>
 
-        <BoxWrap>
-          <Tip content={<Text size="small">Discord</Text>}>
-            <Anchor
-              color="text-weak"
-              href="https://discord.gg/JAFfDj5"
-              target="_blank"
-              onClick={() => handleExternal('Discord')}
-            >
-              <Discord size={IconSize} />
-            </Anchor>
-          </Tip>
-        </BoxWrap>
+          <BoxWrap>
+            <Tip content={<Text size="small">Ts&Cs</Text>}>
+              <Anchor
+                color="text-weak"
+                href="https://yieldprotocol.com/terms/"
+                target="_blank"
+                onClick={() => handleExternal('Terms')}
+              >
+                <Terms size={IconSize} />
+              </Anchor>
+            </Tip>
+          </BoxWrap>
 
-        <BoxWrap>
-          <Tip content={<Text size="small">Ts&Cs</Text>}>
-            <Anchor
-              color="text-weak"
-              href="https://yieldprotocol.com/terms/"
-              target="_blank"
-              onClick={() => handleExternal('Terms')}
-            >
-              <Terms size={IconSize} />
-            </Anchor>
-          </Tip>
-        </BoxWrap>
+          <BoxWrap>
+            <Tip content={<Text size="small">Privacy</Text>}>
+              <Anchor
+                color="text-weak"
+                href="https://yieldprotocol.com/privacy/"
+                target="_blank"
+                onClick={() => handleExternal('Privacy')}
+              >
+                <Privacy size={IconSize} />
+              </Anchor>
+            </Tip>
+          </BoxWrap>
 
-        <BoxWrap>
-          <Tip content={<Text size="small">Privacy</Text>}>
-            <Anchor
-              color="text-weak"
-              href="https://yieldprotocol.com/privacy/"
-              target="_blank"
-              onClick={() => handleExternal('Privacy')}
-            >
-              <Privacy size={IconSize} />
-            </Anchor>
-          </Tip>
-        </BoxWrap>
+          <BoxWrap>
+            <Tip content={<Text size="small">Export Contract Addresses</Text>}>
+              <Anchor color="text-weak" target="_blank" onClick={() => exportContractAddresses()}>
+                <FiDownload size={IconSize} />
+              </Anchor>
+            </Tip>
+          </BoxWrap>
+        </Box>
 
-        <BoxWrap>
-          <Tip content={<Text size="small">Export Contract Addresses</Text>}>
-            <Anchor color="text-weak" target="_blank" onClick={() => exportContractAddresses()}>
-              <FiDownload size={IconSize} />
-            </Anchor>
-          </Tip>
-        </BoxWrap>
+        <NetworkSelector />
       </Box>
-
-      <NetworkSelector />
-    </Box>
     </>
   );
 };

diff --git a/src/components/views/VaultPosition.tsx b/src/components/views/VaultPosition.tsx
@@ -752,7 +752,8 @@ const VaultPosition = () => {
                         {!removeCollatInput ? (
                           <InputInfoWrap action={() => handleMaxAction(ActionCodes.REMOVE_COLLATERAL)}>
                             <Text size="xsmall" color="text-weak">
-                              Remove all collateral ({cleanValue(maxRemovableCollateral, 6)} {vaultIlk?.displaySymbol!})
+                              Remove excess collateral ({cleanValue(maxRemovableCollateral, 6)}{' '}
+                              {vaultIlk?.displaySymbol!})
                             </Text>
                           </InputInfoWrap>
                         ) : (