feat(sdk): batch sign notes for create note from balance proof

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

Hide file tree

Showing 2 changed files with 6 additions and 14 deletions.
diff --git a/packages/extension/src/ui/pages/CreateNoteFromBalance.jsx b/packages/extension/src/ui/pages/CreateNoteFromBalance.jsx
@@ -61,7 +61,7 @@ const CreateNoteFromBalance = ({
         const userAccessAccounts = userAccess
             ? await apis.account.batchGetExtensionAccount(userAccess)
             : [];
-        const sender = isGSNAvailable ? proxyContract : currentAddress;
+        const sender = proxyContract;
         const amount = parseInputAmount(inputAmount);
         const transactions = [
             {
@@ -72,6 +72,7 @@ const CreateNoteFromBalance = ({
 
         return {
             steps,
+            retryWithMetaMaskStep: createNoteFromBalanceSteps.metamask.slice(-1)[0],
             assetAddress,
             currentAddress,
             asset,
@@ -84,6 +85,7 @@ const CreateNoteFromBalance = ({
             spender: sender,
             transactions,
             gsnConfig,
+            isGSNAvailable,
         };
     };
 

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