feat(tx): Add missing actions

Author: bguillaumat

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sqds/cli",
-  "version": "2.3.16",
+  "version": "2.3.17",
   "description": "",
   "main": "bin/index.js",
   "scripts": {

src/lib/api.ts

@@ -192,6 +192,14 @@ class API{
     approveTransaction = async (tx: PublicKey) => {
         return this.squads.approveTransaction(tx);
     }
+
+    rejectTransaction = async (tx: PublicKey) => {
+        return this.squads.rejectTransaction(tx);
+    }
+
+    cancelTransaction = async (tx: PublicKey) => {
+        return this.squads.cancelTransaction(tx);
+    }
 
     addKeyTransaction = async (msPDA: PublicKey, key: PublicKey) => {
         const txBuilder = await this.squads.getTransactionBuilder(msPDA, 0);

src/lib/inq/transactions.js

@@ -2,9 +2,9 @@ import inquirer from "inquirer";
 
 export default  (txs, userKey)  => {
     // console.log(txs);
-    
+
     const choices = txs.filter((tx) => {
-        return ((tx.creator.toBase58() === userKey.toBase58() && tx.status.draft ) || tx.status.active || tx.status.executeReady || tx.status.executed);
+        return ((tx.creator.toBase58() === userKey.toBase58() && tx.status.draft ) || tx.status.active || tx.status.executeReady || tx.status.executed || tx.status.rejected || tx.status.cancelled);
     }).map(tx => {
         return `${tx.publicKey.toBase58()} (${Object.keys(tx.status)[0]})`;
     });
@@ -18,7 +18,7 @@ export default  (txs, userKey)  => {
         name: 'action',
         message: 'Choose a transaction',
         choices,
-        } 
+        }
     ];
     return inquirer.prompt(txList);
-};
+};

src/lib/menu.ts

@@ -479,6 +479,52 @@ class Menu{
                 this.transaction(tx, ms, txs);
             }
         }
+        else if (action === "Reject") {
+            const {yes} = await basicConfirm(`Reject this transaction?`,false);
+            if (yes) {
+                const status = new Spinner("Rejecting transaction...");
+                status.start();
+                try {
+                    const updatedTx = await this.api.rejectTransaction(tx.publicKey);
+                    status.stop();
+                    const newInd = txs.findIndex(t => t.publicKey.toBase58() === updatedTx.publicKey.toBase58());
+                    txs.splice(newInd, 1, updatedTx);
+                    console.log("Transaction rejected");
+                    await continueInq();
+                    this.transaction(updatedTx, ms, txs);
+                }catch(e){
+                    status.stop();
+                    console.log("Error!", e);
+                    await continueInq();
+                    this.transaction(tx, ms, txs);
+                }
+            }else{
+                this.transaction(tx, ms, txs);
+            }
+        }
+        else if (action === "Submit to cancel") {
+            const {yes} = await basicConfirm(`Cancel this transaction?`,false);
+            if (yes) {
+                const status = new Spinner("Cancelling transaction...");
+                status.start();
+                try {
+                    const updatedTx = await this.api.cancelTransaction(tx.publicKey);
+                    status.stop();
+                    const newInd = txs.findIndex(t => t.publicKey.toBase58() === updatedTx.publicKey.toBase58());
+                    txs.splice(newInd, 1, updatedTx);
+                    console.log("Transaction cancel submitted");
+                    await continueInq();
+                    this.transaction(updatedTx, ms, txs);
+                }catch(e){
+                    status.stop();
+                    console.log("Error!", e);
+                    await continueInq();
+                    this.transaction(tx, ms, txs);
+                }
+            }else{
+                this.transaction(tx, ms, txs);
+            }
+        }
         else{
             this.transaction(tx, ms, txs);
         }