From 728c9fb1e2be41d506c668c2511b65155ac3b0d8 Mon Sep 17 00:00:00 2001
From: Devan Non <devanon@chainstride.capital>
Date: Tue, 6 Aug 2024 20:30:00 +0200
Subject: [PATCH 1/2] fix: guard not set or unsupported

---
 src/components/new-safe/load/steps/SafeOwnerStep/index.tsx | 4 +++-
 src/hooks/loadables/useLoadSafeInfo.ts                     | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/new-safe/load/steps/SafeOwnerStep/index.tsx b/src/components/new-safe/load/steps/SafeOwnerStep/index.tsx
index 252d18bb..f661f23a 100644
--- a/src/components/new-safe/load/steps/SafeOwnerStep/index.tsx
+++ b/src/components/new-safe/load/steps/SafeOwnerStep/index.tsx
@@ -90,7 +90,9 @@ const SafeOwnerStep = ({ data, onSubmit, onBack }: StepRenderProps<LoadSafeFormD
               </>
             ) : error ? (
               <>
-                <ErrorMessage>Error loading Safe owners, please try again or change your RPC URL.</ErrorMessage>
+                <ErrorMessage error={error}>
+                  Error loading Safe owners, please try again or change your RPC URL.
+                </ErrorMessage>
               </>
             ) : (
               fields.map((field, index) => <OwnerRow key={field.id} index={index} groupName="owners" readOnly />)
diff --git a/src/hooks/loadables/useLoadSafeInfo.ts b/src/hooks/loadables/useLoadSafeInfo.ts
index eac1997e..57fa05d6 100644
--- a/src/hooks/loadables/useLoadSafeInfo.ts
+++ b/src/hooks/loadables/useLoadSafeInfo.ts
@@ -25,7 +25,7 @@ export const getSafeInfo = async (sdk: Safe, implementation: string): Promise<Sa
     sdk.getThreshold(),
     sdk.getOwners(),
     sdk.getModules(),
-    sdk.getGuard(),
+    sdk.getGuard().catch(console.error),
     sdk.getFallbackHandler(),
     sdk.getContractVersion(),
   ])
@@ -51,7 +51,7 @@ export const getSafeInfo = async (sdk: Safe, implementation: string): Promise<Sa
     implementationVersionState,
 
     modules: modules.map(addressEx),
-    guard: addressEx(guard),
+    guard: guard ? addressEx(guard) : null,
     fallbackHandler: addressEx(fallbackHandler),
     version,
 

From 89729ee190685e0bc313e72468cf4f99454cc130 Mon Sep 17 00:00:00 2001
From: Devan Non <devanon@chainstride.capital>
Date: Tue, 6 Aug 2024 20:43:41 +0200
Subject: [PATCH 2/2] use new checkout workflow version

---
 .github/workflows/deploy.yml                 | 2 +-
 .github/workflows/lint.yml                   | 2 +-
 .github/workflows/nextjs-bundle-analysis.yml | 2 +-
 .github/workflows/unit-tests.yml             | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1f31fec1..0b716c36 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -8,7 +8,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         uses: ./.github/workflows/yarn
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index a52e29d9..c1cea1d7 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -9,7 +9,7 @@ jobs:
   eslint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         uses: ./.github/workflows/yarn
diff --git a/.github/workflows/nextjs-bundle-analysis.yml b/.github/workflows/nextjs-bundle-analysis.yml
index b6c020a7..56ee2d8c 100644
--- a/.github/workflows/nextjs-bundle-analysis.yml
+++ b/.github/workflows/nextjs-bundle-analysis.yml
@@ -15,7 +15,7 @@ jobs:
   analyze:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         uses: ./.github/workflows/yarn
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 8ae2bebe..e75a81d1 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -14,7 +14,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         uses: ./.github/workflows/yarn