Merge pull request #88 from HaloDAO/develop

Fix: Approve button, viewOriginSwap without approval, copy change
xave-finance · Sep 15, 2021 · e4d730c · e4d730c
2 parents 33fde6a + 0c48d26
commit e4d730c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/pages/Tailwind/Swap/SwapPanel.tsx b/src/pages/Tailwind/Swap/SwapPanel.tsx
@@ -335,14 +335,12 @@ const SwapPanel = () => {
                 value={fromInputValue}
                 canSelectToken={false}
                 didChangeValue={async val => {
-                  if (approveState === ApproveButtonState.Approved) {
-                    if (parseFloat(fromAmountBalance) >= parseFloat(val)) {
-                      setButtonState(SwapButtonState.Swap)
-                    } else if (parseFloat(fromAmountBalance) < parseFloat(val)) {
-                      setButtonState(SwapButtonState.InsufficientBalance)
-                    }
-                    getMinimumAmount(val, CurrencySide.TO_CURRENCY)
+                  if (parseFloat(fromAmountBalance) >= parseFloat(val)) {
+                    setButtonState(SwapButtonState.Swap)
+                  } else if (parseFloat(fromAmountBalance) < parseFloat(val)) {
+                    setButtonState(SwapButtonState.InsufficientBalance)
                   }
+                  getMinimumAmount(val, CurrencySide.TO_CURRENCY)
 
                   setFromInputValue(val)
                 }}

diff --git a/src/pages/Tailwind/Swap/modals/SwapTransactionModal.tsx b/src/pages/Tailwind/Swap/modals/SwapTransactionModal.tsx
@@ -165,7 +165,7 @@ const SwapTransactionModal = ({
             target="_blank"
             rel="noopener noreferrer"
           >
-            View on Etherscan
+            View on {chainId === ChainId.MATIC ? 'Chain Explorer' : 'Etherscan'}
           </a>
         </div>
         <div className="mt-12">