fix(coinmarket): Fix fetching all contract txs for solana

everstake · Mar 18, 2024 · f63ada2 · f63ada2
1 parent ee9d6b1
commit f63ada2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/...market/exchange/components/ExchangeForm/Inputs/SendCryptoInput/SendCryptoSelect/index.tsx b/...market/exchange/components/ExchangeForm/Inputs/SendCryptoInput/SendCryptoSelect/index.tsx
@@ -67,7 +67,9 @@ const SendCryptoSelect = () => {
                         const tokenData = tokens?.find(t => t.symbol === invitySymbol);
                         if (ethereumTypeNetworkSymbols.includes(token)) {
                             setValue(CRYPTO_TOKEN, null);
-                            // set own account for non ERC20 transaction
+                            setValue('outputs.0.address', account.descriptor);
+                        } else if (symbol === 'sol') {
+                            setValue(CRYPTO_TOKEN, tokenData?.contract ?? null);
                             setValue('outputs.0.address', account.descriptor);
                         } else {
                             // set the address of the token to the output

diff --git a/...s/suite/src/views/wallet/coinmarket/sell/components/SellForm/Inputs/CryptoInput/index.tsx b/...s/suite/src/views/wallet/coinmarket/sell/components/SellForm/Inputs/CryptoInput/index.tsx
@@ -72,7 +72,7 @@ const CryptoInput = () => {
         cryptoSymbol,
     };
 
-    const { tokens } = account;
+    const { symbol, tokens } = account;
 
     const cryptoInputRules = {
         validate: {
@@ -113,18 +113,20 @@ const CryptoInput = () => {
                                 setValue(CRYPTO_INPUT, '');
                                 setValue(FIAT_INPUT, '');
                                 const token = selected.value;
+                                const invitySymbol = invityApiSymbolToSymbol(token).toLowerCase();
+                                const tokenData = tokens?.find(
+                                    t =>
+                                        t.symbol === invitySymbol &&
+                                        t.contract === selected.token?.contract,
+                                );
                                 if (ethereumTypeNetworkSymbols.includes(token)) {
                                     setValue(CRYPTO_TOKEN, null);
-                                    // set own account for non ERC20 transaction
+                                    setValue('outputs.0.address', account.descriptor);
+                                } else if (symbol === 'sol') {
+                                    setValue(CRYPTO_TOKEN, tokenData?.contract ?? null);
                                     setValue('outputs.0.address', account.descriptor);
                                 } else {
                                     // set the address of the token to the output
-                                    const symbol = invityApiSymbolToSymbol(token).toLowerCase();
-                                    const tokenData = tokens?.find(
-                                        t =>
-                                            t.symbol === symbol &&
-                                            t.contract === selected.token?.contract,
-                                    );
                                     setValue(CRYPTO_TOKEN, tokenData?.contract ?? null);
                                     // set token address for ERC20 transaction to estimate the fees more precisely
                                     setValue('outputs.0.address', tokenData?.contract ?? '');