Merge pull request #9951 from matiu/bug/update-after-send

Bug/update after send

Author: cmgustavo

package.json

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

src/pages/home/home.spec.ts

@@ -56,7 +56,7 @@ describe('HomePage', () => {
           );
           expect(subscribeSpy).toHaveBeenCalledWith(
             'Local/TxAction',
-            instance.walletFocusHandler
+            instance.walletActionHandler
           );
           expect(subscribeSpy).toHaveBeenCalledWith(
             'Local/WalletFocus',

src/pages/home/home.ts

@@ -182,6 +182,13 @@ 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 +209,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,16 +627,19 @@ export class HomePage {
         }
       })
       .catch(err => {
-        this.processWalletError(wallet, err);
+        if (err == 'INPROGRESS') return;
+
+        this.logger.warn('Update error:', err);
 
+        this.processWalletError(wallet, err);
         this.events.publish('Local/WalletUpdate', {
           walletId: opts.walletId,
           finished: true,
           error: wallet.error
         });
 
         if (opts.alsoUpdateHistory) {
-          this.fetchTxHistory({ walletId: opts.walletId });
+          this.fetchTxHistory({ walletId: opts.walletId, force: opts.force });
         }
       });
   };

src/providers/wallet/wallet.ts

@@ -84,7 +84,7 @@ export class WalletProvider {
   // Ratio of "many utxos" warning in total balance (fee/amount)
   private TOTAL_LOW_WARNING_RATIO: number = 0.3;
 
-  private WALLET_STATUS_MAX_TRIES: number = 10;
+  private WALLET_STATUS_MAX_TRIES: number = 5;
   private WALLET_STATUS_DELAY_BETWEEN_TRIES: number = 1.6 * 1000;
   private SOFT_CONFIRMATION_LIMIT: number = 12;
   private SAFE_CONFIRMATIONS: number = 6;
@@ -319,6 +319,10 @@ export class WalletProvider {
         let diff = false;
         _.each(s1, (v, k) => {
           if (s2[k] == v) diff = true;
+          else
+            this.logger.debug(
+              `Status condition not meet: ${k} is ${s2[k]} not ${v}`
+            );
         });
 
         return diff;
@@ -976,6 +980,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 +995,7 @@ export class WalletProvider {
         return tx;
       };
 
-      if (wallet.completeHistory && wallet.completeHistoryIsValid) {
+      if (this.isHistoryCached(wallet)) {
         const tx = finish(wallet.completeHistory);
         return resolve(tx);
       } else {
@@ -1016,11 +1024,8 @@ 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) {
+        this.logger.debug('Returning cached history for ' + wallet.id);
         return resolve(wallet.completeHistory);
       }