removed unnecessary calls

neonlabsorg · Jan 29, 2025 · 261470e · 261470e
1 parent 0f754b9
commit 261470e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 30 deletions.
diff --git a/examples/neon-transfer-vue/src/App.vue b/examples/neon-transfer-vue/src/App.vue
@@ -36,7 +36,6 @@ const handleEvmNetworkSelect = (event: any): any => {
   formStore.setTokenList();
   formStore.setCurrentSplToken('');
   transactionStore.setSignature({});
-  walletsStore.setTokenBalance();
 };
 const handleTransferDirection = () => {
   const isSolanaDirection = transferDirection.value.direction === 'solana';

diff --git a/examples/neon-transfer-vue/src/stores/form.ts b/examples/neon-transfer-vue/src/stores/form.ts
@@ -111,6 +111,23 @@ export const useFormStore = defineStore('form', {
         setTimeout(() => resolve(), timestamp);
       });
     },
+    async initWalletUpdate() {
+      const walletSore = useWalletsStore();
+
+      if (this.currentSplToken?.symbol === 'SOL') {
+        const solana = await walletSore.getSolanaBalance();
+        walletSore.updateWalletBalance({
+          ...walletSore.walletBalance,
+          solana
+        });
+      } else {
+        const neon = await walletSore.getNeonBalance();
+        walletSore.updateWalletBalance({
+          ...walletSore.walletBalance,
+          neon
+        });
+      }
+    },
     async initTransfer() {
       //TODO: Refactor this!!!
       //Get rid of the repeated code
@@ -185,22 +202,14 @@ export const useFormStore = defineStore('form', {
         }
 
         const transactionFunctions = {
-          NEON: () => {
-            console.log('asfsaf =', {
-              provider: toRaw(web3Store.ethersProvider as JsonRpcProvider),
-              from: walletSore.neonWallet.address,
-              to: NEON_TRANSFER_CONTRACT_DEVNET,
-              solanaWallet: walletSore.solanaWallet.publicKey,
-              amount: this.amount
-            });
-            return neonNeonTransactionEthers({
+          NEON: () =>
+            neonNeonTransactionEthers({
               provider: toRaw(web3Store.ethersProvider as JsonRpcProvider),
               from: walletSore.neonWallet.address,
               to: NEON_TRANSFER_CONTRACT_DEVNET,
               solanaWallet: walletSore.solanaWallet.publicKey,
               amount: this.amount
-            });
-          },
+            }),
           SOL: () =>
             neonNeonTransactionEthers({
               provider: toRaw(web3Store.ethersProvider as JsonRpcProvider),
@@ -209,22 +218,14 @@ export const useFormStore = defineStore('form', {
               solanaWallet: walletSore.solanaWallet.publicKey,
               amount: this.amount
             }),
-          DEFAULT: () => {
-            console.log('object = ', {
-              provider: toRaw(web3Store.ethersProvider as JsonRpcProvider),
-              neonWallet: walletSore.neonWallet.address,
-              associatedToken,
-              splToken: this.currentSplToken,
-              amount: this.amount
-            });
-            return createMintNeonTransactionEthers({
+          DEFAULT: () =>
+            createMintNeonTransactionEthers({
               provider: toRaw(web3Store.ethersProvider as JsonRpcProvider),
               neonWallet: walletSore.neonWallet.address,
               associatedToken,
               splToken: this.currentSplToken,
               amount: this.amount
-            });
-          }
+            })
           //Used for all ERC20 token transaction (including wSOL)
         };
 
@@ -237,7 +238,9 @@ export const useFormStore = defineStore('form', {
       }
 
       await this.handleDelay(1e3);
-      await walletSore.setWalletBalance();
+      if (['SOL', 'NEON'].includes(this.currentSplToken?.symbol)) {
+        await this.initWalletUpdate();
+      }
       await walletSore.getTokenBalance(this.currentSplToken);
       await this.handleDelay(5e3);
 

diff --git a/examples/neon-transfer-vue/src/stores/wallets.ts b/examples/neon-transfer-vue/src/stores/wallets.ts
@@ -52,7 +52,6 @@ export const useWalletsStore = defineStore('wallets', {
       this.isLoading = true;
       this.setSolanaWallet();
       this.setSolanaWalletSigner();
-      await this.setTokenBalance();
       await this.setWalletBalance();
       this.isLoading = false;
     },
@@ -96,7 +95,6 @@ export const useWalletsStore = defineStore('wallets', {
     async getTokenBalance(token: SPLToken) {
       const formStore = useFormStore();
       formStore.setIsPendingTokenChange(true);
-
       try {
         switch (token.symbol) {
           case 'NEON': {
@@ -118,10 +116,15 @@ export const useWalletsStore = defineStore('wallets', {
             break;
           }
           case 'SOL': {
-            const neon = await this.getNeonBalance();
+            const balance =
+              formStore.transferDirection.direction === 'solana'
+                ? await this.getSolanaBalance()
+                : await this.getMintTokenBalance();
 
             formStore.setError(false);
-            this.updateTokenBalance({ ...this.tokenBalance, neon });
+            const newBalance = { ...this.tokenBalance };
+            newBalance[formStore.transferDirection.direction] = balance;
+            this.updateTokenBalance(newBalance);
             break;
           }
           case 'wSOL': {
@@ -131,14 +134,14 @@ export const useWalletsStore = defineStore('wallets', {
               this.solanaWallet.publicKey
             );
 
-            const transaction =
+            const balance =
               formStore.transferDirection.direction === 'solana'
                 ? await this.getSolanaBalance(associatedToken)
                 : await this.getMintTokenBalance();
 
             formStore.setError(false);
             const newBalance = { ...this.tokenBalance };
-            newBalance[formStore.transferDirection.direction] = transaction;
+            newBalance[formStore.transferDirection.direction] = balance;
             this.updateTokenBalance(newBalance);
             break;
           }