diff --git a/src/components/AdvancedSettingsAccordion.tsx b/src/components/AdvancedSettingsAccordion.tsx index 8a9a00e8f2..1afd0077fa 100644 --- a/src/components/AdvancedSettingsAccordion.tsx +++ b/src/components/AdvancedSettingsAccordion.tsx @@ -19,7 +19,11 @@ import colors from "../style/colors"; import { mutezToTez, tezToMutez } from "../utils/format"; import { Estimation, TEZ_DECIMALS } from "../utils/tezos"; -export const AdvancedSettingsAccordion = ({ index = 0 }) => { +type AdvancedSettingsAccordionProps = { + index?: number; +}; + +export const AdvancedSettingsAccordion = ({ index = 0 }: AdvancedSettingsAccordionProps) => { const { register, getValues, diff --git a/src/components/SendFlow/BatchModalBody.tsx b/src/components/SendFlow/BatchModalBody.tsx index 63b3611cc8..c1b183b113 100644 --- a/src/components/SendFlow/BatchModalBody.tsx +++ b/src/components/SendFlow/BatchModalBody.tsx @@ -12,7 +12,8 @@ export const BatchModalBody: React.FC<{ title: string; operation: EstimatedAccountOperations; transactionCount: number; -}> = ({ title, operation, transactionCount }) => ( + children?: React.ReactNode; +}> = ({ title, operation, transactionCount, children }) => ( <> @@ -29,6 +30,7 @@ export const BatchModalBody: React.FC<{ + {children} ); diff --git a/src/components/SendFlow/Multisig/SignPage.tsx b/src/components/SendFlow/Multisig/SignPage.tsx index 4b9cb6d1d2..440da40a1a 100644 --- a/src/components/SendFlow/Multisig/SignPage.tsx +++ b/src/components/SendFlow/Multisig/SignPage.tsx @@ -9,6 +9,7 @@ import { EstimatedAccountOperations } from "../../../types/AccountOperations"; import { ApproveOrExecute } from "../../../types/Operation"; import { useAsyncActionHandler } from "../../../utils/hooks/useAsyncActionHandler"; import { executeOperations } from "../../../utils/tezos"; +import { AdvancedSettingsAccordion } from "../../AdvancedSettingsAccordion"; import { DynamicModalContext } from "../../DynamicModal"; import { BatchModalBody } from "../BatchModalBody"; import { SignButton } from "../SignButton"; @@ -28,14 +29,15 @@ export const SignPage: React.FC<{ defaultValues: { executeParams: operation.estimates }, }); - // TODO: add advanced execute params component + const estimatedOperations = { + ...operation, + estimates: form.watch("executeParams"), + }; + const approveOrExecute = (tezosToolkit: TezosToolkit) => handleAsyncAction( async () => { - const { opHash } = await executeOperations( - { ...operation, estimates: form.watch("executeParams") }, - tezosToolkit - ); + const { opHash } = await executeOperations(estimatedOperations, tezosToolkit); return openWith(); }, @@ -48,7 +50,13 @@ export const SignPage: React.FC<{
- + + +