history: fix auto reload run even when no new wallet or transact

N3Mobile · Jun 6, 2024 · dd3618e · dd3618e
1 parent db39d75
commit dd3618e
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/src/Screens/History/History.tsx b/src/Screens/History/History.tsx
@@ -37,7 +37,7 @@ const TransactionRecord = ({data, wallets, setModTransactID} : {data : Transacti
     let getWalletName = (id : string) => {
         if(wallets.length >0 ){
             let index : number = wallets.findIndex((wallet) => wallet.id == id);
-            return wallets[index].name;
+            return wallets[index] ? wallets[index].name : 'deleted wallet';
         }
         return "Waiting";
 
@@ -359,23 +359,14 @@ export const History = ({route} : {route : any}) => {
     useFocusEffect(   
         useCallback(() => {
             //console.log(route.params)
-
-
-            if(firstLoad){
-                if(startDate.toDateString() != (new Date(-1)).toDateString()) fetchWithCond();
-                else changeDefaultRange(3);
-                getWallet();
-                setFirstLoad(false);
-                newDataComing.newTransact = false;
-                newDataComing.newWallet = false;
-
-            }
-
-            if(!firstLoad && newDataComing.newWallet) {
+            console.log(newDataComing.newTransact, newDataComing.newWallet, firstLoad);
+            if(newDataComing.newWallet) {
                 getWallet();
                 newDataComing.newWallet = false;
             }
-            if(!firstLoad && newDataComing.newTransact) {
+            if(newDataComing.newTransact) {
+                if(startDate.toDateString() != (new Date(-1)).toDateString()) fetchWithCond();
+                else changeDefaultRange(3);
                 fetchData(startDate, endDate);
                 console.log(newDataComing.newTransact);
                 newDataComing.newTransact = false;