From 1e4e3ec09a0e1113a17027b6e2963ca1fe0aeb5f Mon Sep 17 00:00:00 2001
From: michalsmiarowski <michal.smiarowski@thesis.co>
Date: Thu, 18 Apr 2024 15:48:20 +0200
Subject: [PATCH 1/2] Use lazy loading for tbtc sdk initialization

Here we use lazy loading for tbtc sdk initialization in our threshold-ts lib.
Instead of keeping the sdk object we actually store the promise itself in
`_sdkPromise` property. This promise is set during the construction of the SDK
class and is meant to be resolved once the SDK is fully initialized. The promise
is used to ensure that the SDK is initialized only once and that all subsequent
retrievals of the SDK instance await this promise, thereby ensuring that the SDK
is ready for use before any operations are performed.

The promise also facilitates updating the SDK instance dynamically: if a new
initialization is triggered (e.g., when a user logs in and provides a new
signer), it ensures that the new SDK object replaces any previously pending SDK
object, even if the original promise has not yet resolved.

To retrieve the SDK object, use the `getSdk()` method. This method will either
return the already resolved SDK object or wait until the promise resolves before
returning the SDK.

Additionally I've changed the `getTransactionConfirmations` method
implementation - it does not have to use SDK.
---
 src/threshold-ts/tbtc/index.ts | 81 +++++++++++++++++++++++-----------
 1 file changed, 56 insertions(+), 25 deletions(-)

