Fix 1 min timeout for fetching new token info

packages/suite/src/actions/wallet/tokenActions.ts

@@ -1,41 +1,22 @@
 import { TokenInfo } from '@trezor/connect';
 import * as accountUtils from '@suite-common/wallet-utils';
 import { notificationsActions } from '@suite-common/toast-notifications';
-import { accountsActions, updateFiatRatesThunk } from '@suite-common/wallet-core';
-import { Timestamp, TokenAddress } from '@suite-common/wallet-types';
-import { FiatCurrencyCode } from '@suite-common/suite-config';
+import { accountsActions } from '@suite-common/wallet-core';
 
 import { Dispatch } from 'src/types/suite';
 import { Account } from 'src/types/wallet';
 
-export const addToken =
-    (account: Account, tokenInfo: TokenInfo[], localCurrency: FiatCurrencyCode) =>
-    (dispatch: Dispatch) => {
-        dispatch(
-            accountsActions.updateAccount({
-                ...account,
-                tokens: (account.tokens || []).concat(accountUtils.enhanceTokens(tokenInfo)),
-            }),
-        );
+export const addToken = (account: Account, tokenInfo: TokenInfo[]) => (dispatch: Dispatch) => {
+    dispatch(
+        accountsActions.updateAccount({
+            ...account,
+            tokens: (account.tokens || []).concat(accountUtils.enhanceTokens(tokenInfo)),
+        }),
+    );
 
-        dispatch(
-            updateFiatRatesThunk({
-                tickers: [
-                    {
-                        symbol: account.symbol,
-                        tokenAddress: tokenInfo[0].contract as TokenAddress,
-                    },
-                ],
-                localCurrency,
-                rateType: 'current',
-                fetchAttemptTimestamp: Date.now() as Timestamp,
-                forceFetchToken: true,
-            }),
-        );
-
-        dispatch(
-            notificationsActions.addToast({
-                type: 'add-token-success',
-            }),
-        );
-    };
+    dispatch(
+        notificationsActions.addToast({
+            type: 'add-token-success',
+        }),
+    );
+};

packages/suite/src/components/suite/modals/ReduxModal/UserContextModal/AddTokenModal.tsx

@@ -11,7 +11,6 @@ import { Translation } from 'src/components/suite/Translation';
 import { useDispatch, useSelector, useTranslation } from 'src/hooks/suite';
 import { Account } from 'src/types/wallet';
 import { selectSelectedAccount } from 'src/reducers/wallet/selectedAccountReducer';
-import { selectLocalCurrency } from 'src/reducers/wallet/settingsReducer';
 
 interface AddTokenModalProps {
     onCancel: () => void;
@@ -23,7 +22,6 @@ export const AddTokenModal = ({ onCancel }: AddTokenModalProps) => {
     const [isFetching, setIsFetching] = useState(false);
     const [error, setError] = useState<string | null>(null);
     const account = useSelector(selectSelectedAccount);
-    const localCurrency = useSelector(selectLocalCurrency);
     const dispatch = useDispatch();
     const { translationString } = useTranslation();
 
@@ -99,7 +97,7 @@ export const AddTokenModal = ({ onCancel }: AddTokenModalProps) => {
 
     const handleAddTokenButtonClick = () => {
         if (tokenInfo) {
-            dispatch(addToken(account, tokenInfo, localCurrency));
+            dispatch(addToken(account, tokenInfo));
             onCancel();
 
             analytics.report({

suite-common/wallet-core/src/fiat-rates/fiatRatesMiddleware.ts

@@ -17,6 +17,7 @@ import { fetchAllTransactionsForAccountThunk } from '../transactions/transaction
 
 export const prepareFiatRatesMiddleware = createMiddlewareWithExtraDeps(
     (action, { dispatch, extra, next, getState }) => {
+        next(action); //next must be at the beginning, othervise tickers are not going to be updated and fiat rates wont fetch (the user will have to wait for 1m timeout)
         const {
             actions: { setWalletSettingsLocalCurrency },
             selectors: { selectLocalCurrency },
@@ -126,6 +127,6 @@ export const prepareFiatRatesMiddleware = createMiddlewareWithExtraDeps(
             );
         }
 
-        return next(action);
+        return action;
     },
 );