From c0071bd7051a183d9a5afa6dcc3a452d1c98a512 Mon Sep 17 00:00:00 2001 From: Danny Delott Date: Mon, 24 Feb 2025 10:44:16 -0800 Subject: [PATCH 1/2] Update to latest react 18 --- apps/hyperdrive-trading/package.json | 2 +- apps/hyperdrive-trading/src/network/wagmiClient.ts | 2 -- yarn.lock | 9 ++++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/hyperdrive-trading/package.json b/apps/hyperdrive-trading/package.json index c5ae06d1e..494ad7528 100644 --- a/apps/hyperdrive-trading/package.json +++ b/apps/hyperdrive-trading/package.json @@ -70,7 +70,7 @@ "process": "^0.11.10", "react-awesome-reveal": "^4.3.1", "@emotion/react": "^11.14.0", - "react": "^18.2.0", + "react": "^18.3.1", "react-dom": "^18.2.0", "react-helmet": "^6.1.0", "react-hot-toast": "^2.4.0", diff --git a/apps/hyperdrive-trading/src/network/wagmiClient.ts b/apps/hyperdrive-trading/src/network/wagmiClient.ts index ac5941ff4..2baa6425d 100644 --- a/apps/hyperdrive-trading/src/network/wagmiClient.ts +++ b/apps/hyperdrive-trading/src/network/wagmiClient.ts @@ -17,8 +17,6 @@ const { VITE_LOCALHOST_NODE_RPC_URL, VITE_CUSTOM_CHAIN_NODE_RPC_URL, VITE_CUSTOM_CHAIN_CHAIN_ID, - VITE_REWARDS_FORK_NODE_RPC_URL, - VITE_REWARDS_FORK_CHAIN_ID, VITE_WALLET_CONNECT_PROJECT_ID, VITE_SEPOLIA_RPC_URL, VITE_MAINNET_RPC_URL, diff --git a/yarn.lock b/yarn.lock index 0c112d774..b257b63fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17774,13 +17774,20 @@ react-use@^17.4.2: ts-easing "^0.2.0" tslib "^2.1.0" -react@>=16, react@^18.0.0, react@^18.2.0: +react@>=16, react@^18.0.0: version "18.2.0" resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5" integrity sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ== dependencies: loose-envify "^1.1.0" +react@^18.3.1: + version "18.3.1" + resolved "https://registry.yarnpkg.com/react/-/react-18.3.1.tgz#49ab892009c53933625bd16b2533fc754cab2891" + integrity sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ== + dependencies: + loose-envify "^1.1.0" + read-cache@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" From 2ca3727c9690c62fad3f27c4b45780bf14d6421d Mon Sep 17 00:00:00 2001 From: Danny Delott Date: Mon, 24 Feb 2025 11:06:25 -0800 Subject: [PATCH 2/2] Move tooltip provider to top-level, update react-dom --- apps/hyperdrive-trading/package.json | 2 +- apps/hyperdrive-trading/src/ui/main.tsx | 5 ++- .../src/ui/markets/PoolRow/PoolStat.tsx | 30 +++++++------ .../rewards/RewardsTooltip/RewardsTooltip.tsx | 42 +++++++++---------- yarn.lock | 17 +++++++- 5 files changed, 55 insertions(+), 41 deletions(-) diff --git a/apps/hyperdrive-trading/package.json b/apps/hyperdrive-trading/package.json index 494ad7528..611cbe0a0 100644 --- a/apps/hyperdrive-trading/package.json +++ b/apps/hyperdrive-trading/package.json @@ -71,7 +71,7 @@ "react-awesome-reveal": "^4.3.1", "@emotion/react": "^11.14.0", "react": "^18.3.1", - "react-dom": "^18.2.0", + "react-dom": "^18.3.1", "react-helmet": "^6.1.0", "react-hot-toast": "^2.4.0", "react-loading-skeleton": "^3.3.1", diff --git a/apps/hyperdrive-trading/src/ui/main.tsx b/apps/hyperdrive-trading/src/ui/main.tsx index c3daa5562..a0dcd7ad0 100644 --- a/apps/hyperdrive-trading/src/ui/main.tsx +++ b/apps/hyperdrive-trading/src/ui/main.tsx @@ -3,6 +3,7 @@ import { RainbowKitProvider } from "@rainbow-me/rainbowkit"; import "@rainbow-me/rainbowkit/styles.css"; import "@usecapsule/react-sdk/styles.css"; +import * as Tooltip from "@radix-ui/react-tooltip"; import { ErrorBoundary as RollbarErrorBoundary, Provider as RollbarProvider, @@ -72,7 +73,9 @@ root.render( > - + + + diff --git a/apps/hyperdrive-trading/src/ui/markets/PoolRow/PoolStat.tsx b/apps/hyperdrive-trading/src/ui/markets/PoolRow/PoolStat.tsx index b745fe2e7..dec8bf329 100644 --- a/apps/hyperdrive-trading/src/ui/markets/PoolRow/PoolStat.tsx +++ b/apps/hyperdrive-trading/src/ui/markets/PoolRow/PoolStat.tsx @@ -47,22 +47,20 @@ export function PoolStat({ if (overlay) { return ( - - - - {poolStat} - - - - {overlay} - - - - + + + {poolStat} + + + + {overlay} + + + ); } diff --git a/apps/hyperdrive-trading/src/ui/rewards/RewardsTooltip/RewardsTooltip.tsx b/apps/hyperdrive-trading/src/ui/rewards/RewardsTooltip/RewardsTooltip.tsx index 2a059f14b..889222102 100644 --- a/apps/hyperdrive-trading/src/ui/rewards/RewardsTooltip/RewardsTooltip.tsx +++ b/apps/hyperdrive-trading/src/ui/rewards/RewardsTooltip/RewardsTooltip.tsx @@ -67,27 +67,25 @@ export function RewardsTooltip({ } return ( - - - - {children} - - - - - - - - + + + {children} + + + + + + + ); } diff --git a/yarn.lock b/yarn.lock index b257b63fe..472d3c491 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17581,7 +17581,7 @@ react-dev-utils@^12.0.1: strip-ansi "^6.0.1" text-table "^0.2.0" -react-dom@^18.0.0, react-dom@^18.2.0: +react-dom@^18.0.0: version "18.2.0" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.2.0.tgz#22aaf38708db2674ed9ada224ca4aa708d821e3d" integrity sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g== @@ -17589,6 +17589,14 @@ react-dom@^18.0.0, react-dom@^18.2.0: loose-envify "^1.1.0" scheduler "^0.23.0" +react-dom@^18.3.1: + version "18.3.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-18.3.1.tgz#c2265d79511b57d479b3dd3fdfa51536494c5cb4" + integrity sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw== + dependencies: + loose-envify "^1.1.0" + scheduler "^0.23.2" + react-error-overlay@^6.0.11: version "6.0.11" resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb" @@ -18531,6 +18539,13 @@ scheduler@^0.23.0: dependencies: loose-envify "^1.1.0" +scheduler@^0.23.2: + version "0.23.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.23.2.tgz#414ba64a3b282892e944cf2108ecc078d115cdc3" + integrity sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ== + dependencies: + loose-envify "^1.1.0" + schema-utils@2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"