do not refresh history if update is in progress

Author: matiu

package.json

@@ -314,4 +314,4 @@
   "prettier": {
     "singleQuote": true
   }
-}
+}

src/pages/home/home.ts

@@ -182,6 +182,14 @@ export class HomePage {
     this.fetchWalletStatus(opts);
   };
 
+
+  private walletActionHandler = opts => {
+    this.logger.debug('RECV Local/TxAction @home', opts);
+    opts = opts || {};
+    opts.alsoUpdateHistory = true;
+    this.fetchWalletStatus(opts);
+  };
+
   ionViewDidLoad() {
     this.logger.info('Loaded: HomePage');
 
@@ -202,7 +210,7 @@ export class HomePage {
       this.events.subscribe('Local/WalletListChange', this.setWallets);
 
       // Reject, Remove, OnlyPublish and SignAndBroadcast -> Update Status per Wallet -> Update txps
-      this.events.subscribe('Local/TxAction', this.walletFocusHandler);
+      this.events.subscribe('Local/TxAction', this.walletActionHandler);
 
       // Wallet is focused on some inner view, therefore, we refresh its status and txs
       this.events.subscribe('Local/WalletFocus', this.walletFocusHandler);
@@ -620,8 +628,8 @@ export class HomePage {
         }
       })
       .catch(err => {
+        if (err == 'INPROGRESS') return;
         this.processWalletError(wallet, err);
-
         this.events.publish('Local/WalletUpdate', {
           walletId: opts.walletId,
           finished: true,
@@ -631,6 +639,7 @@ export class HomePage {
         if (opts.alsoUpdateHistory) {
           this.fetchTxHistory({ walletId: opts.walletId });
         }
+
       });
   };
 

src/providers/wallet/wallet.ts

@@ -976,6 +976,10 @@ export class WalletProvider {
     });
   }
 
+  private isHistoryCached(wallet): boolean  {
+    return wallet.completeHistory && wallet.completeHistoryIsValid;
+  };
+
   public getTx(wallet, txid: string): Promise<any> {
     return new Promise((resolve, reject) => {
       const finish = list => {
@@ -987,7 +991,7 @@ export class WalletProvider {
         return tx;
       };
 
-      if (wallet.completeHistory && wallet.completeHistoryIsValid) {
+      if (this.isHistoryCached(wallet)) {
         const tx = finish(wallet.completeHistory);
         return resolve(tx);
       } else {
@@ -1006,6 +1010,7 @@ export class WalletProvider {
     });
   }
 
+
   public fetchTxHistory(
     wallet,
     progressFn,
@@ -1016,11 +1021,7 @@ export class WalletProvider {
 
       if (!wallet.isComplete()) return resolve();
 
-      const isHistoryCached = () => {
-        return wallet.completeHistory && wallet.completeHistoryIsValid;
-      };
-
-      if (isHistoryCached() && !opts.force) {
+      if (this.isHistoryCached(wallet) && !opts.force) {
         return resolve(wallet.completeHistory);
       }