From 34b015c8e94ac02a0af9d7afb92a59056b8f0490 Mon Sep 17 00:00:00 2001 From: Charlie McKenzie Date: Tue, 13 Feb 2024 12:06:28 +1100 Subject: [PATCH] fix: migration relates problems (#1468) Co-authored-by: tim --- packages/checkout/sdk-sample-app/package.json | 2 +- packages/checkout/widgets-lib/package.json | 2 +- .../CoinSelector/CoinSelectorStyles.tsx | 2 + .../TransactionRejectedStyles.tsx | 3 +- .../src/components/Transactions/Shimmer.tsx | 17 ++---- .../components/WalletAndNetworkSelector.tsx | 3 +- .../bridge/components/WalletDrawerStyles.ts | 1 + .../swap/components/UnableToSwapStyles.ts | 3 +- .../widgets/wallet/views/SettingsStyles.ts | 2 +- .../checkout/widgets-sample-app/package.json | 2 +- .../bridge/bridge-sample-app/package.json | 2 +- packages/passport/sdk-sample-app/package.json | 6 +- .../x-provider/src/sample-app/package.json | 2 +- sdk/package.json | 3 +- yarn.lock | 59 ++++++------------- 15 files changed, 44 insertions(+), 65 deletions(-) diff --git a/packages/checkout/sdk-sample-app/package.json b/packages/checkout/sdk-sample-app/package.json index 35255656fe..5dbc87d905 100644 --- a/packages/checkout/sdk-sample-app/package.json +++ b/packages/checkout/sdk-sample-app/package.json @@ -14,7 +14,7 @@ ] }, "dependencies": { - "@biom3/react": "^0.20.0", + "@biom3/react": "^0.20.2", "@imtbl/checkout-sdk": "0.0.0", "@imtbl/checkout-widgets": "0.0.0", "@imtbl/config": "0.0.0", diff --git a/packages/checkout/widgets-lib/package.json b/packages/checkout/widgets-lib/package.json index 7913095113..37f048a2d2 100644 --- a/packages/checkout/widgets-lib/package.json +++ b/packages/checkout/widgets-lib/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@biom3/design-tokens": "^0.3.1", - "@biom3/react": "^0.20.0", + "@biom3/react": "^0.20.2", "@ethersproject/providers": "^5.7.2", "@imtbl/bridge-sdk": "0.0.0", "@imtbl/checkout-sdk": "0.0.0", diff --git a/packages/checkout/widgets-lib/src/components/CoinSelector/CoinSelectorStyles.tsx b/packages/checkout/widgets-lib/src/components/CoinSelector/CoinSelectorStyles.tsx index 43957ba509..a6aa4eaa09 100644 --- a/packages/checkout/widgets-lib/src/components/CoinSelector/CoinSelectorStyles.tsx +++ b/packages/checkout/widgets-lib/src/components/CoinSelector/CoinSelectorStyles.tsx @@ -2,6 +2,8 @@ export const selectOptionsContainerStyles = { display: 'flex', flexDirection: 'column', gap: '2px', + paddingX: 'base.spacing.x4', + paddingBottom: 'base.spacing.x4', }; export const selectOptionsLoadingIconStyles = { diff --git a/packages/checkout/widgets-lib/src/components/TransactionRejected/TransactionRejectedStyles.tsx b/packages/checkout/widgets-lib/src/components/TransactionRejected/TransactionRejectedStyles.tsx index d139056ca1..61156a2a77 100644 --- a/packages/checkout/widgets-lib/src/components/TransactionRejected/TransactionRejectedStyles.tsx +++ b/packages/checkout/widgets-lib/src/components/TransactionRejected/TransactionRejectedStyles.tsx @@ -2,7 +2,8 @@ export const transactionRejectedContainerStyles = { display: 'flex', flexDirection: 'column', alignItems: 'center', - padding: '50px 0', + paddingY: '50px', + paddingX: 'base.spacing.x4', height: '100%', }; diff --git a/packages/checkout/widgets-lib/src/components/Transactions/Shimmer.tsx b/packages/checkout/widgets-lib/src/components/Transactions/Shimmer.tsx index addff54722..dcc12d9212 100644 --- a/packages/checkout/widgets-lib/src/components/Transactions/Shimmer.tsx +++ b/packages/checkout/widgets-lib/src/components/Transactions/Shimmer.tsx @@ -1,22 +1,17 @@ -import { Box, MenuItem, ShimmerBox } from '@biom3/react'; +import { MenuItem, ShimmerBox, Stack } from '@biom3/react'; export function Shimmer() { return ( - + - - - - + + + + ); } diff --git a/packages/checkout/widgets-lib/src/widgets/bridge/components/WalletAndNetworkSelector.tsx b/packages/checkout/widgets-lib/src/widgets/bridge/components/WalletAndNetworkSelector.tsx index ba93d41f95..fdf770b8ed 100644 --- a/packages/checkout/widgets-lib/src/widgets/bridge/components/WalletAndNetworkSelector.tsx +++ b/packages/checkout/widgets-lib/src/widgets/bridge/components/WalletAndNetworkSelector.tsx @@ -454,7 +454,7 @@ export function WalletAndNetworkSelector() { }} visible={fromNetworkDrawerOpen} > - + )} - diff --git a/packages/checkout/widgets-lib/src/widgets/bridge/components/WalletDrawerStyles.ts b/packages/checkout/widgets-lib/src/widgets/bridge/components/WalletDrawerStyles.ts index eb57a0c2ed..cb5516f815 100644 --- a/packages/checkout/widgets-lib/src/widgets/bridge/components/WalletDrawerStyles.ts +++ b/packages/checkout/widgets-lib/src/widgets/bridge/components/WalletDrawerStyles.ts @@ -2,4 +2,5 @@ export const walletItemListStyles = { display: 'flex', flexDirection: 'column', gap: 'base.spacing.x1', + paddingX: 'base.spacing.x4', }; diff --git a/packages/checkout/widgets-lib/src/widgets/swap/components/UnableToSwapStyles.ts b/packages/checkout/widgets-lib/src/widgets/swap/components/UnableToSwapStyles.ts index 0cc36ed414..9a045ab352 100644 --- a/packages/checkout/widgets-lib/src/widgets/swap/components/UnableToSwapStyles.ts +++ b/packages/checkout/widgets-lib/src/widgets/swap/components/UnableToSwapStyles.ts @@ -3,7 +3,8 @@ export const containerStyles = { flexDirection: 'column', alignItems: 'center', paddingTop: 'base.spacing.x6', - paddingBottom: 'base.spacing.x1', + paddingBottom: 'base.spacing.x4', + paddingX: 'base.spacing.x4', height: '100%', }; diff --git a/packages/checkout/widgets-lib/src/widgets/wallet/views/SettingsStyles.ts b/packages/checkout/widgets-lib/src/widgets/wallet/views/SettingsStyles.ts index 3fe6c7b65b..34579be4d0 100644 --- a/packages/checkout/widgets-lib/src/widgets/wallet/views/SettingsStyles.ts +++ b/packages/checkout/widgets-lib/src/widgets/wallet/views/SettingsStyles.ts @@ -2,7 +2,7 @@ export const settingsBoxStyle = { display: 'flex', flexDirection: 'column', rowGap: 'base.spacing.x2', - marginX: 'base.spacing.x2', + paddingX: 'base.spacing.x4', }; export const settingsDisconnectButtonStyle = { marginTop: '32px' }; diff --git a/packages/checkout/widgets-sample-app/package.json b/packages/checkout/widgets-sample-app/package.json index 5d82f1e392..5ee085bcc6 100644 --- a/packages/checkout/widgets-sample-app/package.json +++ b/packages/checkout/widgets-sample-app/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@biom3/design-tokens": "^0.3.1", - "@biom3/react": "^0.20.0", + "@biom3/react": "^0.20.2", "@imtbl/checkout-sdk": "0.0.0", "@imtbl/checkout-widgets": "0.0.0", "@imtbl/config": "0.0.0", diff --git a/packages/internal/bridge/bridge-sample-app/package.json b/packages/internal/bridge/bridge-sample-app/package.json index 9c111c44fd..f65bbb181a 100644 --- a/packages/internal/bridge/bridge-sample-app/package.json +++ b/packages/internal/bridge/bridge-sample-app/package.json @@ -27,8 +27,8 @@ "lint": "eslint ./src --ext .ts --max-warnings=0", "mapToken": "node --loader ts-node/esm ./src/mapToken.ts", "pending": "node --loader ts-node/esm ./src/pending.ts", - "status": "node --loader ts-node/esm ./src/status.ts", "setFlowRate": "node --loader ts-node/esm ./src/setFlowRate.ts", + "status": "node --loader ts-node/esm ./src/status.ts", "withdraw": "node --loader ts-node/esm ./src/withdraw.ts", "withdrawTx": "node --loader ts-node/esm ./src/withdrawTx.ts" }, diff --git a/packages/passport/sdk-sample-app/package.json b/packages/passport/sdk-sample-app/package.json index 9d0ac2801f..ab95835718 100644 --- a/packages/passport/sdk-sample-app/package.json +++ b/packages/passport/sdk-sample-app/package.json @@ -3,7 +3,7 @@ "version": "0.1.0", "dependencies": { "@biom3/design-tokens": "^0.3.1", - "@biom3/react": "^0.20.0", + "@biom3/react": "^0.20.2", "@imtbl/config": "0.0.0", "@imtbl/core-sdk": "^2.4.0", "@imtbl/passport": "0.0.0", @@ -33,9 +33,9 @@ "scripts": { "build": "next build", "dev": "next dev", - "update-sdk-version": "scripts/updateSdkVersion.sh ../../internal/generated-clients/src/config/config.ts", "export": "next export", "lint": "eslint ./src --ext .ts --max-warnings=0", - "start": "next start" + "start": "next start", + "update-sdk-version": "scripts/updateSdkVersion.sh ../../internal/generated-clients/src/config/config.ts" } } diff --git a/packages/x-provider/src/sample-app/package.json b/packages/x-provider/src/sample-app/package.json index fdfc35e905..60ab6f1207 100644 --- a/packages/x-provider/src/sample-app/package.json +++ b/packages/x-provider/src/sample-app/package.json @@ -14,7 +14,7 @@ ] }, "dependencies": { - "@biom3/react": "^0.20.0", + "@biom3/react": "^0.20.2", "@imtbl/core-sdk": "^2.4.0", "@imtbl/sdk": "0.0.0", "@testing-library/jest-dom": "^5.16.5", diff --git a/sdk/package.json b/sdk/package.json index 57a31b1f91..b6c9018367 100644 --- a/sdk/package.json +++ b/sdk/package.json @@ -9,7 +9,7 @@ "@0xsequence/abi": "^1.4.3", "@0xsequence/core": "^1.4.3", "@biom3/design-tokens": "^0.3.1", - "@biom3/react": "^0.20.0", + "@biom3/react": "^0.20.2", "@ethersproject/abi": "^5.7.0", "@ethersproject/abstract-signer": "^5.7.0", "@ethersproject/providers": "^5.7.2", @@ -30,6 +30,7 @@ "crypto-browserify": "^3.12.0", "enc-utils": "^3.0.0", "ethers": "^5.7.2", + "global-const": "^0.1.2", "https-browserify": "^1.0.0", "i18next": "^23.7.6", "i18next-browser-languagedetector": "^7.2.0", diff --git a/yarn.lock b/yarn.lock index d31de3d9a8..52e131e061 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2160,7 +2160,7 @@ __metadata: languageName: node linkType: hard -"@biom3/design-tokens@npm:^0.3.1": +"@biom3/design-tokens@npm:^0.3.1, @biom3/design-tokens@npm:~0.3.1": version: 0.3.1 resolution: "@biom3/design-tokens@npm:0.3.1" dependencies: @@ -2169,22 +2169,13 @@ __metadata: languageName: node linkType: hard -"@biom3/design-tokens@npm:~0.3.0": - version: 0.3.0 - resolution: "@biom3/design-tokens@npm:0.3.0" - dependencies: - lodash.get: ^4.4.2 - checksum: 8a2e6502f0039d551b05d01bdaf13e64b768c3d6494b6c75c092af799ab992eb79b3d6a007a03f31ad0e9b35e28ac037342ff4d6965f1a0902b5228a5f988871 - languageName: node - linkType: hard - -"@biom3/react@npm:^0.20.0": - version: 0.20.0 - resolution: "@biom3/react@npm:0.20.0" +"@biom3/react@npm:^0.20.2": + version: 0.20.2 + resolution: "@biom3/react@npm:0.20.2" dependencies: - "@biom3/design-tokens": ~0.3.0 + "@biom3/design-tokens": ~0.3.1 "@emotion/css": ^11.11.2 - "@emotion/react": ^11.11.3 + "@emotion/react": 11.11.1 "@rive-app/react-canvas": ^4.5.0 buffer: ^6.0.3 csstype: ^3.1.2 @@ -2199,7 +2190,7 @@ __metadata: react-is: ^18.2.0 react-keyed-flatten-children: ^3.0.0 ts-deepmerge: ^6.2.0 - checksum: 3dca862a7ec59475c0c987b432fbeb8a1d3300cfee15acfba7da31bb24c4659871028bd77fe8fd86907969bbf1949f5829317054a17d2882a982a54fa772efd5 + checksum: d360544193f127e2372fad5fcdd62a43966b592794998c19503961554805ce2621f0ef2e59a25f5a47db331a367d5c2385d91b4e2cc5b18174c18a1e873fbe72 languageName: node linkType: hard @@ -2517,14 +2508,14 @@ __metadata: languageName: node linkType: hard -"@emotion/react@npm:^11.11.3": - version: 11.11.3 - resolution: "@emotion/react@npm:11.11.3" +"@emotion/react@npm:11.11.1": + version: 11.11.1 + resolution: "@emotion/react@npm:11.11.1" dependencies: "@babel/runtime": ^7.18.3 "@emotion/babel-plugin": ^11.11.0 "@emotion/cache": ^11.11.0 - "@emotion/serialize": ^1.1.3 + "@emotion/serialize": ^1.1.2 "@emotion/use-insertion-effect-with-fallbacks": ^1.0.1 "@emotion/utils": ^1.2.1 "@emotion/weak-memoize": ^0.3.1 @@ -2534,7 +2525,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: 2e4b223591569f0a41686d5bd72dc8778629b7be33267e4a09582979e6faee4d7218de84e76294ed827058d4384d75557b5d71724756539c1f235e9a69e62b2e + checksum: aec3c36650f5f0d3d4445ff44d73dd88712b1609645b6af3e6d08049cfbc51f1785fe13dea1a1d4ab1b0800d68f2339ab11e459687180362b1ef98863155aae5 languageName: node linkType: hard @@ -2551,19 +2542,6 @@ __metadata: languageName: node linkType: hard -"@emotion/serialize@npm:^1.1.3": - version: 1.1.3 - resolution: "@emotion/serialize@npm:1.1.3" - dependencies: - "@emotion/hash": ^0.9.1 - "@emotion/memoize": ^0.8.1 - "@emotion/unitless": ^0.8.1 - "@emotion/utils": ^1.2.1 - csstype: ^3.0.2 - checksum: 5a756ce7e2692322683978d8ed2e84eadd60bd6f629618a82c5018c84d98684b117e57fad0174f68ec2ec0ac089bb2e0bcc8ea8c2798eb904b6d3236aa046063 - languageName: node - linkType: hard - "@emotion/sheet@npm:^1.2.2": version: 1.2.2 resolution: "@emotion/sheet@npm:1.2.2" @@ -3319,7 +3297,7 @@ __metadata: version: 0.0.0-use.local resolution: "@imtbl/checkout-sdk-sample-app@workspace:packages/checkout/sdk-sample-app" dependencies: - "@biom3/react": ^0.20.0 + "@biom3/react": ^0.20.2 "@imtbl/checkout-sdk": 0.0.0 "@imtbl/checkout-widgets": 0.0.0 "@imtbl/config": 0.0.0 @@ -3393,7 +3371,7 @@ __metadata: resolution: "@imtbl/checkout-widgets-sample-app@workspace:packages/checkout/widgets-sample-app" dependencies: "@biom3/design-tokens": ^0.3.1 - "@biom3/react": ^0.20.0 + "@biom3/react": ^0.20.2 "@imtbl/checkout-sdk": 0.0.0 "@imtbl/checkout-widgets": 0.0.0 "@imtbl/config": 0.0.0 @@ -3422,7 +3400,7 @@ __metadata: resolution: "@imtbl/checkout-widgets@workspace:packages/checkout/widgets-lib" dependencies: "@biom3/design-tokens": ^0.3.1 - "@biom3/react": ^0.20.0 + "@biom3/react": ^0.20.2 "@ethersproject/providers": ^5.7.2 "@imtbl/bridge-sdk": 0.0.0 "@imtbl/checkout-sdk": 0.0.0 @@ -3690,7 +3668,7 @@ __metadata: resolution: "@imtbl/passport-sdk-sample-app@workspace:packages/passport/sdk-sample-app" dependencies: "@biom3/design-tokens": ^0.3.1 - "@biom3/react": ^0.20.0 + "@biom3/react": ^0.20.2 "@imtbl/config": 0.0.0 "@imtbl/core-sdk": ^2.4.0 "@imtbl/passport": 0.0.0 @@ -3779,7 +3757,7 @@ __metadata: "@0xsequence/abi": ^1.4.3 "@0xsequence/core": ^1.4.3 "@biom3/design-tokens": ^0.3.1 - "@biom3/react": ^0.20.0 + "@biom3/react": ^0.20.2 "@ethersproject/abi": ^5.7.0 "@ethersproject/abstract-signer": ^5.7.0 "@ethersproject/providers": ^5.7.2 @@ -3822,6 +3800,7 @@ __metadata: eslint: ^8.40.0 ethers: ^5.7.2 glob: ^10.2.3 + global-const: ^0.1.2 https-browserify: ^1.0.0 i18next: ^23.7.6 i18next-browser-languagedetector: ^7.2.0 @@ -28012,7 +27991,7 @@ __metadata: version: 0.0.0-use.local resolution: "x-provider-sample-app@workspace:packages/x-provider/src/sample-app" dependencies: - "@biom3/react": ^0.20.0 + "@biom3/react": ^0.20.2 "@imtbl/core-sdk": ^2.4.0 "@imtbl/sdk": 0.0.0 "@svgr/webpack": ^8.0.1