feat: accept otp in the withdrawal form and pass it down to send API

BTC-1236
BitGo · Jul 18, 2024 · b3f1b6d · b3f1b6d
1 parent 3d3426d
commit b3f1b6d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/containers/V1BtcSweep/V1BtcSweepForm.tsx b/src/containers/V1BtcSweep/V1BtcSweepForm.tsx
@@ -10,6 +10,7 @@ const validationSchema = Yup.object({
   unspents: Yup.mixed().required(),
   destinationAddress: Yup.string().required(),
   encryptedUserKey: Yup.string().required(),
+  otp: Yup.string().required(),
 }).required();
 
 export type V1BtcSweepFormProps = {
@@ -30,6 +31,7 @@ export function V1BtcSweepForm({onSubmit}: V1BtcSweepFormProps) {
       unspents: undefined,
       destinationAddress: '',
       encryptedUserKey: '',
+      otp: '',
     },
     validationSchema,
   });
@@ -82,6 +84,14 @@ export function V1BtcSweepForm({onSubmit}: V1BtcSweepFormProps) {
             }}
           />
         </div>
+        <div className="tw-mb-4">
+          <FormikTextfield
+            HelperText={`2FA`}
+            Label="2FA Code"
+            name="otp"
+            Width="fill"
+          />
+        </div>
 
         <div className="tw-flex tw-flex-col-reverse sm:tw-justify-between sm:tw-flex-row tw-gap-1 tw-mt-4">
           <Button Tag={Link} to="/" Variant="secondary" Width="hug">

diff --git a/src/containers/V1BtcSweep/index.tsx b/src/containers/V1BtcSweep/index.tsx
@@ -36,6 +36,7 @@ export function V1BtcSweep() {
           try {
             const unspents = JSON.parse(event.target?.result as string) as BitGoV1Unspent[];
             setSubmitting(true);
+            await window.commands.unlock(values.otp);
             const chainData = await window.queries.getChain(coin);
             const result = await window.commands.sweepV1(coin, {
               walletId: values.walletId,
@@ -68,14 +69,14 @@ export function V1BtcSweep() {
               `/${environment}/v1btc-sweep/${coin}/success`
             );
           } catch (error) {
+            setSubmitting(false);
+            console.log(error);
             if (error instanceof Error) {
-              setFieldError('unspents', error.message);
               setAlert(error.message);
-            } else {
-              console.log(error);
             }
+          } finally {
+            setSubmitting(false);
           }
-          setSubmitting(false);
         };
 
       }}