diff --git a/src/threshold-ts/tbtc/index.ts b/src/threshold-ts/tbtc/index.ts
index 3aaa0921f..d03759a3d 100644
--- a/src/threshold-ts/tbtc/index.ts
+++ b/src/threshold-ts/tbtc/index.ts
@@ -189,8 +189,6 @@ export interface ITBTC {
 
   readonly tokenContract: Contract
 
-  readonly sdk: SDK | undefined
-
   readonly deposit: Deposit | undefined
 
   /**
@@ -199,12 +197,11 @@ export interface ITBTC {
    * connected) or Signer (if wallet is connected).
    * @param account Connected ethereum address (optional, needed only if user
    * connected his wallet).
-   * @returns Instance of the TBTC class from tbtc-v2.ts lib
    */
   initializeSdk(
     providerOrSigner: providers.Provider | Signer,
     account?: string
-  ): Promise<SDK>
+  ): Promise<void>
   /**
    * Initiates a Deposit object from bitcoin recovery address.
    * @param btcRecoveryAddress The bitcoin address in which the user will
@@ -424,7 +421,26 @@ export class TBTC implements ITBTC {
   private _bitcoinConfig: BitcoinConfig
   private readonly _satoshiMultiplier = BigNumber.from(10).pow(10)
   private _redemptionTreasuryFeeDivisor: BigNumber | undefined
-  private _sdk: SDK | undefined
+
+  /**
+   * Holds the promise for the asynchronously initialized SDK instance.
+   * This promise is set during the construction of the SDK class and is meant
+   * to be resolved once the SDK is fully initialized. The promise is used to
+   * ensure that the SDK is initialized only once and that all subsequent
+   * retrievals of the SDK instance await this promise, thereby ensuring that
+   * the SDK is ready for use before any operations are performed.
+   *
+   * The promise also facilitates updating the SDK instance dynamically: if a
+   * new initialization is triggered (e.g., when a user logs in and provides a
+   * new signer), it ensures that the new SDK object replaces any previously
+   * pending SDK object, even if the original promise has not yet resolved.
+   *
+   * To retrieve the SDK object, use the `getSdk()` method. This method will
+   * either return the already resolved SDK object or wait until the promise
+   * resolves before returning the SDK.
+   */
+
+  private _sdkPromise: Promise<SDK | undefined>
   private _deposit: Deposit | undefined
 
   constructor(
@@ -489,9 +505,12 @@ export class TBTC implements ITBTC {
     this._multicall = multicall
     this._ethereumConfig = ethereumConfig
     this._bitcoinConfig = bitcoinConfig
+    this._sdkPromise = new Promise((resolve) => resolve(undefined))
+
+    this.initializeSdk(providerOrSigner, account)
   }
 
-  async initializeSdk(
+  async _initializeSdk(
     providerOrSigner: providers.Provider | Signer,
     account?: string
   ): Promise<SDK> {
@@ -512,12 +531,11 @@ export class TBTC implements ITBTC {
         ? getSepoliaDevelopmentContracts(signer)
         : await loadEthereumContracts(signer, ethereumNetwork)
 
-      this._sdk = await SDK.initializeCustom(tbtcContracts, this._bitcoinClient)
+      const sdk = await SDK.initializeCustom(tbtcContracts, this._bitcoinClient)
 
-      depositorAddress &&
-        this._sdk?.deposits.setDefaultDepositor(depositorAddress)
+      depositorAddress && sdk.deposits.setDefaultDepositor(depositorAddress)
 
-      return this._sdk
+      return sdk
     }
 
     const initializeFunction =
@@ -525,13 +543,20 @@ export class TBTC implements ITBTC {
         ? SDK.initializeMainnet
         : SDK.initializeSepolia
 
-    this._sdk = await initializeFunction(signer)
+    const sdk = await initializeFunction(signer)
 
-    return this._sdk
+    return sdk
   }
 
-  get sdk(): SDK | undefined {
-    return this._sdk
+  async initializeSdk(
+    providerOrSigner: providers.Provider | Signer,
+    account?: string | undefined
+  ): Promise<void> {
+    try {
+      this._sdkPromise = this._initializeSdk(providerOrSigner, account)
+    } catch (err) {
+      throw new Error(`Something went wrong when initializing tbtc sdk: ${err}`)
+    }
   }
 
   get deposit(): Deposit | undefined {
@@ -558,9 +583,16 @@ export class TBTC implements ITBTC {
     return this._tokenContract
   }
 
+  private _getSdk = async (): Promise<SDK> => {
+    const sdk = await this._sdkPromise
+    if (!sdk) throw new EmptySdkObjectError()
+
+    return sdk
+  }
+
   initiateDeposit = async (btcRecoveryAddress: string): Promise<Deposit> => {
-    if (!this._sdk) throw new EmptySdkObjectError()
-    this._deposit = await this._sdk.deposits.initiateDeposit(btcRecoveryAddress)
+    const sdk = await this._getSdk()
+    this._deposit = await sdk.deposits.initiateDeposit(btcRecoveryAddress)
     return this._deposit
   }
 
@@ -571,7 +603,7 @@ export class TBTC implements ITBTC {
   initiateDepositFromDepositScriptParameters = async (
     depositScriptParameters: DepositScriptParameters
   ): Promise<Deposit> => {
-    if (!this._sdk) throw new EmptySdkObjectError()
+    const sdk = await this._getSdk()
     const {
       blindingFactor,
       walletPublicKeyHash,
@@ -590,8 +622,8 @@ export class TBTC implements ITBTC {
 
     this._deposit = await Deposit.fromReceipt(
       depositReceipt,
-      this._sdk.tbtcContracts,
-      this._sdk.bitcoinClient
+      sdk.tbtcContracts,
+      sdk.bitcoinClient
     )
     return this._deposit
   }
@@ -695,8 +727,8 @@ export class TBTC implements ITBTC {
   }
 
   getRevealedDeposit = async (utxo: BitcoinUtxo): Promise<DepositRequest> => {
-    if (!this._sdk) throw new EmptySdkObjectError()
-    const deposit = await this._sdk.tbtcContracts.bridge.deposits(
+    const sdk = await this._getSdk()
+    const deposit = await sdk.tbtcContracts.bridge.deposits(
       utxo.transactionHash,
       utxo.outputIndex
     )
@@ -709,9 +741,8 @@ export class TBTC implements ITBTC {
   getTransactionConfirmations = async (
     transactionHash: string
   ): Promise<number> => {
-    if (!this._sdk) throw new EmptySdkObjectError()
     const bitcoinTransactionHash = BitcoinTxHash.from(transactionHash)
-    return this._sdk.bitcoinClient.getTransactionConfirmations(
+    return this._bitcoinClient.getTransactionConfirmations(
       bitcoinTransactionHash
     )
   }
@@ -1010,7 +1041,7 @@ export class TBTC implements ITBTC {
       walletPublicKey: string
     }
   }> => {
-    if (!this._sdk) throw new EmptySdkObjectError()
+    const sdk = await this._getSdk()
 
     if (this._isValidBitcoinAddressForRedemption(btcAddress)) {
       throw new Error(
@@ -1019,7 +1050,7 @@ export class TBTC implements ITBTC {
     }
 
     const { targetChainTxHash, walletPublicKey } =
-      await this._sdk.redemptions.requestRedemption(
+      await sdk.redemptions.requestRedemption(
         btcAddress,
         BigNumber.from(amount)
       )

From c4726957457d839c62e96f485e19158b7d8840c0 Mon Sep 17 00:00:00 2001
From: michalsmiarowski <michal.smiarowski@thesis.co>
Date: Thu, 18 Apr 2024 15:53:55 +0200
Subject: [PATCH 2/2] Remove IsSdkInitializingContext

The context is not needed anymore when we've implemented a lazy loading in
1e4e3ec09a0e1113a17027b6e2963ca1fe0aeb5f.
---
 src/components/SubmitTxButton.tsx             |  4 +-
 src/contexts/ThresholdContext.tsx             | 74 +------------------
 .../useRequestEthereumAccount.ts              |  3 -
 src/hooks/tbtc/useFetchRedemptionDetails.ts   |  9 +--
 src/hooks/useFetchTvl.ts                      |  5 +-
 src/hooks/useIsActive.ts                      |  3 -
 src/pages/tBTC/Bridge/Mint.tsx                | 56 +++++---------
 .../tBTC/Bridge/Minting/MintingFlowRouter.tsx | 18 +----
 src/pages/tBTC/Bridge/Unmint.tsx              |  9 +--
 9 files changed, 31 insertions(+), 150 deletions(-)

diff --git a/src/components/SubmitTxButton.tsx b/src/components/SubmitTxButton.tsx
index c919933ea..c8306fc20 100644
--- a/src/components/SubmitTxButton.tsx
+++ b/src/components/SubmitTxButton.tsx
@@ -1,7 +1,6 @@
 import { FC } from "react"
 import { Button, ButtonProps } from "@chakra-ui/react"
 import { useIsActive } from "../hooks/useIsActive"
-import { useIsTbtcSdkInitializing } from "../contexts/ThresholdContext"
 import { useConnectWallet } from "../hooks/useConnectWallet"
 
 interface Props extends ButtonProps {
@@ -15,14 +14,13 @@ const SubmitTxButton: FC<Props> = ({
   ...buttonProps
 }) => {
   const { isActive } = useIsActive()
-  const { isSdkInitializedWithSigner } = useIsTbtcSdkInitializing()
   const connectWallet = useConnectWallet()
 
   const onConnectWalletClick = () => {
     connectWallet()
   }
 
-  if (isActive && isSdkInitializedWithSigner) {
+  if (isActive) {
     return (
       <Button mt={6} isFullWidth onClick={onSubmit} {...buttonProps}>
         {submitText}
diff --git a/src/contexts/ThresholdContext.tsx b/src/contexts/ThresholdContext.tsx
index d3fd3b02d..e446f44c0 100644
--- a/src/contexts/ThresholdContext.tsx
+++ b/src/contexts/ThresholdContext.tsx
@@ -1,16 +1,12 @@
-import { TBTC as SDK } from "@keep-network/tbtc-v2.ts"
 import { useWeb3React } from "@web3-react/core"
 import { providers, Signer } from "ethers"
 import {
   createContext,
-  Dispatch,
   FC,
-  SetStateAction,
   useCallback,
   useContext,
   useEffect,
   useRef,
-  useState,
 } from "react"
 import {
   getDefaultThresholdLibProvider,
@@ -22,61 +18,21 @@ import { useIsEmbed } from "../hooks/useIsEmbed"
 
 const ThresholdContext = createContext(threshold)
 
-// TODO: We should probably put those values information in ThresholdContext,
-// but that would require a lot of change through app, so for now we will keep
-// it in a separate context.
-const IsSdkInitializingContext = createContext({
-  isSdkInitializing: false,
-  isSdkInitialized: false,
-  isSdkInitializedWithSigner: false,
-  setIsSdkInitializing: (() => {}) as Dispatch<SetStateAction<boolean>>,
-})
-
 export const useThreshold = () => {
   return useContext(ThresholdContext)
 }
 
-export const useIsTbtcSdkInitializing = () => {
-  return useContext(IsSdkInitializingContext)
-}
-
 const useInitializeTbtcSdk = () => {
-  const [sdk, setSdk] = useState<SDK | undefined>(undefined)
-  const [isInitializing, setIsInitializing] = useState(false)
-  const [isInitialized, setIsInitialized] = useState(false)
-  const [isInitializedWithSigner, setIsInitializedWithSigner] = useState(false)
   const threshold = useThreshold()
 
   const initializeSdk = useCallback(
     async (providerOrSigner: providers.Provider | Signer, account?: string) => {
-      if (!isInitializing) {
-        setIsInitializing(true)
-        const sdk = await threshold.tbtc.initializeSdk(
-          providerOrSigner,
-          account
-        )
-        setSdk(sdk)
-        setIsInitialized(true)
-        const isInitializedWithSigner = account ? true : false
-        setIsInitializedWithSigner(isInitializedWithSigner)
-        setIsInitializing(false)
-      }
+      threshold.tbtc.initializeSdk(providerOrSigner, account)
     },
-    [
-      threshold,
-      setSdk,
-      setIsInitializing,
-      setIsInitialized,
-      setIsInitializedWithSigner,
-    ]
+    [threshold]
   )
 
   return {
-    sdk,
-    isSdkInitializing: isInitializing,
-    isSdkInitialized: isInitialized,
-    isSdkInitializedWithSigner: isInitializedWithSigner,
-    setIsSdkInitializing: setIsInitializing,
     initializeSdk,
   }
 }
@@ -84,14 +40,7 @@ const useInitializeTbtcSdk = () => {
 export const ThresholdProvider: FC = ({ children }) => {
   const { library } = useWeb3React()
   const hasThresholdLibConfigBeenUpdated = useRef(false)
-  const {
-    sdk,
-    initializeSdk,
-    isSdkInitializing,
-    isSdkInitialized,
-    isSdkInitializedWithSigner,
-    setIsSdkInitializing,
-  } = useInitializeTbtcSdk()
+  const { initializeSdk } = useInitializeTbtcSdk()
   const { ledgerLiveAppEthereumSigner } = useLedgerLiveApp()
   const { account, isActive } = useIsActive()
   const { isEmbed } = useIsEmbed()
@@ -107,7 +56,6 @@ export const ThresholdProvider: FC = ({ children }) => {
         bitcoin: threshold.config.bitcoin,
       })
       hasThresholdLibConfigBeenUpdated.current = true
-      initializeSdk(threshold.config.ethereum.providerOrSigner, account)
     }
 
     if (!isActive && hasThresholdLibConfigBeenUpdated.current) {
@@ -120,26 +68,12 @@ export const ThresholdProvider: FC = ({ children }) => {
         bitcoin: threshold.config.bitcoin,
       })
       hasThresholdLibConfigBeenUpdated.current = false
-      initializeSdk(threshold.config.ethereum.providerOrSigner)
-    }
-
-    if (!sdk && !isSdkInitializing && !isSdkInitialized) {
-      initializeSdk(threshold.config.ethereum.providerOrSigner)
     }
   }, [library, isActive, account, initializeSdk, isEmbed])
 
   return (
     <ThresholdContext.Provider value={threshold}>
-      <IsSdkInitializingContext.Provider
-        value={{
-          isSdkInitializing,
-          isSdkInitialized,
-          isSdkInitializedWithSigner,
-          setIsSdkInitializing,
-        }}
-      >
-        {children}
-      </IsSdkInitializingContext.Provider>
+      {children}
     </ThresholdContext.Provider>
   )
 }
diff --git a/src/hooks/ledger-live-app/useRequestEthereumAccount.ts b/src/hooks/ledger-live-app/useRequestEthereumAccount.ts
index 55c174eb5..295fdf15c 100644
--- a/src/hooks/ledger-live-app/useRequestEthereumAccount.ts
+++ b/src/hooks/ledger-live-app/useRequestEthereumAccount.ts
@@ -2,7 +2,6 @@ import { Account, WalletAPIClient } from "@ledgerhq/wallet-api-client"
 import { useRequestAccount as useWalletApiRequestAccount } from "@ledgerhq/wallet-api-client-react"
 import { useCallback, useEffect } from "react"
 import { useLedgerLiveApp } from "../../contexts/LedgerLiveAppContext"
-import { useIsTbtcSdkInitializing } from "../../contexts/ThresholdContext"
 import { useWalletApiReactTransport } from "../../contexts/TransportProvider"
 import { walletConnected } from "../../store/account"
 import { supportedChainId } from "../../utils/getEnvVariable"
@@ -27,7 +26,6 @@ export function useRequestEthereumAccount(): UseRequestAccountReturn {
   const useRequestAccountReturn = useWalletApiRequestAccount()
   const { account, requestAccount } = useRequestAccountReturn
   const dispatch = useAppDispatch()
-  const { setIsSdkInitializing } = useIsTbtcSdkInitializing()
   const { isEmbed } = useIsEmbed()
 
   useEffect(() => {
@@ -37,7 +35,6 @@ export function useRequestEthereumAccount(): UseRequestAccountReturn {
     // here to indicate as early as as possible that the sdk is in the
     // initializing process.
     if (isEmbed) {
-      setIsSdkInitializing(true)
       setEthAccount(account || undefined)
       dispatch(walletConnected(account?.address || ""))
     }
diff --git a/src/hooks/tbtc/useFetchRedemptionDetails.ts b/src/hooks/tbtc/useFetchRedemptionDetails.ts
index adf2c67b4..d01c9371e 100644
--- a/src/hooks/tbtc/useFetchRedemptionDetails.ts
+++ b/src/hooks/tbtc/useFetchRedemptionDetails.ts
@@ -1,8 +1,5 @@
 import { useEffect, useState } from "react"
-import {
-  useIsTbtcSdkInitializing,
-  useThreshold,
-} from "../../contexts/ThresholdContext"
+import { useThreshold } from "../../contexts/ThresholdContext"
 import {
   isValidType,
   fromSatoshiToTokenPrecision,
@@ -43,11 +40,8 @@ export const useFetchRedemptionDetails = (
   const [redemptionData, setRedemptionData] = useState<
     RedemptionDetails | undefined
   >()
-  const { isSdkInitialized } = useIsTbtcSdkInitializing()
 
   useEffect(() => {
-    if (!isSdkInitialized) return
-
     if (!redeemer || isEmptyOrZeroAddress(redeemer)) {
       setError("Invalid redeemer value.")
       return
@@ -242,7 +236,6 @@ export const useFetchRedemptionDetails = (
     threshold,
     getBlock,
     findRedemptionInBitcoinTx,
-    isSdkInitialized,
   ])
 
   return { isFetching, data: redemptionData, error }
diff --git a/src/hooks/useFetchTvl.ts b/src/hooks/useFetchTvl.ts
index a4ff84946..6ed84f776 100644
--- a/src/hooks/useFetchTvl.ts
+++ b/src/hooks/useFetchTvl.ts
@@ -12,7 +12,6 @@ import { useETHData } from "./useETHData"
 import { useToken } from "./useToken"
 import { Token } from "../enums"
 import { toUsdBalance } from "../utils/getUsdBalance"
-import { useIsTbtcSdkInitializing } from "../contexts/ThresholdContext"
 
 interface TvlRawData {
   ecdsaTvl: string
@@ -62,7 +61,6 @@ export const useFetchTvl = (): [
   const tTokenStaking = useTStakingContract()
   const keepTokenStaking = useKeepTokenStakingContract()
   const tBTCToken = useToken(Token.TBTCV2)
-  const { isSdkInitializing } = useIsTbtcSdkInitializing()
 
   const fetchOnChainData = useMulticall([
     {
@@ -96,7 +94,6 @@ export const useFetchTvl = (): [
   ])
 
   const fetchTvlData = useCallback(async () => {
-    if (isSdkInitializing) return initialState
     const chainData = await fetchOnChainData()
     if (chainData.length === 0) return initialState
 
@@ -118,7 +115,7 @@ export const useFetchTvl = (): [
     setRawData(data)
 
     return data
-  }, [fetchOnChainData, isSdkInitializing])
+  }, [fetchOnChainData])
 
   const data = useMemo(() => {
     const ecdsa = toUsdBalance(formatUnits(ecdsaTvl), eth.usdPrice)
diff --git a/src/hooks/useIsActive.ts b/src/hooks/useIsActive.ts
index 4fd22a627..7f79e0f4e 100644
--- a/src/hooks/useIsActive.ts
+++ b/src/hooks/useIsActive.ts
@@ -1,7 +1,6 @@
 import { useWeb3React } from "@web3-react/core"
 import { useCallback, useMemo } from "react"
 import { useLedgerLiveApp } from "../contexts/LedgerLiveAppContext"
-import { useIsTbtcSdkInitializing } from "../contexts/ThresholdContext"
 import { supportedChainId } from "../utils/getEnvVariable"
 import { useIsEmbed } from "./useIsEmbed"
 
@@ -27,7 +26,6 @@ export const useIsActive = (): UseIsActiveResult => {
   const { ethAccount, setEthAccount } = useLedgerLiveApp()
   const ledgerLiveAppEthAddress = ethAccount?.address || undefined
   const { isEmbed } = useIsEmbed()
-  const { setIsSdkInitializing } = useIsTbtcSdkInitializing()
 
   const isActive = useMemo(() => {
     if (isEmbed) {
@@ -37,7 +35,6 @@ export const useIsActive = (): UseIsActiveResult => {
   }, [ledgerLiveAppEthAddress, _active, _account, isEmbed])
 
   const deactivateLedgerLiveApp = useCallback(() => {
-    setIsSdkInitializing(true)
     setEthAccount(undefined)
   }, [setEthAccount])
 
diff --git a/src/pages/tBTC/Bridge/Mint.tsx b/src/pages/tBTC/Bridge/Mint.tsx
index 79c07cf49..97c29e2cd 100644
--- a/src/pages/tBTC/Bridge/Mint.tsx
+++ b/src/pages/tBTC/Bridge/Mint.tsx
@@ -17,10 +17,7 @@ import {
 } from "./BridgeLayout"
 import { BridgeProcessEmptyState } from "./components/BridgeProcessEmptyState"
 import { MintDurationWidget } from "../../../components/MintDurationWidget"
-import {
-  useIsTbtcSdkInitializing,
-  useThreshold,
-} from "../../../contexts/ThresholdContext"
+import { useThreshold } from "../../../contexts/ThresholdContext"
 
 export const MintPage: PageComponent = ({}) => {
   return <Outlet />
@@ -30,8 +27,6 @@ export const MintingFormPage: PageComponent = ({ ...props }) => {
   const { tBTCDepositData } = useTBTCDepositDataFromLocalStorage()
   const { btcDepositAddress, updateState } = useTbtcState()
   const { account } = useIsActive()
-  const { isSdkInitializing, isSdkInitializedWithSigner } =
-    useIsTbtcSdkInitializing()
 
   useEffect(() => {
     // Update the store with the deposit data if the account is placed in tbtc
@@ -43,38 +38,27 @@ export const MintingFormPage: PageComponent = ({ ...props }) => {
       isSameETHAddress(tBTCDepositData[account].ethAddress, account) &&
       tBTCDepositData[account].btcDepositAddress !== btcDepositAddress
     ) {
-      // When the code enters this if, this means that the deposit data is
-      // placed in tBTC local storage and we need to update the store with that
-      // data. The SDK might still be initializing though, so we should show the
-      // loading state as soon as possible. That's why we are setting the
-      // `mintingStep` as undefined when we notice that sdk is initializing -
-      // this will display a loading state for the minting flow, and then
-      // redirect to the correct step.
-      if (isSdkInitializing) updateState("mintingStep", undefined)
-
-      if (!isSdkInitializing && isSdkInitializedWithSigner) {
-        const {
-          btcDepositAddress,
-          ethAddress,
-          blindingFactor,
-          btcRecoveryAddress,
-          walletPublicKeyHash,
-          refundLocktime,
-        } = tBTCDepositData[account]
+      const {
+        btcDepositAddress,
+        ethAddress,
+        blindingFactor,
+        btcRecoveryAddress,
+        walletPublicKeyHash,
+        refundLocktime,
+      } = tBTCDepositData[account]
 
-        updateState("ethAddress", ethAddress)
-        updateState("blindingFactor", blindingFactor)
-        updateState("btcRecoveryAddress", btcRecoveryAddress)
-        updateState("walletPublicKeyHash", walletPublicKeyHash)
-        updateState("refundLocktime", refundLocktime)
-        // We reset the minting step to undefined to show skeleton and the
-        // useEffect in MintingFlowRouter will update and set the proper minting
-        // step when it recognizes the "btcDepositAddress" change.
-        updateState("mintingStep", undefined)
-        updateState("btcDepositAddress", btcDepositAddress)
-      }
+      updateState("ethAddress", ethAddress)
+      updateState("blindingFactor", blindingFactor)
+      updateState("btcRecoveryAddress", btcRecoveryAddress)
+      updateState("walletPublicKeyHash", walletPublicKeyHash)
+      updateState("refundLocktime", refundLocktime)
+      // We reset the minting step to undefined to show skeleton and the
+      // useEffect in MintingFlowRouter will update and set the proper minting
+      // step when it recognizes the "btcDepositAddress" change.
+      updateState("mintingStep", undefined)
+      updateState("btcDepositAddress", btcDepositAddress)
     }
-  }, [account, isSdkInitializing, isSdkInitializedWithSigner])
+  }, [account])
 
   return <MintingFlowRouter />
 }
diff --git a/src/pages/tBTC/Bridge/Minting/MintingFlowRouter.tsx b/src/pages/tBTC/Bridge/Minting/MintingFlowRouter.tsx
index 4814daf7e..6c7e0e9cc 100644
--- a/src/pages/tBTC/Bridge/Minting/MintingFlowRouter.tsx
+++ b/src/pages/tBTC/Bridge/Minting/MintingFlowRouter.tsx
@@ -14,7 +14,6 @@ import { BridgeProcessCardTitle } from "../components/BridgeProcessCardTitle"
 import { useRemoveDepositData } from "../../../../hooks/tbtc/useRemoveDepositData"
 import { useAppDispatch } from "../../../../hooks/store"
 import { tbtcSlice } from "../../../../store/tbtc"
-import { useIsTbtcSdkInitializing } from "../../../../contexts/ThresholdContext"
 
 const MintingFlowRouterBase = () => {
   const dispatch = useAppDispatch()
@@ -22,8 +21,6 @@ const MintingFlowRouterBase = () => {
   const { mintingStep, updateState, btcDepositAddress, utxo } = useTbtcState()
   const removeDepositData = useRemoveDepositData()
   const { openModal } = useModal()
-  const { isSdkInitializing, isSdkInitializedWithSigner } =
-    useIsTbtcSdkInitializing()
 
   const onPreviousStepClick = (previousStep?: MintingStep) => {
     if (mintingStep === MintingStep.MintingSuccess) {
@@ -39,24 +36,13 @@ const MintingFlowRouterBase = () => {
   }
 
   useEffect(() => {
-    if (
-      !btcDepositAddress ||
-      !account ||
-      isSdkInitializing ||
-      !isSdkInitializedWithSigner
-    ) {
+    if (!btcDepositAddress || !account) {
       return
     }
     dispatch(
       tbtcSlice.actions.findUtxo({ btcDepositAddress, depositor: account })
     )
-  }, [
-    btcDepositAddress,
-    account,
-    dispatch,
-    isSdkInitializing,
-    isSdkInitializedWithSigner,
-  ])
+  }, [btcDepositAddress, account, dispatch])
 
   switch (mintingStep) {
     case MintingStep.ProvideData: {
diff --git a/src/pages/tBTC/Bridge/Unmint.tsx b/src/pages/tBTC/Bridge/Unmint.tsx
index aff05ff91..5d22dde55 100644
--- a/src/pages/tBTC/Bridge/Unmint.tsx
+++ b/src/pages/tBTC/Bridge/Unmint.tsx
@@ -49,10 +49,7 @@ import { PageComponent } from "../../../types"
 import { useToken } from "../../../hooks/useToken"
 import { ModalType, Token } from "../../../enums"
 import { BitcoinNetwork } from "../../../threshold-ts/types"
-import {
-  useIsTbtcSdkInitializing,
-  useThreshold,
-} from "../../../contexts/ThresholdContext"
+import { useThreshold } from "../../../contexts/ThresholdContext"
 import {
   getBridgeBTCSupportedAddressPrefixesText,
   UNMINT_MIN_AMOUNT,
@@ -258,13 +255,11 @@ UnmintFormPage.route = {
 
 export const UnmintPageLayout: PageComponent = ({}) => {
   const { isActive } = useIsActive()
-  const { isSdkInitializing, isSdkInitializedWithSigner } =
-    useIsTbtcSdkInitializing()
 
   return (
     <BridgeLayout>
       <BridgeLayoutMainSection>
-        {isActive && !isSdkInitializing && isSdkInitializedWithSigner ? (
+        {isActive ? (
           <Outlet />
         ) : (
           <BridgeProcessEmptyState