Merge pull request #949 from Koniverse/issue-942

[issue-942] Re-check re-connect network on transaction screen
Koniverse · Aug 16, 2023 · a45b501 · a45b501
2 parents 2c945d3 + abfc1c4
commit a45b501
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/hooks/balance/useGetBalance.ts b/src/hooks/balance/useGetBalance.ts
@@ -21,6 +21,9 @@ const useGetBalance = (chain = '', address = '', tokenSlug = '') => {
   const [isRefresh, setIsRefresh] = useState({});
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
+  const isChainActive = chainStateMap[chain]?.active;
+  const nativeTokenActive = nativeTokenSlug && assetSettingMap[nativeTokenSlug]?.visible;
+  const isTokenActive = assetSettingMap[tokenSlug]?.visible;
 
   const refreshBalance = useCallback(() => {
     setIsRefresh({});
@@ -34,11 +37,9 @@ const useGetBalance = (chain = '', address = '', tokenSlug = '') => {
 
     if (address && chain) {
       const promiseList = [] as Promise<any>[];
-      const isChainActive = chainStateMap[chain]?.active;
-      const nativeTokenActive = nativeTokenSlug && assetSettingMap[nativeTokenSlug]?.visible;
       let childTokenActive = true;
 
-      if (tokenSlug && tokenSlug !== nativeTokenSlug && !assetSettingMap[tokenSlug]?.visible) {
+      if (tokenSlug && tokenSlug !== nativeTokenSlug && !isTokenActive) {
         childTokenActive = false;
       }
 
@@ -120,10 +121,11 @@ const useGetBalance = (chain = '', address = '', tokenSlug = '') => {
     nativeTokenSlug,
     tokenSlug,
     isRefresh,
-    assetSettingMap,
-    chainStateMap,
     assetRegistry,
     chainInfo?.name,
+    isChainActive,
+    isTokenActive,
+    nativeTokenActive,
   ]);
 
   return { refreshBalance, tokenBalance, nativeTokenBalance, nativeTokenSlug, isLoading, error };