From 20036594a7556bec9345be11404b44a61ac04aa2 Mon Sep 17 00:00:00 2001 From: Nicholas Rodrigues Lordello Date: Wed, 6 Nov 2024 11:32:49 +0100 Subject: [PATCH 1/3] change to trigger CI deployment --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 97e85fa559..1d41a388d4 100644 --- a/README.md +++ b/README.md @@ -141,3 +141,4 @@ This app is built using the following frameworks: - MUI - ethers.js - web3-onboard + From 0126939039d3d6868f57afe8986c5839adc711d4 Mon Sep 17 00:00:00 2001 From: Nicholas Rodrigues Lordello Date: Wed, 6 Nov 2024 15:58:43 +0100 Subject: [PATCH 2/3] small fixes for demo --- src/components/transactions/TxDetails/Summary/index.tsx | 2 +- src/components/tx/SignOrExecuteForm/index.tsx | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/components/transactions/TxDetails/Summary/index.tsx b/src/components/transactions/TxDetails/Summary/index.tsx index 1dfbc7a2e7..d4b7da65d7 100644 --- a/src/components/transactions/TxDetails/Summary/index.tsx +++ b/src/components/transactions/TxDetails/Summary/index.tsx @@ -76,7 +76,7 @@ const Summary = ({ txDetails, defaultExpanded = false, hideDecodedData = false } )} - + } - - {isCounterfactualSafe && !isDelegate && ( )} From d3a88af102a5b2265be0df10746338e923345428 Mon Sep 17 00:00:00 2001 From: Nicholas Rodrigues Lordello Date: Wed, 6 Nov 2024 16:07:31 +0100 Subject: [PATCH 3/3] disable blockaid with Safenet --- README.md | 1 - src/components/tx/SignOrExecuteForm/index.tsx | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1d41a388d4..97e85fa559 100644 --- a/README.md +++ b/README.md @@ -141,4 +141,3 @@ This app is built using the following frameworks: - MUI - ethers.js - web3-onboard - diff --git a/src/components/tx/SignOrExecuteForm/index.tsx b/src/components/tx/SignOrExecuteForm/index.tsx index 6c77d0e551..92a61b455d 100644 --- a/src/components/tx/SignOrExecuteForm/index.tsx +++ b/src/components/tx/SignOrExecuteForm/index.tsx @@ -31,6 +31,7 @@ import { findAllowingRole, findMostLikelyRole, useRoles } from './ExecuteThrough import { isAnyStakingTxInfo, isCustomTxInfo, isGenericConfirmation, isOrderTxInfo } from '@/utils/transaction-guards' import useIsSafeOwner from '@/hooks/useIsSafeOwner' import { BlockaidBalanceChanges } from '../security/blockaid/BlockaidBalanceChange' +import { Blockaid } from '../security/blockaid' import TxData from '@/components/transactions/TxDetails/TxData' import ConfirmationOrder from '@/components/tx/ConfirmationOrder' @@ -196,7 +197,7 @@ export const SignOrExecuteForm = ({ /> )} - {!isCounterfactualSafe && !props.isRejection && } + {!isSafenetEnabled && !isCounterfactualSafe && !props.isRejection && } {!isCounterfactualSafe && !props.isRejection && } @@ -223,6 +224,8 @@ export const SignOrExecuteForm = ({ {!isMultiChainMigration && } + {!isSafenetEnabled && } + {isCounterfactualSafe && !isDelegate && ( )}