fix: txids fix when sending

zingolabs · Nov 22, 2024 · cd19572 · cd19572
1 parent 3b6747f
commit cd19572
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/rpc/RPC.ts b/app/rpc/RPC.ts
@@ -1450,7 +1450,7 @@ export default class RPC {
           const rJson: RPCSendType = JSON.parse(r);
           if (rJson.error) {
             sendError = rJson.error;
-          } else if (rJson.txids) {
+          } else if (rJson.txids && rJson.txids.length > 0) {
             sendTxids = rJson.txids.join(', ');
           }
         } catch (e) {
@@ -1546,7 +1546,7 @@ export default class RPC {
         // sometimes the progress.sending is false and txid and error are null
         // in this moment I can use the values from the command send
 
-        if (!progress.txids && !progress.error && !sendTxids && !sendError) {
+        if ((!progress.txids || progress.txids.length === 0) && !progress.error && !sendTxids && !sendError) {
           // Still processing
           setSendProgress(updatedProgress);
           return;
@@ -1556,7 +1556,7 @@ export default class RPC {
         clearInterval(intervalID);
         setSendProgress({} as SendProgressClass);
 
-        if (progress.txids) {
+        if (progress.txids && progress.txids.length > 0) {
           // And refresh data (full refresh)
           this.refresh(true);
           // send process is about to finish - reactivate the syncing flag

diff --git a/app/rpc/types/RPCSendProgressType.ts b/app/rpc/types/RPCSendProgressType.ts
@@ -3,7 +3,7 @@ export type RPCSendProgressType = {
   sending: boolean;
   progress: number;
   total: number;
-  txids: string[] | null;
+  txids: string[];
   error: string | null;
   sync_interrupt: boolean;
 };