Merge pull request #249 from harvestfi/custom-token-output

fix: fix not found issue and convert&revert issue
harvestfi · May 9, 2024 · a540218 · a540218
2 parents d31350f + a497ad1
commit a540218
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 24 deletions.
diff --git a/src/components/AdvancedFarmComponents/Deposit/DepositBase/index.js b/src/components/AdvancedFarmComponents/Deposit/DepositBase/index.js
@@ -72,7 +72,6 @@ const DepositBase = ({
   pricePerFullShare,
   setInputAmount,
   token,
-  supTokenList,
   switchMethod,
   tokenSymbol,
   useIFARM,
@@ -339,9 +338,8 @@ const DepositBase = ({
         toast.error('Please choose your Output Token.')
         return
       }
-      const supToken = supTokenList.find(el => el.symbol === pickedToken.symbol)
-      if (!hasPortalsError && !supToken) {
-        toast.error("Can't Deposit with Unsupported token!")
+      if (!hasPortalsError) {
+        toast.error('There was an error on Portals Service!')
         return
       }
       if (new BigNumber(inputAmount).isGreaterThan(new BigNumber(balance))) {

diff --git a/src/components/AdvancedFarmComponents/Deposit/SelectTokenList/index.js b/src/components/AdvancedFarmComponents/Deposit/SelectTokenList/index.js
@@ -29,6 +29,7 @@ const SelectTokenList = ({
 }) => {
   const { fontColor, fontColor2, hoverColor, activeColorModal } = useThemeContext()
   const [showList, setShowList] = useState(false)
+  const [curSupportedVault, setCurSupportedVault] = useState(supportedVault)
   const { chainId } = useWallet()
   const { getPortalsToken } = usePortals()
 
@@ -76,7 +77,9 @@ const SelectTokenList = ({
       if (supTokenNoBalanceList && balanceList && filterWord !== undefined && filterWord !== '') {
         const ethereumAddressRegex = /^(0x)?[0-9a-fA-F]{40}$/
         if (ethereumAddressRegex.test(filterWord)) {
-          let TokenDetail = {}
+          let TokenDetail = {},
+            defaultTokenInvolve = false,
+            balanceListInvolve = false
           try {
             TokenDetail = (await getPortalsToken(chainId, filterWord)) || {}
           } catch (e) {
@@ -94,8 +97,10 @@ const SelectTokenList = ({
             }
           }
           if (Object.keys(TokenDetail).length !== 0) {
+            setCurSupportedVault(true)
             if (!(Object.keys(defaultToken).length === 0 && defaultToken.constructor === Object)) {
               if (defaultToken.symbol.includes(TokenDetail.symbol.toLowerCase().trim())) {
+                defaultTokenInvolve = true
                 setDefaultCurToken(defaultToken)
               } else {
                 setDefaultCurToken(null)
@@ -105,6 +110,9 @@ const SelectTokenList = ({
               const newList = balanceList.filter(el =>
                 el.symbol.toLowerCase().includes(TokenDetail.symbol.toLowerCase().trim()),
               )
+              if (newList.length > 0) {
+                balanceListInvolve = true
+              }
               setBalanceTokenList(newList)
             }
             if (defaultCurToken === null) {
@@ -116,6 +124,16 @@ const SelectTokenList = ({
             } else {
               setSupTokenList([])
             }
+            if (supTokenNoBalanceList.length !== 0 && !defaultTokenInvolve && !balanceListInvolve) {
+              const newList = supTokenNoBalanceList.filter(el =>
+                el.symbol.toLowerCase().includes(TokenDetail.symbol.toLowerCase().trim()),
+              )
+              if (newList.length > 0) {
+                setSupTokenList(newList)
+              } else {
+                setSupTokenList([TokenDetail])
+              }
+            }
           } else {
             setSupTokenList([])
             if (!(Object.keys(defaultToken).length === 0 && defaultToken.constructor === Object)) {
@@ -152,7 +170,7 @@ const SelectTokenList = ({
       }
     }
     fetch()
-  }, [filterWord, supTokenNoBalanceList, balanceList, chainId]) // eslint-disable-line react-hooks/exhaustive-deps
+  }, [filterWord, supTokenNoBalanceList, balanceList, chainId, setCurSupportedVault]) // eslint-disable-line react-hooks/exhaustive-deps
 
   useEffect(() => {
     const count =
@@ -205,16 +223,16 @@ const SelectTokenList = ({
           {!hasPortalsError && balanceTokenList.length > 0 && (
             <>
               <Label fontColor={fontColor} padding="15px 24px 0px">
-                {supportedVault ? 'Supported tokens in your wallet' : 'Soon to be supported'}
+                {curSupportedVault ? 'Supported tokens in your wallet' : 'Soon to be supported'}
               </Label>
               {balanceTokenList.map((data, i) => (
                 <Container
                   key={i}
                   className={i === clickBalanceListId ? 'active' : ''}
                   onClick={() => {
-                    if (supportedVault) handleBalanceListClick(i)
+                    if (curSupportedVault) handleBalanceListClick(i)
                   }}
-                  cursor={supportedVault ? 'pointer' : 'not-allowed'}
+                  cursor={curSupportedVault ? 'pointer' : 'not-allowed'}
                   hoverColor={hoverColor}
                   activeColor={activeColorModal}
                 >
@@ -239,9 +257,9 @@ const SelectTokenList = ({
               <Label
                 fontColor={fontColor}
                 padding="15px 24px 0px"
-                showLabel={supportedVault ? 'block' : 'none'}
+                showLabel={curSupportedVault ? 'block' : 'none'}
               >
-                {supportedVault
+                {curSupportedVault
                   ? `Other supported convert tokens, which you don't have on your wallet`
                   : `Other, currently unsupported tokens, which you don't have in your wallet`}
               </Label>
@@ -250,9 +268,9 @@ const SelectTokenList = ({
                   key={i}
                   className={i === clicksupTokenNoBalanceListId ? 'active' : ''}
                   onClick={() => {
-                    if (supportedVault) handleSupTokenNoBalanceListClick(i)
+                    if (curSupportedVault) handleSupTokenNoBalanceListClick(i)
                   }}
-                  cursor={supportedVault ? 'pointer' : 'not-allowed'}
+                  cursor={curSupportedVault ? 'pointer' : 'not-allowed'}
                   hoverColor={hoverColor}
                   activeColor={activeColorModal}
                 >

diff --git a/src/components/AdvancedFarmComponents/Withdraw/SelectTokenList/index.js b/src/components/AdvancedFarmComponents/Withdraw/SelectTokenList/index.js
@@ -30,6 +30,7 @@ const SelectTokenList = ({
 }) => {
   const { fontColor, fontColor2, hoverColor, activeColorModal } = useThemeContext()
   const [showList, setShowList] = useState(false)
+  const [curSupportedVault, setCurSupportedVault] = useState(supportedVault)
   const { chainId } = useWallet()
   const { getPortalsToken } = usePortals()
 
@@ -64,7 +65,9 @@ const SelectTokenList = ({
       if (supTokenNoBalanceList && balanceList && filterWord !== undefined && filterWord !== '') {
         const ethereumAddressRegex = /^(0x)?[0-9a-fA-F]{40}$/
         if (ethereumAddressRegex.test(filterWord)) {
-          let TokenDetail = {}
+          let TokenDetail = {},
+            defaultTokenInvolve = false,
+            balanceListInvolve = false
           try {
             TokenDetail = (await getPortalsToken(chainId, filterWord)) || {}
           } catch (e) {
@@ -82,8 +85,10 @@ const SelectTokenList = ({
             }
           }
           if (Object.keys(TokenDetail).length !== 0) {
+            setCurSupportedVault(true)
             if (!(Object.keys(defaultToken).length === 0 && defaultToken.constructor === Object)) {
               if (defaultToken.symbol.includes(TokenDetail.symbol.toLowerCase().trim())) {
+                defaultTokenInvolve = true
                 setDefaultCurToken(defaultToken)
               } else {
                 setDefaultCurToken(null)
@@ -93,6 +98,9 @@ const SelectTokenList = ({
               const newList = balanceList.filter(el =>
                 el.symbol.toLowerCase().includes(TokenDetail.symbol.toLowerCase().trim()),
               )
+              if (newList.length > 0) {
+                balanceListInvolve = true
+              }
               setBalanceTokenList(newList)
             }
             if (defaultCurToken === null) {
@@ -104,6 +112,16 @@ const SelectTokenList = ({
             } else {
               setSupTokenList([])
             }
+            if (supTokenNoBalanceList.length !== 0 && !defaultTokenInvolve && !balanceListInvolve) {
+              const newList = supTokenNoBalanceList.filter(el =>
+                el.symbol.toLowerCase().includes(TokenDetail.symbol.toLowerCase().trim()),
+              )
+              if (newList.length > 0) {
+                setSupTokenList(newList)
+              } else {
+                setSupTokenList([TokenDetail])
+              }
+            }
           } else {
             setSupTokenList([])
             if (!(Object.keys(defaultToken).length === 0 && defaultToken.constructor === Object)) {
@@ -196,7 +214,7 @@ const SelectTokenList = ({
           {!hasPortalsError && balanceTokenList.length > 0 && (
             <>
               <Label fontColor={fontColor} padding="15px 24px 0px">
-                {supportedVault
+                {curSupportedVault
                   ? 'Tokens in your wallet which you can revert fTokens into'
                   : 'Soon to be supported'}
               </Label>
@@ -205,9 +223,9 @@ const SelectTokenList = ({
                   key={i}
                   className={i === clickBalanceListId ? 'active' : ''}
                   onClick={() => {
-                    if (supportedVault) handleBalanceListClick(i)
+                    if (curSupportedVault) handleBalanceListClick(i)
                   }}
-                  cursor={supportedVault ? 'pointer' : 'not-allowed'}
+                  cursor={curSupportedVault ? 'pointer' : 'not-allowed'}
                   hoverColor={hoverColor}
                   activeColor={activeColorModal}
                 >
@@ -238,7 +256,7 @@ const SelectTokenList = ({
               <Label
                 fontColor={fontColor}
                 padding="15px 24px 0px"
-                showLabel={supportedVault ? 'block' : 'none'}
+                showLabel={curSupportedVault ? 'block' : 'none'}
               >
                 Other supported tokens, which you can revert to{' '}
               </Label>
@@ -247,9 +265,9 @@ const SelectTokenList = ({
                   key={i}
                   className={i === clicksupTokenNoBalanceListId ? 'active' : ''}
                   onClick={() => {
-                    if (supportedVault) handleSupTokenNoBalanceListClick(i)
+                    if (curSupportedVault) handleSupTokenNoBalanceListClick(i)
                   }}
-                  cursor={supportedVault ? 'pointer' : 'not-allowed'}
+                  cursor={curSupportedVault ? 'pointer' : 'not-allowed'}
                   hoverColor={hoverColor}
                   activeColor={activeColorModal}
                 >

diff --git a/src/components/AdvancedFarmComponents/Withdraw/WithdrawBase/index.js b/src/components/AdvancedFarmComponents/Withdraw/WithdrawBase/index.js
@@ -75,7 +75,6 @@ const WithdrawBase = ({
   lpTokenBalance,
   stakedAmount,
   token,
-  supTokenList,
   switchMethod,
   useIFARM,
   setRevertFromInfoAmount,
@@ -317,9 +316,8 @@ const WithdrawBase = ({
       toast.error('Please choose your Output Token.')
       return
     }
-    const supToken = supTokenList.find(el => el.symbol === pickedToken.symbol)
-    if (!hasPortalsError && !supToken) {
-      toast.error("Can't revert with Unsupported token!")
+    if (!hasPortalsError) {
+      toast.error('There was an error on Portals Service!')
       return
     }