feat(sdk): batch sign notes for send and retry with metamask if failed

AztecProtocol · Feb 20, 2020 · bf829fc · bf829fc
1 parent 6e35486
commit bf829fc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/packages/extension/src/ui/pages/Send.jsx b/packages/extension/src/ui/pages/Send.jsx
@@ -32,7 +32,7 @@ const Send = ({
             address: currentAddress,
         } = currentAccount;
         const steps = isGSNAvailable ? sendSteps.gsn : sendSteps.metamask;
-        const sender = isGSNAvailable ? proxyContract : currentAddress;
+        const sender = proxyContract;
 
         const asset = await makeAsset(assetAddress);
         const parsedTransactions = parseInputTransactions(transactions);
@@ -43,6 +43,7 @@ const Send = ({
 
         return {
             steps,
+            retryWithMetaMaskStep: sendSteps.metamask.slice(-1)[0],
             assetAddress,
             currentAddress,
             asset,
@@ -53,6 +54,7 @@ const Send = ({
             numberOfOutputNotes,
             userAccessAccounts,
             amount,
+            isGSNAvailable,
         };
     };
 

diff --git a/packages/extension/src/ui/steps/send.js b/packages/extension/src/ui/steps/send.js
@@ -17,23 +17,13 @@ const stepSignNotes = {
     tasks: [
         {
             type: 'sign',
-            run: apis.note.signNotes,
+            run: apis.note.signProof,
         },
     ],
     autoStart: true,
     submitTextKey: 'transaction.sign.submit',
 };
 
-const stepSignNotesForGSN = {
-    ...stepSignNotes,
-    tasks: [
-        {
-            type: 'sign',
-            run: apis.note.signProof,
-        },
-    ],
-};
-
 const stepConfirm = {
     name: 'confirm',
     descriptionKey: 'send.confirm.description',
@@ -61,7 +51,7 @@ const stepSend = {
         {
             type: 'sign',
             titleKey: 'send.send.step',
-            run: apis.asset.confidentialTransfer,
+            run: apis.asset.confidentialTransferFrom,
         },
         {
             titleKey: 'transaction.confirmed',
@@ -100,7 +90,7 @@ const stepSendViaGSN = {
 export default {
     gsn: [
         stepApprove,
-        stepSignNotesForGSN,
+        stepSignNotes,
         stepConfirmViaGSN,
         stepSendViaGSN,
     ],