From 325f9c3590f1f448dd174cdc09c751a7f8e8ed41 Mon Sep 17 00:00:00 2001 From: bunsy-0900 Date: Thu, 16 May 2024 11:44:02 +0700 Subject: [PATCH] fix: revert changes to fix conflict Signed-off-by: bunsy-0900 --- signup-ui/src/components/ui/button.tsx | 6 +++--- .../pages/EkycVerificationPage/useEkycVerificationStore.tsx | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/signup-ui/src/components/ui/button.tsx b/signup-ui/src/components/ui/button.tsx index 7a6c304e..17d63a05 100644 --- a/signup-ui/src/components/ui/button.tsx +++ b/signup-ui/src/components/ui/button.tsx @@ -62,9 +62,9 @@ const Button = React.forwardRef( {...props} > {isLoading ? ( - - ) : ( - <>{children} + + ) : ( + <>{children} )} ); diff --git a/signup-ui/src/pages/EkycVerificationPage/useEkycVerificationStore.tsx b/signup-ui/src/pages/EkycVerificationPage/useEkycVerificationStore.tsx index b88b1b21..52633778 100644 --- a/signup-ui/src/pages/EkycVerificationPage/useEkycVerificationStore.tsx +++ b/signup-ui/src/pages/EkycVerificationPage/useEkycVerificationStore.tsx @@ -2,8 +2,6 @@ import { isEqual } from "lodash"; import { create } from "zustand"; import { devtools } from "zustand/middleware"; - - import { Error } from "~typings/types"; export enum EkycVerificationStep {