Cleanup

adityapk00 · May 6, 2021 · bd68c7b · bd68c7b
1 parent 08305ba
commit bd68c7b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/components/Send.js b/app/components/Send.js
@@ -249,7 +249,7 @@ const ConfirmModalInternal = ({
       if (progress && progress.sendInProgress) {
         openErrorModal(
           `Computing Transaction`,
-          `Building...\n${progress.progress} of ${progress.total}\nETA ${progress.etaSeconds}s`
+          `Step ${progress.progress} of ${progress.total}. ETA ${progress.etaSeconds}s`
         );
       }
     };

diff --git a/app/rpc.js b/app/rpc.js
@@ -440,6 +440,13 @@ export default class RPC {
         const progress = JSON.parse(native.litelib_execute('sendprogress', ''));
         console.log(progress);
 
+        const updatedProgress = new SendProgress();
+        if (progress.id === prevSendId) {
+          // Still not started, so wait for more time
+          setSendProgress(updatedProgress);
+          return;
+        }
+
         // Calculate ETA.
         let secondsPerComputation = 3; // defalt
         if (progress.progress > 0) {
@@ -453,7 +460,6 @@ export default class RPC {
           eta = 1;
         }
 
-        const updatedProgress = new SendProgress();
         updatedProgress.progress = progress.progress;
         updatedProgress.total = Math.max(progress.total, progress.progress); // sometimes, due to change, the total can be off by 1
         updatedProgress.sendInProgress = true;