Merge branch 'master' into feat/dark-mode-enhancement

yieldprotocol · Mar 15, 2023 · 02aa8e4 · 02aa8e4
2 parents 53b9300 + ad9afa5
commit 02aa8e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/components/views/Borrow.tsx b/src/components/views/Borrow.tsx
@@ -60,7 +60,8 @@ const Borrow = () => {
 
   /* STATE FROM CONTEXT */
   const { userState, userActions } = useContext(UserContext);
-  const { assetMap, vaultMap, seriesMap, selectedSeries, selectedIlk, selectedBase, selectedVault } = userState;
+  const { assetMap, vaultMap, vaultsLoading, seriesMap, selectedSeries, selectedIlk, selectedBase, selectedVault } =
+    userState;
   const { setSelectedIlk } = userActions;
 
   const { address: activeAccount } = useAccountPlus();
@@ -549,7 +550,9 @@ const Borrow = () => {
               borrowProcess?.tx.status === TxState.SUCCESSFUL && (
                 <Box pad="large" gap="small">
                   <Text size="small"> View Vault: </Text>
-                  {vaultToUse && <VaultItem vault={vaultMap?.get(vaultToUse.id)!} condensed index={1} />}
+                  {vaultToUse && !vaultsLoading && (
+                    <VaultItem vault={vaultMap?.get(vaultToUse.id)!} condensed index={1} />
+                  )}
                   {!vaultToUse && newVaultId && (
                     <DummyVaultItem series={selectedSeries!} vaultId={newVaultId!} condensed />
                   )}

diff --git a/src/hooks/useInputValidation.ts b/src/hooks/useInputValidation.ts
@@ -33,7 +33,8 @@ export const useInputValidation = (
       const _inputAsFloat = parseFloat(input);
       const aboveMax: boolean = !!limits[1] && _inputAsFloat > parseFloat(limits[1].toString());
       const belowMin: boolean = !!limits[0] && _inputAsFloat < parseFloat(limits[0].toString());
-      const aboveUserBalance: boolean = aboveMax && !protocolLimited
+      const aboveUserBalance: boolean = aboveMax && !protocolLimited;
+      const aboveProtocolLendLimit: boolean = aboveMax && protocolLimited;
 
       // General input validation here:
       if (parseFloat(input) < 0 && actionCode !== ActionCodes.TRANSFER_VAULT) {
@@ -90,7 +91,7 @@ export const useInputValidation = (
 
         case ActionCodes.LEND:
           aboveUserBalance && setInputError('Amount exceeds available balance');
-          protocolLimited && setInputError('Amount exceeds the maximum you can lend');
+          aboveProtocolLendLimit && setInputError('Amount exceeds the maximum you can lend');
           belowMin && setInputError('Amount should be expressed as a positive value');
           break;