Merge pull request #2195 from decentdao/roles-0.2.0-bugfix-multiple-p…

…ayments-stream-creation `[roles-0.2.0]` BugFix Create Multiple Payment streams at once
decentdao · Aug 2, 2024 · a752e90 · a752e90
2 parents a3c821e + ba65fa1
commit a752e90
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/src/hooks/streams/useCreateSablierStream.ts b/src/hooks/streams/useCreateSablierStream.ts
@@ -153,7 +153,7 @@ export default function useCreateSablierStream() {
       }
 
       const preparedStreamCreationTransactions: { calldata: Hex; targetAddress: Address }[] = [];
-      const preparedTokenApprovalsTransactions: { calldata: Hex; tokenAddress: Address }[] = [];
+      const preparedTokenApprovalsTransactions: { calldata: Hex; targetAddress: Address }[] = [];
 
       linearStreams.forEach((streamData, index) => {
         const recipient = recipients[index];
@@ -195,7 +195,10 @@ export default function useCreateSablierStream() {
           calldata: sablierBatchCalldata,
           targetAddress: sablierV2Batch,
         });
-        preparedTokenApprovalsTransactions.push({ calldata: tokenCalldata, tokenAddress });
+        preparedTokenApprovalsTransactions.push({
+          calldata: tokenCalldata,
+          targetAddress: tokenAddress,
+        });
       });
 
       return { preparedStreamCreationTransactions, preparedTokenApprovalsTransactions };

diff --git a/src/hooks/utils/useCreateRoles.ts b/src/hooks/utils/useCreateRoles.ts
@@ -352,7 +352,6 @@ export default function useCreateRoles() {
       let smartAccountTxs: { calldata: Hex; targetAddress: Address }[] = [];
       let hatPaymentAddedTxs: { calldata: Hex; targetAddress: Address }[] = [];
       let hatPaymentEditedTxs: { calldata: Hex; targetAddress: Address }[] = [];
-      let hatPaymentTokenApprovalTxs: { calldata: Hex; tokenAddress: Address }[] = [];
 
       let hatPaymentWearerChangedTxs: { calldata: Hex; targetAddress: Address }[] = [];
       let hatPaymentHatRemovedTxs: { calldata: Hex; targetAddress: Address }[] = [];
@@ -530,10 +529,14 @@ export default function useCreateRoles() {
           recipients,
         );
 
-        hatPaymentTokenApprovalTxs.push(
-          ...preparedPaymentTransactions.preparedTokenApprovalsTransactions,
-        );
-        hatPaymentAddedTxs.push(...preparedPaymentTransactions.preparedStreamCreationTransactions);
+        streamsData.forEach((_, i) => {
+          hatPaymentAddedTxs.push(
+            preparedPaymentTransactions.preparedTokenApprovalsTransactions[i],
+          );
+          hatPaymentAddedTxs.push(
+            preparedPaymentTransactions.preparedStreamCreationTransactions[i],
+          );
+        });
       }
 
       if (editedPayrollHats.length) {
@@ -576,10 +579,15 @@ export default function useCreateRoles() {
           streamsData,
           recipients,
         );
-        hatPaymentTokenApprovalTxs.push(
-          ...preparedPaymentTransactions.preparedTokenApprovalsTransactions,
-        );
-        hatPaymentEditedTxs.push(...preparedPaymentTransactions.preparedStreamCreationTransactions);
+
+        streamsData.forEach((_, i) => {
+          hatPaymentEditedTxs.push(
+            preparedPaymentTransactions.preparedTokenApprovalsTransactions[i],
+          );
+          hatPaymentEditedTxs.push(
+            preparedPaymentTransactions.preparedStreamCreationTransactions[i],
+          );
+        });
       }
 
       const proposalTransactions = {
@@ -589,7 +597,6 @@ export default function useCreateRoles() {
           ...removeHatTxs.map(() => topHatAccount),
           ...transferHatTxs.map(() => hatsProtocol),
           ...hatDetailsChangedTxs.map(() => hatsProtocol),
-          ...hatPaymentTokenApprovalTxs.map(({ tokenAddress }) => tokenAddress),
           ...hatPaymentAddedTxs.map(({ targetAddress }) => targetAddress),
           ...hatPaymentEditedTxs.map(({ targetAddress }) => targetAddress),
         ],
@@ -599,7 +606,6 @@ export default function useCreateRoles() {
           ...removeHatTxs,
           ...transferHatTxs,
           ...hatDetailsChangedTxs,
-          ...hatPaymentTokenApprovalTxs.map(({ calldata }) => calldata),
           ...hatPaymentAddedTxs.map(({ calldata }) => calldata),
           ...hatPaymentEditedTxs.map(({ calldata }) => calldata),
         ],
@@ -610,7 +616,6 @@ export default function useCreateRoles() {
           ...removeHatTxs.map(() => 0n),
           ...transferHatTxs.map(() => 0n),
           ...hatDetailsChangedTxs.map(() => 0n),
-          ...hatPaymentTokenApprovalTxs.map(() => 0n),
           ...hatPaymentAddedTxs.map(() => 0n),
           ...hatPaymentEditedTxs.map(() => 0n),
         ],