fix: not lose SOL and SP balances after refresh

Author: nicolastmaia

src/components/AccountList/index.tsx

@@ -11,7 +11,7 @@ import { ReactComponent as SolanaToken } from './assets/solana-token.svg';
 import { ReactComponent as SpToken } from './assets/sp-token.svg';
 import PassportInfo from '../PassportInfo';
 import SelectActivePassportPopup from '../SelectActivePassportPopup';
-import { refreshSolanaBalances } from '../../services/wallets';
+import { refreshSolanaBalances, storeSystemData } from '../../services/wallets';
 import { CoNET_Data } from '../../utils/globals';
 
 interface AccountListProps {
@@ -63,6 +63,8 @@ export default function AccountList({ showMainWallet = true, simplifiedView = fa
     try {
       await refreshSolanaBalances(profiles?.[1]);
 
+      storeSystemData();
+
       const tmpData = CoNET_Data;
 
       if (!tmpData) {

src/services/listeners.ts

@@ -173,7 +173,8 @@ const getProfileAssets = async (profile: profile, solanaProfile: profile) => {
     }
 
     if (solanaProfile.tokens?.sol) {
-      solanaProfile.tokens.sol.balance = sol === false ? "" : sol?.toFixed(6);
+      solanaProfile.tokens.sol.balance =
+        sol === false ? solanaProfile.tokens.sol.balance : sol?.toFixed(6);
     } else {
       solanaProfile.tokens.sol = {
         balance: sol === false ? "" : sol?.toFixed(6),
@@ -186,7 +187,9 @@ const getProfileAssets = async (profile: profile, solanaProfile: profile) => {
 
     if (solanaProfile.tokens?.sp) {
       solanaProfile.tokens.sp.balance =
-        sp === false ? "" : parseFloat(sp).toFixed(6);
+        sp === false
+          ? solanaProfile.tokens.sp.balance
+          : parseFloat(sp).toFixed(6);
     } else {
       solanaProfile.tokens.sp = {
         balance: sp === false ? "" : parseFloat(sp).toFixed(6),

src/services/wallets.ts

@@ -146,7 +146,7 @@ const createOrGetWallet = async (secretPhrase: string | null) => {
 
   storeSystemData();
 
-  const profiles = CoNET_Data.profiles[0];
+  const profiles = CoNET_Data.profiles;
 
   return profiles;
 };
@@ -594,7 +594,8 @@ const refreshSolanaBalances = async (solanaProfile: profile) => {
     ]);
 
     if (solanaProfile.tokens?.sol) {
-      solanaProfile.tokens.sol.balance = sol === false ? "" : sol?.toFixed(6);
+      solanaProfile.tokens.sol.balance =
+        sol === false ? solanaProfile.tokens.sol.balance : sol?.toFixed(6);
     } else {
       solanaProfile.tokens.sol = {
         balance: sol === false ? "" : sol?.toFixed(6),
@@ -607,7 +608,9 @@ const refreshSolanaBalances = async (solanaProfile: profile) => {
 
     if (solanaProfile.tokens?.sp) {
       solanaProfile.tokens.sp.balance =
-        sp === false ? "" : parseFloat(sp).toFixed(6);
+        sp === false
+          ? solanaProfile.tokens.sp.balance
+          : parseFloat(sp).toFixed(6);
     } else {
       solanaProfile.tokens.sp = {
         balance: sp === false ? "" : parseFloat(sp).toFixed(6),