From 4148903e888527eebbd26a3775b1c2649d3160c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=B3vis=20Neto?= <clovisdasilvaneto@gmail.com>
Date: Tue, 17 Sep 2024 14:21:19 +0200
Subject: [PATCH] fix: move error condition to top of the confirmation view
 component

---
 .../__snapshots__/SignOrExecute.test.tsx.snap | 83 +++++++++----------
 src/components/tx/SignOrExecuteForm/index.tsx |  6 +-
 2 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/src/components/tx/SignOrExecuteForm/__tests__/__snapshots__/SignOrExecute.test.tsx.snap b/src/components/tx/SignOrExecuteForm/__tests__/__snapshots__/SignOrExecute.test.tsx.snap
index 1e6b92d792..72e2173472 100644
--- a/src/components/tx/SignOrExecuteForm/__tests__/__snapshots__/SignOrExecute.test.tsx.snap
+++ b/src/components/tx/SignOrExecuteForm/__tests__/__snapshots__/SignOrExecute.test.tsx.snap
@@ -263,53 +263,50 @@ exports[`SignOrExecute should display an error screen 1`] = `
       class="MuiCardContent-root cardContent css-46bh2p-MuiCardContent-root"
     >
       <div
-        class="MuiBox-root css-17luq05"
+        class="container"
       >
         <div
-          class="box MuiBox-root css-0"
+          class="wrapper"
         >
-          <div
-            class="rect rectTl"
-          />
-          <div
-            class="rect rectTr"
-          />
-          <div
-            class="rect rectBl"
-          />
-          <div
-            class="rect rectBr"
-          />
-          <div
-            class="rect rectCenter"
-          />
-          <svg
-            version="1.1"
-            xmlns="http://www.w3.org/2000/svg"
+          <h3
+            class="MuiTypography-root MuiTypography-h3 css-mv4yuw-MuiTypography-root"
           >
-            <defs>
-              <filter
-                id="gooey"
-              >
-                <fegaussianblur
-                  in="SourceGraphic"
-                  result="blur"
-                  stdDeviation="3"
-                />
-                <fecolormatrix
-                  in="blur"
-                  mode="matrix"
-                  result="goo"
-                  values="1 0 0 0 0  0 1 0 0 0  0 0 1 0 0  0 0 0 19 -9"
-                />
-                <fecomposite
-                  in="SourceGraphic"
-                  in2="goo"
-                  operator="atop"
-                />
-              </filter>
-            </defs>
-          </svg>
+            Something went wrong,
+            <br />
+            please try again.
+          </h3>
+          <span
+            class="MuiBadge-root badge css-1c32n2y-MuiBadge-root"
+          >
+            <div
+              class="circle MuiBox-root css-1ngw63v"
+            >
+              <mock-icon
+                aria-hidden="true"
+                classname="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-82oui0-MuiSvgIcon-root"
+                focusable="false"
+              />
+            </div>
+            <span
+              class="MuiBadge-badge MuiBadge-dot MuiBadge-anchorOriginBottomRight MuiBadge-anchorOriginBottomRightCircular MuiBadge-overlapCircular MuiBadge-colorWarning css-harjv7-MuiBadge-badge"
+            />
+          </span>
+          <p
+            class="MuiTypography-root MuiTypography-body1 css-97ibp6-MuiTypography-root"
+          >
+            Error: This is a mock error message
+          </p>
+          <p
+            class="MuiTypography-root MuiTypography-body1 css-97ibp6-MuiTypography-root"
+          >
+            SignOrExecuteForm/index
+          </p>
+          <a
+            class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways css-1su57z-MuiTypography-root-MuiLink-root"
+            href="/welcome"
+          >
+            Go home
+          </a>
         </div>
       </div>
     </div>
diff --git a/src/components/tx/SignOrExecuteForm/index.tsx b/src/components/tx/SignOrExecuteForm/index.tsx
index 419b696157..095ca2e674 100644
--- 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} />
   )