fix: move error condition to top of the confirmation view component

safe-global · Sep 17, 2024 · 7250d54 · 7250d54
1 parent 9f2bab4
commit 7250d54
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/components/tx/SignOrExecuteForm/index.tsx b/src/components/tx/SignOrExecuteForm/index.tsx
@@ -27,12 +27,12 @@ const SignOrExecute = (props: SignOrExecuteExtendedProps) => {
 
   const [txDetails, error, isLoading] = useProposeTx(safeTx, props.txId, props.origin)
 
-  return isLoading || !safeTx || !txDetails ? (
-    <SignOrExecuteSkeleton />
-  ) : error ? (
+  return error ? (
     <TxCard>
       <ErrorBoundary error={error} componentStack="SignOrExecuteForm/index" />
     </TxCard>
+  ) : isLoading || !safeTx || !txDetails ? (
+    <SignOrExecuteSkeleton />
   ) : (
     <SignOrExecuteForm {...props} isCreation={!props.txId} txId={props.txId || txDetails.txId} txDetails={txDetails} />
   )