diff --git a/src/containers/BuildUnsignedSweepCoin/BuildUnsignedSweepCoin.tsx b/src/containers/BuildUnsignedSweepCoin/BuildUnsignedSweepCoin.tsx index d78156b0..4d65baec 100644 --- a/src/containers/BuildUnsignedSweepCoin/BuildUnsignedSweepCoin.tsx +++ b/src/containers/BuildUnsignedSweepCoin/BuildUnsignedSweepCoin.tsx @@ -843,12 +843,17 @@ function Form() { try { await window.commands.setBitGoEnvironment(bitGoEnvironment, coin); const chainData = await window.queries.getChain(coin); + const { publicKey, secretKey } = values; + const durableNonce = + publicKey && secretKey ? { publicKey, secretKey } : undefined; const recoverData = await window.commands.recover(coin, { bitgoKey: values.bitgoKey.replace(/\s+/g, ''), ignoreAddressTypes: [], userKey: '', backupKey: '', recoveryDestination: values.recoveryDestination, + seed: values.seed, + durableNonce, }); assert( isRecoveryTransaction(recoverData), @@ -914,6 +919,7 @@ function Form() { userKey: '', backupKey: '', recoveryDestination: values.recoveryDestination, + seed: values.seed, }); assert( isRecoveryTransaction(recoverData), diff --git a/src/containers/BuildUnsignedSweepCoin/CardanoForm.tsx b/src/containers/BuildUnsignedSweepCoin/CardanoForm.tsx index 8094f2e4..d85fb852 100644 --- a/src/containers/BuildUnsignedSweepCoin/CardanoForm.tsx +++ b/src/containers/BuildUnsignedSweepCoin/CardanoForm.tsx @@ -13,8 +13,7 @@ import { const validationSchema = Yup.object({ bitgoKey: Yup.string().required(), recoveryDestination: Yup.string().required(), - scan: Yup.number().required(), - startingScanIndex: Yup.number().required(), + seed: Yup.string(), }).required(); export type CardanoFormProps = { @@ -32,8 +31,7 @@ export function CardanoForm({ onSubmit }: CardanoFormProps) { initialValues: { bitgoKey: '', recoveryDestination: '', - scan: 20, - startingScanIndex: 0, + seed: undefined, }, validationSchema, }); @@ -54,25 +52,17 @@ export function CardanoForm({ onSubmit }: CardanoFormProps) {
-
-
-
diff --git a/src/containers/BuildUnsignedSweepCoin/SolanaForm.tsx b/src/containers/BuildUnsignedSweepCoin/SolanaForm.tsx index 13bf79e0..6d753e29 100644 --- a/src/containers/BuildUnsignedSweepCoin/SolanaForm.tsx +++ b/src/containers/BuildUnsignedSweepCoin/SolanaForm.tsx @@ -13,8 +13,7 @@ import { const validationSchema = Yup.object({ bitgoKey: Yup.string().required(), recoveryDestination: Yup.string().required(), - scan: Yup.number().required(), - startingScanIndex: Yup.number().required(), + seed: Yup.string(), }) .required() .shape( @@ -50,10 +49,9 @@ export function SolanaForm({ onSubmit }: SolanaFormProps) { initialValues: { bitgoKey: '', recoveryDestination: '', - scan: 20, - startingScanIndex: 0, publicKey: '', secretKey: '', + seed: undefined, }, validationSchema, }); @@ -82,6 +80,14 @@ export function SolanaForm({ onSubmit }: SolanaFormProps) { Width="fill" /> +
+ +
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -