add loading state

MystenLabs · May 31, 2024 · 7c10f7a · 7c10f7a
1 parent 43350b2
commit 7c10f7a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/apps/wallet/src/ui/app/components/known-scam-overlay/useShowScamWarning.tsx b/apps/wallet/src/ui/app/components/known-scam-overlay/useShowScamWarning.tsx
@@ -8,7 +8,7 @@ import { useCheckBlocklist } from '../../hooks/useDomainBlocklist';
 
 export function useShowScamWarning({ hostname }: { hostname?: string }) {
 	const [userBypassed, setUserBypassed] = useState(false);
-	const { data } = useCheckBlocklist(hostname);
+	const { data, isPending } = useCheckBlocklist(hostname);
 	const bypass = () => setUserBypassed(true);
 
 	useEffect(() => {
@@ -19,6 +19,7 @@ export function useShowScamWarning({ hostname }: { hostname?: string }) {
 
 	return {
 		isOpen: !!data?.block && !userBypassed,
+		isPending: isPending,
 		userBypassed,
 		bypass,
 	};

diff --git a/apps/wallet/src/ui/app/components/user-approve-container/index.tsx b/apps/wallet/src/ui/app/components/user-approve-container/index.tsx
@@ -60,7 +60,11 @@ export function UserApproveContainer({
 	const { data: selectedAccount } = useAccountByAddress(address);
 	const parsedOrigin = useMemo(() => new URL(origin), [origin]);
 
-	const { isOpen, bypass } = useShowScamWarning({ hostname: parsedOrigin.hostname });
+	const {
+		isOpen,
+		isPending: isDomainCheckLoading,
+		bypass,
+	} = useShowScamWarning({ hostname: parsedOrigin.hostname });
 
 	return (
 		<>
@@ -110,7 +114,7 @@ export function UserApproveContainer({
 										handleOnResponse(true);
 									}}
 									disabled={approveDisabled}
-									loading={submitting || approveLoading}
+									loading={submitting || approveLoading || isDomainCheckLoading}
 									text={approveTitle}
 								/>
 							</>