Merge pull request #6039 from blockchain/fix/dex

Fix/dex

Author: jjBlockchain

packages/blockchain-wallet-v4-frontend/src/data/components/dex/sagas.ts

@@ -171,6 +171,9 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
         ) as DexSwapForm
 
         const isTokenAllowed = S.getTokenAllowanceStatus(yield select()).getOrElse(false)
+        const isTokenAllowedAfterPolling = S.getTokenAllowanceStatusAfterPolling(
+          yield select()
+        ).getOrElse(false)
 
         if (
           !formValues ||
@@ -237,7 +240,8 @@ export default ({ api, coreSagas, networks }: { api: APIType; coreSagas: any; ne
               symbol: baseToken
             },
             params: {
-              skipValidation: !isTokenAllowed && baseToken !== NATIVE_TOKEN,
+              skipValidation:
+                !isTokenAllowed && !isTokenAllowedAfterPolling && baseToken !== NATIVE_TOKEN,
               slippage: `${slippage}`
             },
             takerAddress: `${nonCustodialAddress}`,

packages/blockchain-wallet-v4-frontend/src/scenes/Dex/Swap/components/QuoteDetails/QuoteDetails.tsx

@@ -139,15 +139,15 @@ export const QuoteDetails = ({
               <Text color={SemanticColors.title} variant='paragraph2'>
                 ~
                 {Exchange.convertCoinToCoin({
-                  coin: props.swapQuote.quote.buyAmount.symbol,
-                  value: (props.swapQuote.quote.buyAmount.amount / 100) * 0.9
+                  coin: props.swapQuote.quote.sellAmount.symbol,
+                  value: (props.swapQuote.quote.sellAmount.amount / 100) * 0.9
                 })}{' '}
-                {props.swapQuote.quote.buyAmount.symbol}
+                {props.swapQuote.quote.sellAmount.symbol}
               </Text>
               <Flex>
                 ~
                 <FiatDisplay
-                  coin={props.swapQuote.quote.buyAmount.symbol}
+                  coin={props.swapQuote.quote.sellAmount.symbol}
                   currency={walletCurrency}
                   color='grey700'
                   lineHeight='150%'
@@ -157,10 +157,10 @@ export const QuoteDetails = ({
                 >
                   {Exchange.convertCoinToCoin({
                     baseToStandard: false,
-                    coin: props.swapQuote.quote.buyAmount.symbol,
+                    coin: props.swapQuote.quote.sellAmount.symbol,
                     value: Exchange.convertCoinToCoin({
-                      coin: props.swapQuote.quote.buyAmount.symbol,
-                      value: (props.swapQuote.quote.buyAmount.amount / 100) * 0.9
+                      coin: props.swapQuote.quote.sellAmount.symbol,
+                      value: (props.swapQuote.quote.sellAmount.amount / 100) * 0.9
                     })
                   })}
                 </FiatDisplay>