From ae3e6e741c03b19cd606b536b9030ee75522491e Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Thu, 23 May 2024 23:41:05 -0400 Subject: [PATCH 1/4] update scrollbars with new className --- .../pages/DAOTreasury/components/Assets.tsx | 1 + src/components/ui/containers/TitledInfoBox.tsx | 1 + src/components/ui/menus/SafesMenu/SafesList.tsx | 17 +---------------- src/pages/daos/[daoAddress]/treasury/index.tsx | 1 + 4 files changed, 4 insertions(+), 16 deletions(-) diff --git a/src/components/pages/DAOTreasury/components/Assets.tsx b/src/components/pages/DAOTreasury/components/Assets.tsx index cbc824af25..634c196c58 100644 --- a/src/components/pages/DAOTreasury/components/Assets.tsx +++ b/src/components/pages/DAOTreasury/components/Assets.tsx @@ -413,6 +413,7 @@ export function Assets() { {coinDisplay.displayData.map((coin, index) => { diff --git a/src/components/ui/containers/TitledInfoBox.tsx b/src/components/ui/containers/TitledInfoBox.tsx index 57a7f386d6..9602982053 100644 --- a/src/components/ui/containers/TitledInfoBox.tsx +++ b/src/components/ui/containers/TitledInfoBox.tsx @@ -19,6 +19,7 @@ export function TitledInfoBox({ borderRadius={{ base: '0.75rem', lg: '0.5rem' }} maxW={CONTENT_MAXW} overflowX="scroll" + className="scroll-dark" {...rest} > {favoritesList.map(favorite => ( From 6e98519a9e377adfb1d6ec556cd3cac5bd447d82 Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Thu, 23 May 2024 23:52:18 -0400 Subject: [PATCH 2/4] update decent-ui to latest --- package-lock.json | 8 ++++---- package.json | 4 ++-- src/assets/theme/index.ts | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 300f4d4808..b70af831c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@adraffy/ens-normalize": "^1.10.1", "@apollo/client": "^3.7.10", "@chakra-ui/react": "^2.8.2", - "@decent-org/fractal-ui": "^0.3.1", + "@decent-org/fractal-ui": "^0.3.5", "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", "@ethersproject/abstract-signer": "^5.7.0", @@ -3428,9 +3428,9 @@ } }, "node_modules/@decent-org/fractal-ui": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@decent-org/fractal-ui/-/fractal-ui-0.3.1.tgz", - "integrity": "sha512-TMKY2BSueb6vmNzN1HbcIoVHDcbjIKU6VWV1W38JTWmAmCB4uRHJiGpwUDMJzktEu4cW0FyYT8qHuMRCALb2FQ==", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@decent-org/fractal-ui/-/fractal-ui-0.3.5.tgz", + "integrity": "sha512-tnZNk2/5Ks7r8IsxBQ+59Kfxpiprdrs9Zipzv3L3cuYnBFTvbVJdNt4tb4D7gR7pcxrqS6qK1/3CNtSYkuBgtg==", "peerDependencies": { "@chakra-ui/react": "^2.3.4", "@phosphor-icons/react": "^2.1.4", diff --git a/package.json b/package.json index 93a1b31961..b64a7baf4a 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "@adraffy/ens-normalize": "^1.10.1", "@apollo/client": "^3.7.10", "@chakra-ui/react": "^2.8.2", - "@decent-org/fractal-ui": "^0.3.1", + "@decent-org/fractal-ui": "^0.3.5", "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", "@ethersproject/abstract-signer": "^5.7.0", @@ -107,4 +107,4 @@ "url": "^0.11.0", "vitest": "^1.2.2" } -} +} \ No newline at end of file diff --git a/src/assets/theme/index.ts b/src/assets/theme/index.ts index 0ea5e15dd4..dd4bfec3ff 100644 --- a/src/assets/theme/index.ts +++ b/src/assets/theme/index.ts @@ -2,5 +2,5 @@ import { theme as decentTheme } from '@decent-org/fractal-ui'; export const theme = { ...decentTheme, - styles: { global: { ...decentTheme.styles.global } }, + styles: { global: decentTheme.styles.global }, }; From b43dc03fdb87ee8d775954b85abc9bb3abe568ac Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Fri, 24 May 2024 00:31:07 -0400 Subject: [PATCH 3/4] run pretty/lint --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b64a7baf4a..9bec7fe90d 100644 --- a/package.json +++ b/package.json @@ -107,4 +107,4 @@ "url": "^0.11.0", "vitest": "^1.2.2" } -} \ No newline at end of file +} From 52af7852216d5abb4254e997c999ae7b19e181cd Mon Sep 17 00:00:00 2001 From: David Colon <38386583+Da-Colon@users.noreply.github.com> Date: Fri, 24 May 2024 11:57:21 -0400 Subject: [PATCH 4/4] add missing scroll dark className --- src/components/pages/DAOTreasury/components/Assets.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/pages/DAOTreasury/components/Assets.tsx b/src/components/pages/DAOTreasury/components/Assets.tsx index 634c196c58..42971a316b 100644 --- a/src/components/pages/DAOTreasury/components/Assets.tsx +++ b/src/components/pages/DAOTreasury/components/Assets.tsx @@ -458,6 +458,7 @@ export function Assets() { {assetsNonFungible.map((asset, index) => (