diff --git a/package.json b/package.json index 15982fc039..f632180d8b 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "@gnosis.pm/safe-core-sdk": "^2.0.0", "@gnosis.pm/safe-deployments": "^1.8.0", "@gnosis.pm/safe-react-components": "^0.9.8", - "@gnosis.pm/safe-react-gateway-sdk": "^2.10.0", + "@gnosis.pm/safe-react-gateway-sdk": "^2.10.1", "@gnosis.pm/safe-web3-lib": "^1.0.0", "@material-ui/core": "^4.12.3", "@material-ui/icons": "^4.11.0", diff --git a/src/logic/safe/store/models/types/gateway.d.ts b/src/logic/safe/store/models/types/gateway.d.ts index 1455570485..7b91bf44e4 100644 --- a/src/logic/safe/store/models/types/gateway.d.ts +++ b/src/logic/safe/store/models/types/gateway.d.ts @@ -14,6 +14,8 @@ import { TransactionListItem, TransactionListPage, TransactionStatus, + TransactionInfo, + SettingsChange, } from '@gnosis.pm/safe-react-gateway-sdk' /** diff --git a/src/routes/safe/components/Transactions/TxList/TxCollapsed.tsx b/src/routes/safe/components/Transactions/TxList/TxCollapsed.tsx index ad5db945a6..f309e4e81c 100644 --- a/src/routes/safe/components/Transactions/TxList/TxCollapsed.tsx +++ b/src/routes/safe/components/Transactions/TxList/TxCollapsed.tsx @@ -44,6 +44,8 @@ const TxInfo = ({ info, name }: { info: AssetInfo; name?: string }) => { case 'SWAP_OWNER': case 'CHANGE_THRESHOLD': case 'CHANGE_IMPLEMENTATION': + case 'SET_GUARD': + case 'DELETE_GUARD': break case 'ENABLE_MODULE': case 'DISABLE_MODULE': diff --git a/src/routes/safe/components/Transactions/TxList/TxInfoSettings.tsx b/src/routes/safe/components/Transactions/TxList/TxInfoSettings.tsx index dab61806cd..56c2469ac8 100644 --- a/src/routes/safe/components/Transactions/TxList/TxInfoSettings.tsx +++ b/src/routes/safe/components/Transactions/TxList/TxInfoSettings.tsx @@ -1,4 +1,4 @@ -import { SettingsChange } from '@gnosis.pm/safe-react-gateway-sdk' +import { SettingsChange, SettingsInfo } from '@gnosis.pm/safe-react-gateway-sdk' import { ReactElement } from 'react' import { AddressInfo } from './AddressInfo' @@ -85,7 +85,21 @@ export const TxInfoSettings = ({ settingsInfo }: TxInfoSettingsProps): ReactElem ) } + case 'SET_GUARD': { + return ( + + + + ) + } + case 'DELETE_GUARD': { + return {null} + } default: - return null + return {null} } } diff --git a/src/routes/safe/components/Transactions/TxList/hooks/useTransactionType.ts b/src/routes/safe/components/Transactions/TxList/hooks/useTransactionType.ts index c26a9e4592..976058ca01 100644 --- a/src/routes/safe/components/Transactions/TxList/hooks/useTransactionType.ts +++ b/src/routes/safe/components/Transactions/TxList/hooks/useTransactionType.ts @@ -37,7 +37,10 @@ export const useTransactionType = (tx: Transaction): TxTypeProps => { break } case 'SettingsChange': { - setType({ icon: SettingsTxIcon, text: tx.txInfo.dataDecoded.method }) + // deleteGuard doesn't exist in Solidity + // It is decoded as 'setGuard' with a settingsInfo.type of 'DELETE_GUARD' + const isDeleteGuard = tx.txInfo.settingsInfo?.type === 'DELETE_GUARD' + setType({ icon: SettingsTxIcon, text: isDeleteGuard ? 'deleteGuard' : tx.txInfo.dataDecoded.method }) break } case 'Custom': { diff --git a/yarn.lock b/yarn.lock index a0c777fed0..e0bd0c00dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1965,10 +1965,10 @@ react-media "^1.10.0" web3-utils "^1.6.0" -"@gnosis.pm/safe-react-gateway-sdk@^2.10.0": - version "2.10.0" - resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-react-gateway-sdk/-/safe-react-gateway-sdk-2.10.0.tgz#88e2307d21d548ea43dde8fa33630d3539e39741" - integrity sha512-P0A6XgjpEwCzZpk0vjLOYuaOmXL020khJF9FQRwCYPrllPUzrGjpm5gdqExNdnefrrDUKeWUumkucoXqBaMblA== +"@gnosis.pm/safe-react-gateway-sdk@^2.10.1": + version "2.10.1" + resolved "https://registry.yarnpkg.com/@gnosis.pm/safe-react-gateway-sdk/-/safe-react-gateway-sdk-2.10.1.tgz#62f4abf733855e734aa1eab4be4778ccd08fe689" + integrity sha512-uIosTEqmoxhCy7WS8sIzXde2nJQwzC+KfNoeDQVeLZtEpnRZQ7R+N/qDtORMUJfKeyc8cIwkKXmVc2DRgSRxOQ== dependencies: cross-fetch "^3.1.5"