From 7a614d3bba0bcd5718736373288608d1ac992076 Mon Sep 17 00:00:00 2001 From: katspaugh <381895+katspaugh@users.noreply.github.com> Date: Fri, 27 Dec 2024 17:08:18 +0300 Subject: [PATCH 1/5] Fix(Safe upgrade): preserve fallback handler + show queue warning only for <1.3.0 (#4708) --- apps/web/.gitignore | 61 ------------------- .../transactions/TxSummary/styles.module.css | 6 +- .../UpdateSafe/index.test.tsx | 26 ++++++++ .../confirmation-views/UpdateSafe/index.tsx | 37 ++++++++--- apps/web/src/services/tx/safeUpdateParams.ts | 2 +- .../utils/__tests__/safe-migrations.test.ts | 42 +++++++++++-- apps/web/src/utils/safe-migrations.ts | 43 ++++++++++--- 7 files changed, 131 insertions(+), 86 deletions(-) delete mode 100644 apps/web/.gitignore create mode 100644 apps/web/src/components/tx/confirmation-views/UpdateSafe/index.test.tsx diff --git a/apps/web/.gitignore b/apps/web/.gitignore deleted file mode 100644 index ade4b1731e..0000000000 --- a/apps/web/.gitignore +++ /dev/null @@ -1,61 +0,0 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - -# dependencies -/node_modules -/.pnp -.pnp.js - -# testing -/coverage - -# types -/src/types/contracts/ - -# next.js -/.next/ -/out/ - -# production -/build - -# misc -.DS_Store -*.pem -.idea - -# debug -npm-debug.log* -yarn-debug.log* -yarn-error.log* -.pnpm-debug.log* - -# local env files -.env*.local - -# vercel -.vercel - -# typescript -*.tsbuildinfo - -# yalc -.yalc -yalc.lock -.env - -/cypress/videos -/cypress/screenshots -/cypress/downloads - -/public/sw.js -/public/sw.js.map -/public/worker-*.js -/public/workbox-*.js -/public/workbox-*.js.map -/public/fallback* -/public/*.js.LICENSE.txt -certificates -*storybook.log - -# Yarn v4 -.yarn/* diff --git a/apps/web/src/components/transactions/TxSummary/styles.module.css b/apps/web/src/components/transactions/TxSummary/styles.module.css index fc8ed69fac..bba12e11e3 100644 --- a/apps/web/src/components/transactions/TxSummary/styles.module.css +++ b/apps/web/src/components/transactions/TxSummary/styles.module.css @@ -29,9 +29,9 @@ } .gridContainer.conflictGroup { - grid-template-columns: var(--grid-type) var(--grid-info) var(--grid-date) var(--grid-confirmations) var(--grid-status) var( - --grid-actions - ); + grid-template-columns: + var(--grid-type) var(--grid-info) var(--grid-date) var(--grid-confirmations) var(--grid-status) + var(--grid-actions); grid-template-areas: 'type info date confirmations status actions'; } diff --git a/apps/web/src/components/tx/confirmation-views/UpdateSafe/index.test.tsx b/apps/web/src/components/tx/confirmation-views/UpdateSafe/index.test.tsx new file mode 100644 index 0000000000..b3989d8570 --- /dev/null +++ b/apps/web/src/components/tx/confirmation-views/UpdateSafe/index.test.tsx @@ -0,0 +1,26 @@ +import type { ChainInfo } from '@safe-global/safe-gateway-typescript-sdk' +import { _UpdateSafe as UpdateSafe } from './index' +import { render } from '@/tests/test-utils' + +const chain = { + recommendedMasterCopyVersion: '1.4.1', +} as ChainInfo + +const warningText = 'This upgrade will invalidate all queued transactions!' + +describe('Container', () => { + it('renders correctly with a queue warning', async () => { + const container = render() + await expect(container.findByText(warningText)).resolves.not.toBeNull() + }) + + it('renders correctly without a queue warning because no queue', async () => { + const container = render() + await expect(container.findByText(warningText)).rejects.toThrowError(Error) + }) + + it('renders correctly without a queue warning because of compatible Safe version', async () => { + const container = render() + await expect(container.findByText(warningText)).rejects.toThrowError(Error) + }) +}) diff --git a/apps/web/src/components/tx/confirmation-views/UpdateSafe/index.tsx b/apps/web/src/components/tx/confirmation-views/UpdateSafe/index.tsx index 6dec5f3949..520b6be0fd 100644 --- a/apps/web/src/components/tx/confirmation-views/UpdateSafe/index.tsx +++ b/apps/web/src/components/tx/confirmation-views/UpdateSafe/index.tsx @@ -1,11 +1,15 @@ import type { ReactNode } from 'react' import { Alert, AlertTitle, Box, Divider, Stack, Typography } from '@mui/material' +import semverSatisfies from 'semver/functions/satisfies' import { LATEST_SAFE_VERSION } from '@/config/constants' import { useCurrentChain } from '@/hooks/useChains' import useSafeInfo from '@/hooks/useSafeInfo' import { useQueuedTxsLength } from '@/hooks/useTxQueue' import ExternalLink from '@/components/common/ExternalLink' import { maybePlural } from '@/utils/formatters' +import madProps from '@/utils/mad-props' + +const QUEUE_WARNING_VERSION = '<1.3.0' function BgBox({ children, light }: { children: ReactNode; light?: boolean }) { return ( @@ -23,28 +27,34 @@ function BgBox({ children, light }: { children: ReactNode; light?: boolean }) { ) } -function UpdateSafe() { - const { safe } = useSafeInfo() - const chain = useCurrentChain() - const queueSize = useQueuedTxsLength() +export function _UpdateSafe({ + safeVersion, + queueSize, + chain, +}: { + safeVersion: string + queueSize: string + chain: ReturnType +}) { + const showQueueWarning = queueSize && semverSatisfies(safeVersion, QUEUE_WARNING_VERSION) const latestSafeVersion = chain?.recommendedMasterCopyVersion || LATEST_SAFE_VERSION return ( <> - Current version: {safe.version} + Current version: {safeVersion} → New version: {latestSafeVersion} - + Read about the updates in the new Safe contracts version in the{' '} version {latestSafeVersion} changelog - {queueSize && ( + {showQueueWarning && ( This upgrade will invalidate all queued transactions! You have {queueSize} unexecuted transaction{maybePlural(parseInt(queueSize))}. Please make sure to execute or @@ -52,9 +62,20 @@ function UpdateSafe() { )} - + ) } +function useSafeVersion() { + const { safe } = useSafeInfo() + return safe?.version || '' +} + +const UpdateSafe = madProps(_UpdateSafe, { + chain: useCurrentChain, + safeVersion: useSafeVersion, + queueSize: useQueuedTxsLength, +}) + export default UpdateSafe diff --git a/apps/web/src/services/tx/safeUpdateParams.ts b/apps/web/src/services/tx/safeUpdateParams.ts index 36fc3b7ef1..d90c71b0d3 100644 --- a/apps/web/src/services/tx/safeUpdateParams.ts +++ b/apps/web/src/services/tx/safeUpdateParams.ts @@ -37,7 +37,7 @@ export const createUpdateSafeTxs = async (safe: SafeInfo, chain: ChainInfo): Pro // 1.3.0 Safes are updated using a delegate call to a migration contract if (semverSatisfies(safe.version, '1.3.0')) { - return [createUpdateMigration(chain)] + return [createUpdateMigration(chain, safe.version, safe.fallbackHandler?.value)] } // For older Safes, we need to create two transactions diff --git a/apps/web/src/utils/__tests__/safe-migrations.test.ts b/apps/web/src/utils/__tests__/safe-migrations.test.ts index 73a447d5aa..478b346ee3 100644 --- a/apps/web/src/utils/__tests__/safe-migrations.test.ts +++ b/apps/web/src/utils/__tests__/safe-migrations.test.ts @@ -325,7 +325,7 @@ describe('extractMigrationL2MasterCopyAddress', () => { } as unknown as ChainInfo it('should create a migration transaction for L1 chain', () => { - const result = createUpdateMigration(mockChain) + const result = createUpdateMigration(mockChain, '1.3.0') expect(result).toEqual({ operation: OperationType.DelegateCall, @@ -336,8 +336,8 @@ describe('extractMigrationL2MasterCopyAddress', () => { }) it('should create a migration transaction for L2 chain', () => { - const l2Chain = { ...mockChain, l2: true } - const result = createUpdateMigration(l2Chain) + const l2Chain = { ...mockChain, chainId: '137', l2: true } + const result = createUpdateMigration(l2Chain, '1.3.0+L2') expect(result).toEqual({ operation: OperationType.DelegateCall, @@ -348,7 +348,41 @@ describe('extractMigrationL2MasterCopyAddress', () => { }) it('should throw an error if deployment is not found', () => { - expect(() => createUpdateMigration(mockChainOld)).toThrow('Migration deployment not found') + expect(() => createUpdateMigration(mockChainOld, '1.1.1')).toThrow('Migration deployment not found') + }) + + it('should overwrite fallback handler if it is the default one', () => { + const result = createUpdateMigration(mockChain, '1.3.0', '0xf48f2B2d2a534e402487b3ee7C18c33Aec0Fe5e4') // 1.3.0 compatibility fallback handler + + expect(result).toEqual({ + operation: OperationType.DelegateCall, + data: '0xed007fc6', + to: '0x526643F69b81B008F46d95CD5ced5eC0edFFDaC6', + value: '0', + }) + }) + + it('should overwrite L2 fallback handler if it is the default one', () => { + const l2Chain = { ...mockChain, chainId: '137', l2: true } + const result = createUpdateMigration(l2Chain, '1.3.0+L2', '0xf48f2B2d2a534e402487b3ee7C18c33Aec0Fe5e4') // 1.3.0 compatibility fallback handler + + expect(result).toEqual({ + operation: OperationType.DelegateCall, + data: '0x68cb3d94', + to: '0x526643F69b81B008F46d95CD5ced5eC0edFFDaC6', + value: '0', + }) + }) + + it('should NOT overwrite a custom fallback handler', () => { + const result = createUpdateMigration(mockChain, '1.3.0', '0x526643F69b81B008F46d95CD5ced5eC0edFFDaC6') + + expect(result).toEqual({ + operation: OperationType.DelegateCall, + data: '0xf6682ab0', + to: '0x526643F69b81B008F46d95CD5ced5eC0edFFDaC6', + value: '0', + }) }) }) }) diff --git a/apps/web/src/utils/safe-migrations.ts b/apps/web/src/utils/safe-migrations.ts index beffec8694..f9c1b6c7d6 100644 --- a/apps/web/src/utils/safe-migrations.ts +++ b/apps/web/src/utils/safe-migrations.ts @@ -1,9 +1,15 @@ import { Safe_to_l2_migration__factory, Safe_migration__factory } from '@/types/contracts' +import { getCompatibilityFallbackHandlerDeployments } from '@safe-global/safe-deployments' import { type ExtendedSafeInfo } from '@/store/safeInfoSlice' -import { getSafeContractDeployment } from '@/services/contracts/deployments' +import { getSafeContractDeployment, hasMatchingDeployment } from '@/services/contracts/deployments' import { sameAddress } from './addresses' import { getSafeToL2MigrationDeployment, getSafeMigrationDeployment } from '@safe-global/safe-deployments' -import { type MetaTransactionData, OperationType, type SafeTransaction } from '@safe-global/safe-core-sdk-types' +import { + type MetaTransactionData, + OperationType, + type SafeTransaction, + type SafeVersion, +} from '@safe-global/safe-core-sdk-types' import type { ChainInfo } from '@safe-global/safe-gateway-typescript-sdk' import { isValidMasterCopy } from '@/services/contracts/safeContracts' import { isMultiSendCalldata } from './transaction-calldata' @@ -95,9 +101,11 @@ export const prependSafeToL2Migration = ( return __unsafe_createMultiSendTx(newTxs) } -export const createUpdateMigration = (chain: ChainInfo): MetaTransactionData => { - const interfce = Safe_migration__factory.createInterface() - +export const createUpdateMigration = ( + chain: ChainInfo, + safeVersion: string, + fallbackHandler?: string, +): MetaTransactionData => { const deployment = getSafeMigrationDeployment({ version: chain.recommendedMasterCopyVersion || LATEST_SAFE_VERSION, released: true, @@ -108,11 +116,28 @@ export const createUpdateMigration = (chain: ChainInfo): MetaTransactionData => throw new Error('Migration deployment not found') } + // Keep fallback handler if it's not a default one + const keepFallbackHandler = + !!fallbackHandler && + !hasMatchingDeployment(getCompatibilityFallbackHandlerDeployments, fallbackHandler, chain.chainId, [ + safeVersion as SafeVersion, + ]) + + const method = ( + keepFallbackHandler + ? chain.l2 + ? 'migrateL2Singleton' + : 'migrateSingleton' + : chain.l2 + ? 'migrateL2WithFallbackHandler' + : 'migrateWithFallbackHandler' + ) as 'migrateSingleton' // apease typescript + + const interfce = Safe_migration__factory.createInterface() + const tx: MetaTransactionData = { - operation: OperationType.DelegateCall, // DELEGATE CALL REQUIRED - data: chain.l2 - ? interfce.encodeFunctionData('migrateL2WithFallbackHandler') - : interfce.encodeFunctionData('migrateWithFallbackHandler'), + operation: OperationType.DelegateCall, // delegate call required + data: interfce.encodeFunctionData(method), to: deployment.defaultAddress, value: '0', } From f7e77afbe8a36fb7bfdc63bb9125406a9ec9bb3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 11:18:56 +0300 Subject: [PATCH 2/5] Chore(deps): Bump @react-navigation/native from 7.0.13 to 7.0.14 (#4713) Bumps [@react-navigation/native](https://github.com/react-navigation/react-navigation/tree/HEAD/packages/native) from 7.0.13 to 7.0.14. - [Release notes](https://github.com/react-navigation/react-navigation/releases) - [Changelog](https://github.com/react-navigation/react-navigation/blob/main/packages/native/CHANGELOG.md) - [Commits](https://github.com/react-navigation/react-navigation/commits/@react-navigation/native@7.0.14/packages/native) --- updated-dependencies: - dependency-name: "@react-navigation/native" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- apps/mobile/package.json | 2 +- yarn.lock | 46 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/apps/mobile/package.json b/apps/mobile/package.json index d6c4ad1f5c..48a7fe026e 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -46,7 +46,7 @@ "@react-native-menu/menu": "^1.1.6", "@react-native/babel-preset": "^0.76.2", "@react-navigation/material-top-tabs": "^7.0.1", - "@react-navigation/native": "^7.0.0", + "@react-navigation/native": "^7.0.14", "@reduxjs/toolkit": "^2.4.0", "@safe-global/store": "workspace:^", "@storybook/addon-react-native-web": "^0.0.26", diff --git a/yarn.lock b/yarn.lock index 39c1caeac6..7b20a3c346 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6771,6 +6771,23 @@ __metadata: languageName: node linkType: hard +"@react-navigation/core@npm:^7.3.1": + version: 7.3.1 + resolution: "@react-navigation/core@npm:7.3.1" + dependencies: + "@react-navigation/routers": "npm:^7.1.2" + escape-string-regexp: "npm:^4.0.0" + nanoid: "npm:3.3.8" + query-string: "npm:^7.1.3" + react-is: "npm:^18.2.0" + use-latest-callback: "npm:^0.2.1" + use-sync-external-store: "npm:^1.2.2" + peerDependencies: + react: ">= 18.2.0" + checksum: 10/94800b6b0a55cd9e7ffafbd508f434f65db4ce72d9a5f7d0420e6ca560d97c10ff95957a20a7f438fff28f1b96f37397cd433537058a076dc50e94ccd0c27975 + languageName: node + linkType: hard + "@react-navigation/elements@npm:^2.2.4": version: 2.2.4 resolution: "@react-navigation/elements@npm:2.2.4" @@ -6837,6 +6854,22 @@ __metadata: languageName: node linkType: hard +"@react-navigation/native@npm:^7.0.14": + version: 7.0.14 + resolution: "@react-navigation/native@npm:7.0.14" + dependencies: + "@react-navigation/core": "npm:^7.3.1" + escape-string-regexp: "npm:^4.0.0" + fast-deep-equal: "npm:^3.1.3" + nanoid: "npm:3.3.8" + use-latest-callback: "npm:^0.2.1" + peerDependencies: + react: ">= 18.2.0" + react-native: "*" + checksum: 10/6a9987da929141c11bc711c2c44998e4ef74160cc6aba902cf268350b8c78a91f999d90a5be09390063d99d1ef38fb6b43008393a0d1854a96ef41a1aa59395f + languageName: node + linkType: hard + "@react-navigation/routers@npm:^7.1.1": version: 7.1.1 resolution: "@react-navigation/routers@npm:7.1.1" @@ -6846,6 +6879,15 @@ __metadata: languageName: node linkType: hard +"@react-navigation/routers@npm:^7.1.2": + version: 7.1.2 + resolution: "@react-navigation/routers@npm:7.1.2" + dependencies: + nanoid: "npm:3.3.8" + checksum: 10/8bc2f3907768e82898ea4b2daf83f301f40bdad50da2cb6d6b8382f0eb6da0804ec5beb88b183efdce2eb03f16d80b05e59a08e81e9809d99084605ad0f4dfb9 + languageName: node + linkType: hard + "@redux-devtools/core@npm:^4.0.0": version: 4.0.0 resolution: "@redux-devtools/core@npm:4.0.0" @@ -7227,7 +7269,7 @@ __metadata: "@react-native-menu/menu": "npm:^1.1.6" "@react-native/babel-preset": "npm:^0.76.2" "@react-navigation/material-top-tabs": "npm:^7.0.1" - "@react-navigation/native": "npm:^7.0.0" + "@react-navigation/native": "npm:^7.0.14" "@reduxjs/toolkit": "npm:^2.4.0" "@rtk-query/codegen-openapi": "npm:^2.0.0" "@safe-global/store": "workspace:^" @@ -25291,7 +25333,7 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:^3.3.1, nanoid@npm:^3.3.6, nanoid@npm:^3.3.7": +"nanoid@npm:3.3.8, nanoid@npm:^3.3.1, nanoid@npm:^3.3.6, nanoid@npm:^3.3.7": version: 3.3.8 resolution: "nanoid@npm:3.3.8" bin: From dd392f5317e6dba94ac60eefce22329e7b50b890 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 11:20:03 +0300 Subject: [PATCH 3/5] Chore(deps): Bump @tamagui/font-dm-sans from 1.119.0 to 1.121.3 (#4714) Bumps @tamagui/font-dm-sans from 1.119.0 to 1.121.3. --- updated-dependencies: - dependency-name: "@tamagui/font-dm-sans" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- apps/mobile/package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/mobile/package.json b/apps/mobile/package.json index 48a7fe026e..db6ff429e0 100644 --- a/apps/mobile/package.json +++ b/apps/mobile/package.json @@ -54,7 +54,7 @@ "@tamagui/animations-moti": "^1.117.1", "@tamagui/babel-plugin": "^1.120.2", "@tamagui/config": "^1.117.1", - "@tamagui/font-dm-sans": "^1.117.1", + "@tamagui/font-dm-sans": "^1.121.3", "@tamagui/toast": "^1.117.1", "babel-plugin-react-native-web": "^0.19.13", "blo": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index 7b20a3c346..c28954e496 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7289,7 +7289,7 @@ __metadata: "@tamagui/animations-moti": "npm:^1.117.1" "@tamagui/babel-plugin": "npm:^1.120.2" "@tamagui/config": "npm:^1.117.1" - "@tamagui/font-dm-sans": "npm:^1.117.1" + "@tamagui/font-dm-sans": "npm:^1.121.3" "@tamagui/toast": "npm:^1.117.1" "@testing-library/react-native": "npm:^12.7.2" "@types/eslint__js": "npm:^8.42.3" @@ -10216,10 +10216,10 @@ __metadata: languageName: node linkType: hard -"@tamagui/font-dm-sans@npm:^1.117.1": - version: 1.119.0 - resolution: "@tamagui/font-dm-sans@npm:1.119.0" - checksum: 10/2f7266688b96abbfa93097bb3c8cacbc240a0c38ac9f59c7843d340467c03a01cb10fe18c0471ba5016dc4955f4964262bdc51cf8cbb0c914a8330bf34fc21f9 +"@tamagui/font-dm-sans@npm:^1.121.3": + version: 1.121.3 + resolution: "@tamagui/font-dm-sans@npm:1.121.3" + checksum: 10/90187a62c0cd668ef6bcd3810ae47b889a85dda316d023a3ada6cc959beae920ddf0f9a0a849b59d87eb7a5e7e065a1d305daeef44f7bb382c5909e16ff1ae9d languageName: node linkType: hard From a5ff8052686860c441761123b2d07a8bf4e876c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Dec 2024 11:21:28 +0300 Subject: [PATCH 4/5] Chore(deps): Bump @cowprotocol/widget-react from 0.10.0 to 0.13.0 (#4716) Bumps [@cowprotocol/widget-react](https://github.com/cowprotocol/cowswap) from 0.10.0 to 0.13.0. - [Release notes](https://github.com/cowprotocol/cowswap/releases) - [Changelog](https://github.com/cowprotocol/cowswap/blob/develop/changes.txt) - [Commits](https://github.com/cowprotocol/cowswap/compare/v0.10.0...v0.13.0) --- updated-dependencies: - dependency-name: "@cowprotocol/widget-react" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- apps/web/package.json | 2 +- yarn.lock | 30 +++++++++++++++++++----------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/apps/web/package.json b/apps/web/package.json index 20791f267b..ece72b52d7 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -36,7 +36,7 @@ "node": ">=18" }, "dependencies": { - "@cowprotocol/widget-react": "^0.10.0", + "@cowprotocol/widget-react": "^0.13.0", "@ducanh2912/next-pwa": "^10.2.9", "@emotion/cache": "^11.13.5", "@emotion/react": "^11.13.5", diff --git a/yarn.lock b/yarn.lock index c28954e496..ffe5c5f293 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1754,21 +1754,29 @@ __metadata: languageName: node linkType: hard -"@cowprotocol/widget-lib@npm:^0.14.0": - version: 0.14.0 - resolution: "@cowprotocol/widget-lib@npm:0.14.0" +"@cowprotocol/iframe-transport@npm:^1.1.0": + version: 1.1.0 + resolution: "@cowprotocol/iframe-transport@npm:1.1.0" + checksum: 10/20426255f0110b39801a051475a1352625a9c31f68f96947dfe162524213f10bc36e58d4ed58560a59ea893dcd47aebc5b4219ce97919dac7dabad07b96efbe3 + languageName: node + linkType: hard + +"@cowprotocol/widget-lib@npm:^0.18.0": + version: 0.18.0 + resolution: "@cowprotocol/widget-lib@npm:0.18.0" dependencies: - "@cowprotocol/events": "npm:^1.3.0" - checksum: 10/8c745597c6ad7741ddd31957432c817a640ed73132320f3613062a0c3b4b48809202a5ee6cafb41e82afec1da5c1af87143ae781376b4611c5704305f3c2457e + "@cowprotocol/events": "npm:^1.5.0" + "@cowprotocol/iframe-transport": "npm:^1.1.0" + checksum: 10/fdc9dbeccfcdc3c65fc566289e2e59d42aa18f3ec501fbb6ccbbfdc5d4b24d3fff8011deaa7e323aa4a48fae886bd3b1d58d932129cc5cd237c9daa451d0c143 languageName: node linkType: hard -"@cowprotocol/widget-react@npm:^0.10.0": - version: 0.10.0 - resolution: "@cowprotocol/widget-react@npm:0.10.0" +"@cowprotocol/widget-react@npm:^0.13.0": + version: 0.13.0 + resolution: "@cowprotocol/widget-react@npm:0.13.0" dependencies: - "@cowprotocol/widget-lib": "npm:^0.14.0" - checksum: 10/8f683a6377e12fbacc672561102c1e7258519bcc751e5a2669b95f6fe01d5488184c8b3dee3d1aa33133c4783c03a65e104cd6107c9b51cf18033894e92d7c22 + "@cowprotocol/widget-lib": "npm:^0.18.0" + checksum: 10/f2127f1dcdcbd3de102db670475b1256b5fd4fb9e4886cc1bf6ba1b4037df324ab76d5ead2a3302672971dda3b71ca284116e883e10a6af78c323b81eae3cc1f languageName: node linkType: hard @@ -7491,7 +7499,7 @@ __metadata: dependencies: "@chromatic-com/storybook": "npm:^1.3.1" "@cowprotocol/app-data": "npm:^2.4.0" - "@cowprotocol/widget-react": "npm:^0.10.0" + "@cowprotocol/widget-react": "npm:^0.13.0" "@ducanh2912/next-pwa": "npm:^10.2.9" "@emotion/cache": "npm:^11.13.5" "@emotion/react": "npm:^11.13.5" From a6e32461324dc9f3294e79aefd1d13084a44bf0d Mon Sep 17 00:00:00 2001 From: katspaugh <381895+katspaugh@users.noreply.github.com> Date: Mon, 30 Dec 2024 11:33:46 +0300 Subject: [PATCH 5/5] Chore: update mui --- .gitignore | 20 ++++- apps/web/package.json | 2 +- .../__snapshots__/SignOrExecute.test.tsx.snap | 36 ++++----- .../BatchTransactions.test.tsx.snap | 18 ++--- .../ConfirmationView.test.tsx.snap | 36 ++++----- yarn.lock | 80 ++++++++++++------- 6 files changed, 113 insertions(+), 79 deletions(-) diff --git a/.gitignore b/.gitignore index 7cc93f27e4..ac01ed276f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,6 @@ # testing /coverage -# types -/src/types/contracts/ - # next.js /.next/ /out/ @@ -69,3 +66,20 @@ certificates # os THUMBS_DB thumbs.db + +# web +apps/web/.next/* +apps/web/out/* +apps/web/public/sw.js +apps/web/public/workbox-*.js +apps/web/public/worker-development.js +apps/web/src/types/ +apps/web/tsconfig.tsbuildinfo +node_modules/* +out/* +tsconfig.tsbuildinfo +apps/web/.env +apps/web/node_modules/* +apps/web/public/fallback-development.js +apps/web/.env +apps/web/src/types/contracts/* \ No newline at end of file diff --git a/apps/web/package.json b/apps/web/package.json index ece72b52d7..e647d93a34 100644 --- a/apps/web/package.json +++ b/apps/web/package.json @@ -47,7 +47,7 @@ "@ledgerhq/device-management-kit": "^0.5.1", "@ledgerhq/device-signer-kit-ethereum": "^1.1.0", "@mui/icons-material": "^6.1.6", - "@mui/material": "^6.1.6", + "@mui/material": "^6.3.0", "@mui/x-date-pickers": "^7.22.1", "@reduxjs/toolkit": "^2.5.0", "@reown/walletkit": "^1.1.1", diff --git a/apps/web/src/components/tx/SignOrExecuteForm/__tests__/__snapshots__/SignOrExecute.test.tsx.snap b/apps/web/src/components/tx/SignOrExecuteForm/__tests__/__snapshots__/SignOrExecute.test.tsx.snap index e4872296c5..e667bb3b31 100644 --- a/apps/web/src/components/tx/SignOrExecuteForm/__tests__/__snapshots__/SignOrExecute.test.tsx.snap +++ b/apps/web/src/components/tx/SignOrExecuteForm/__tests__/__snapshots__/SignOrExecute.test.tsx.snap @@ -22,15 +22,15 @@ exports[`SignOrExecute should display a confirmation screen 1`] = `

- + +

- + +
- -
+ -
-
+ +
- + +
- + +