From 9902f9d27f01689e53adc9ed52aae55c1afb7f2b Mon Sep 17 00:00:00 2001
From: Tomas Martykan <t.martykan@gmail.com>
Date: Thu, 23 Jan 2025 10:14:20 +0100
Subject: [PATCH] fix(suite): subscribe to solana blocks in coinmarket form

---
 .../form/useCoinmarketExchangeForm.ts         |  4 ++++
 .../coinmarket/form/useCoinmarketSellForm.ts  |  4 ++++
 .../wallet/form/useSolanaSubscribeBlocks.ts   | 22 +++++++++++++++++++
 .../src/hooks/wallet/useSendFormCompose.ts    | 21 ++++--------------
 4 files changed, 34 insertions(+), 17 deletions(-)
 create mode 100644 packages/suite/src/hooks/wallet/form/useSolanaSubscribeBlocks.ts

diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeForm.ts b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeForm.ts
index 569e41bcff2..b4a09095778 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeForm.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketExchangeForm.ts
@@ -60,6 +60,7 @@ import { useCoinmarketFiatValues } from 'src/hooks/wallet/coinmarket/form/common
 import type { CryptoAmountLimitProps } from 'src/utils/suite/validation';
 import { useCoinmarketExchangeQuotesFilter } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketExchangeQuotesFilter';
 import { useCoinmarketPreviousRoute } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketPreviousRoute';
+import { useSolanaSubscribeBlocks } from 'src/hooks/wallet/form/useSolanaSubscribeBlocks';
 
 import { useCoinmarketInitializer } from './common/useCoinmarketInitializer';
 
@@ -681,6 +682,9 @@ export const useCoinmarketExchangeForm = ({
         };
     }, []);
 
+    // Subscribe to blocks for Solana, since they are not fetched globally
+    useSolanaSubscribeBlocks(account);
+
     return {
         type,
         ...methods,
diff --git a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketSellForm.ts b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketSellForm.ts
index 9bf4204ee90..acb85367740 100644
--- a/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketSellForm.ts
+++ b/packages/suite/src/hooks/wallet/coinmarket/form/useCoinmarketSellForm.ts
@@ -56,6 +56,7 @@ import { useCoinmarketAccount } from 'src/hooks/wallet/coinmarket/form/common/us
 import { useCoinmarketInfo } from 'src/hooks/wallet/coinmarket/useCoinmarketInfo';
 import type { AmountLimitProps } from 'src/utils/suite/validation';
 import { useCoinmarketPreviousRoute } from 'src/hooks/wallet/coinmarket/form/common/useCoinmarketPreviousRoute';
+import { useSolanaSubscribeBlocks } from 'src/hooks/wallet/form/useSolanaSubscribeBlocks';
 
 import { useCoinmarketInitializer } from './common/useCoinmarketInitializer';
 
@@ -657,6 +658,9 @@ export const useCoinmarketSellForm = ({
         };
     }, []);
 
+    // Subscribe to blocks for Solana, since they are not fetched globally
+    useSolanaSubscribeBlocks(account);
+
     return {
         type,
         form: {
diff --git a/packages/suite/src/hooks/wallet/form/useSolanaSubscribeBlocks.ts b/packages/suite/src/hooks/wallet/form/useSolanaSubscribeBlocks.ts
new file mode 100644
index 00000000000..9bf5bea0597
--- /dev/null
+++ b/packages/suite/src/hooks/wallet/form/useSolanaSubscribeBlocks.ts
@@ -0,0 +1,22 @@
+import { useEffect } from 'react';
+
+import TrezorConnect from '@trezor/connect';
+import { Account } from '@suite-common/wallet-types';
+
+export const useSolanaSubscribeBlocks = (account: Account) => {
+    useEffect(() => {
+        if (account.networkType === 'solana') {
+            TrezorConnect.blockchainSubscribe({
+                coin: account.symbol,
+                blocks: true,
+            });
+
+            return () => {
+                TrezorConnect.blockchainUnsubscribe({
+                    coin: account.symbol,
+                    blocks: true,
+                });
+            };
+        }
+    }, [account]);
+};
diff --git a/packages/suite/src/hooks/wallet/useSendFormCompose.ts b/packages/suite/src/hooks/wallet/useSendFormCompose.ts
index 78890a4e4cb..e5a83f812a5 100644
--- a/packages/suite/src/hooks/wallet/useSendFormCompose.ts
+++ b/packages/suite/src/hooks/wallet/useSendFormCompose.ts
@@ -15,7 +15,7 @@ import {
 import { useDebounce } from '@trezor/react-utils';
 import { isChanged } from '@suite-common/suite-utils';
 import { findComposeErrors } from '@suite-common/wallet-utils';
-import TrezorConnect, { FeeLevel } from '@trezor/connect';
+import { FeeLevel } from '@trezor/connect';
 import { COMPOSE_ERROR_TYPES } from '@suite-common/wallet-constants';
 import { composeSendFormTransactionFeeLevelsThunk } from '@suite-common/wallet-core';
 
@@ -23,6 +23,7 @@ import { TranslationKey } from 'src/components/suite/Translation';
 import { SendContextValues, UseSendFormState } from 'src/types/wallet/sendForm';
 
 import { useTranslation } from '../suite';
+import { useSolanaSubscribeBlocks } from './form/useSolanaSubscribeBlocks';
 
 type Props = UseFormReturn<FormState> & {
     state: UseSendFormState;
@@ -344,22 +345,8 @@ export const useSendFormCompose = ({
         setLoading,
     ]);
 
-    useEffect(() => {
-        // Subscribe to blocks for Solana, since they are not fetched globally
-        if (state.account.networkType === 'solana') {
-            TrezorConnect.blockchainSubscribe({
-                coin: state.account.symbol,
-                blocks: true,
-            });
-
-            return () => {
-                TrezorConnect.blockchainUnsubscribe({
-                    coin: state.account.symbol,
-                    blocks: true,
-                });
-            };
-        }
-    }, [state.account]);
+    // Subscribe to blocks for Solana, since they are not fetched globally
+    useSolanaSubscribeBlocks(state.account);
 
     return {
         composeDraft,