From a42a983ffda5dd1aed01ac06b9c94595411a68e3 Mon Sep 17 00:00:00 2001
From: jinoosss <jwchoi@onbloc.xyz>
Date: Tue, 9 Apr 2024 12:17:43 +0900
Subject: [PATCH 1/2] fix: [ADN-528] Fix bugs when changing network

---
 packages/adena-extension/src/hooks/use-network.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/adena-extension/src/hooks/use-network.ts b/packages/adena-extension/src/hooks/use-network.ts
index 9b17b99b..f06c144a 100644
--- a/packages/adena-extension/src/hooks/use-network.ts
+++ b/packages/adena-extension/src/hooks/use-network.ts
@@ -7,7 +7,7 @@ import { useEvent } from './use-event';
 import { fetchHealth } from '@common/utils/fetch-utils';
 
 import { NetworkMetainfo } from '@types';
-import { CommonState, NetworkState, WalletState } from '@states';
+import { BalanceState, CommonState, NetworkState, WalletState } from '@states';
 
 interface NetworkResponse {
   networks: NetworkMetainfo[];
@@ -46,6 +46,9 @@ export const useNetwork = (): NetworkResponse => {
   const [failedNetwork, setFailedNetwork] = useRecoilState(CommonState.failedNetwork);
   const [, setState] = useRecoilState(WalletState.state);
   const resetNetworkConnection = useResetRecoilState(CommonState.failedNetwork);
+  const resetAccountTokenBalances = useResetRecoilState(BalanceState.accountTokenBalances);
+  const resetAccountNativeBalances = useResetRecoilState(BalanceState.accountNativeBalances);
+  const resetCurrentTokenBalances = useResetRecoilState(BalanceState.currentTokenBalances);
 
   const addNetwork = useCallback(
     async (name: string, rpcUrl: string, chainId: string) => {
@@ -78,8 +81,11 @@ export const useNetwork = (): NetworkResponse => {
         setCurrentNetwork(null);
         return false;
       }
-      setState('LOADING');
+      resetCurrentTokenBalances();
+      resetAccountTokenBalances();
+      resetAccountNativeBalances();
       resetNetworkConnection();
+      setState('LOADING');
       const network = networkMetainfos.find((network) => network.id === id) ?? networkMetainfos[0];
       await chainService.updateCurrentNetworkId(id);
       await changeNetworkOfProvider(network);

From 0bb8b5f0ce99dae34d8a642ef8d002632cbf0fcf Mon Sep 17 00:00:00 2001
From: jinoosss <jwchoi@onbloc.xyz>
Date: Tue, 9 Apr 2024 12:21:07 +0900
Subject: [PATCH 2/2] fix: [ADN-528] Fix loading style

---
 packages/adena-extension/src/router/popup/loading-main.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/adena-extension/src/router/popup/loading-main.tsx b/packages/adena-extension/src/router/popup/loading-main.tsx
index 5b1f8604..602571c2 100644
--- a/packages/adena-extension/src/router/popup/loading-main.tsx
+++ b/packages/adena-extension/src/router/popup/loading-main.tsx
@@ -14,7 +14,7 @@ import mixins from '@styles/mixins';
 
 const Wrapper = styled.main`
   ${mixins.flex({ justify: 'stretch' })};
-  position: absolute;
+  position: fixed;
   width: 100%;
   height: 100%;
   padding: 78px 24px;