fix: totp error toast

juspay · Nov 18, 2024 · 0662f06 · 0662f06
1 parent 7899e26
commit 0662f06
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/src/components/SelectBox.res b/src/components/SelectBox.res
@@ -1623,7 +1623,7 @@ module BaseDropdown = {
 
     let showBorder = isFilterSection && !isMobileView ? Some(false) : showBorder
 
-    let dropdownOuterClass = "border border-jp-gray-lightmode_steelgray border-opacity-75 dark:border-jp-gray-960 rounded  shadow-generic_shadow dark:shadow-generic_shadow_dark"
+    let dropdownOuterClass = "border border-jp-gray-lightmode_steelgray border-opacity-75 dark:border-jp-gray-960 rounded  shadow-generic_shadow dark:shadow-generic_shadow_dark z-40"
 
     let newInputSelect = input->ffInputToSelectInput
     let newInputRadio = input->ffInputToRadioInput

diff --git a/src/entryPoints/AuthModule/Common/CommonAuthTypes.res b/src/entryPoints/AuthModule/Common/CommonAuthTypes.res
@@ -39,5 +39,7 @@ type subCode =
   | UR_48
   | UR_49
   | UR_06
+  | UR_37
+  | UR_39
 
 type modeType = TestButtonMode | LiveButtonMode
diff --git a/src/entryPoints/AuthModule/Common/CommonAuthUtils.res b/src/entryPoints/AuthModule/Common/CommonAuthUtils.res
@@ -131,6 +131,8 @@ let errorSubCodeMapper = (subCode: string) => {
   | "UR_48" => UR_48
   | "UR_49" => UR_49
   | "UR_06" => UR_06
+  | "UR_37" => UR_37
+  | "UR_39" => UR_39
   | _ => UR_00
   }
 }

diff --git a/src/entryPoints/AuthModule/TwoFaAuth/TotpSetup.res b/src/entryPoints/AuthModule/TwoFaAuth/TotpSetup.res
@@ -155,8 +155,11 @@ module ConfigureTotpScreen = {
       | Exn.Error(e) => {
           let err = Exn.message(e)->Option.getOr("Something went wrong")
           let errorCode = err->safeParse->getDictFromJsonObject->getString("code", "")
+          let errorMessage = err->safeParse->getDictFromJsonObject->getString("message", "")
           if errorCode->CommonAuthUtils.errorSubCodeMapper == UR_48 {
             errorHandling()
+          } else if errorCode->CommonAuthUtils.errorSubCodeMapper == UR_37 {
+            showToast(~message=errorMessage, ~toastType=ToastError)
           }
           setOtp(_ => "")
           setButtonState(_ => Button.Normal)

diff --git a/src/screens/Hooks/TotpHooks.res b/src/screens/Hooks/TotpHooks.res
@@ -18,8 +18,10 @@ let useVerifyTotp = () => {
 
 let useVerifyRecoveryCode = () => {
   open APIUtils
+  open LogicUtils
   let getURL = useGetURL()
   let updateDetails = useUpdateMethod()
+  let showToast = ToastState.useShowToast()
   async body => {
     try {
       let url = getURL(~entityName=USERS, ~userType=#VERIFY_RECOVERY_CODE, ~methodType=Post)
@@ -28,6 +30,11 @@ let useVerifyRecoveryCode = () => {
     } catch {
     | Exn.Error(e) => {
         let err = Exn.message(e)->Option.getOr("Failed to Fetch!")
+        let errorCode = err->safeParse->getDictFromJsonObject->getString("code", "")
+        let errorMessage = err->safeParse->getDictFromJsonObject->getString("message", "")
+        if errorCode->CommonAuthUtils.errorSubCodeMapper == UR_39 {
+          showToast(~message=errorMessage, ~toastType=ToastError)
+        }
         Exn.raiseError(err)
       }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,5 +39,7 @@ type subCode = @@
       | UR_48
       | UR_49
       | UR_06
+      | UR_37
+      | UR_39
     type modeType = TestButtonMode | LiveButtonMode