Merge pull request #298 from mstable/feat/core-ui-kit

feat: update core-ui-kit version (includes renaming of Bridged USDC t…
mstable · Nov 28, 2023 · d6bcb85 · d6bcb85
2 parents 61d3ce0 + 35ca682
commit d6bcb85
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 23 deletions.
diff --git a/apps/mstable/src/providers/core-ui-toolkit.tsx b/apps/mstable/src/providers/core-ui-toolkit.tsx
@@ -92,7 +92,7 @@ export const CoreUIToolkitProvider: FC = ({
 
   return (
     <ToolkitProvider
-      poolConfigMap={CORE_UI_TOOLKIT_POOL_CONFIG_MAP}
+      initialState={{ poolConfigMap: CORE_UI_TOOLKIT_POOL_CONFIG_MAP }}
       actions={getActions(pushNotification)}
     >
       {children}

diff --git a/libs/shared/constants/src/core-vaults/optimism/ethy.ts b/libs/shared/constants/src/core-vaults/optimism/ethy.ts
@@ -1,7 +1,7 @@
 import {
+  BRIDGED_USDC_OPTIMISM,
   optimism,
   SUSD_OPTIMISM,
-  USDC_OPTIMISM,
   WETH_OPTIMISM,
 } from '@dhedge/core-ui-kit/const';
 
@@ -21,7 +21,7 @@ export const ETHY_OPTIMISM: PoolConfig = {
       WETH_OPTIMISM,
       {
         ...SUSD_OPTIMISM,
-        intermediateToken: USDC_OPTIMISM,
+        intermediateToken: BRIDGED_USDC_OPTIMISM,
         method: 'withdrawSUSD',
       },
     ],

diff --git a/libs/shared/constants/src/core-vaults/optimism/mhrvst.ts b/libs/shared/constants/src/core-vaults/optimism/mhrvst.ts
@@ -1,4 +1,4 @@
-import { optimism, USDC_OPTIMISM } from '@dhedge/core-ui-kit/const';
+import { BRIDGED_USDC_OPTIMISM, optimism } from '@dhedge/core-ui-kit/const';
 
 import type { PoolConfig } from '@dhedge/core-ui-kit/types';
 
@@ -9,10 +9,10 @@ export const MHRVST_OPTIMISM: PoolConfig = {
   symbol: 'mHRVST',
   address: '0x9c6de13d4648a6789017641f6b1a025816e66228',
   depositParams: {
-    customTokens: [USDC_OPTIMISM],
+    customTokens: [BRIDGED_USDC_OPTIMISM],
   },
   withdrawParams: {
-    customTokens: [USDC_OPTIMISM],
+    customTokens: [BRIDGED_USDC_OPTIMISM],
   },
 };
 

diff --git a/libs/shared/constants/src/core-vaults/optimism/usdmny.ts b/libs/shared/constants/src/core-vaults/optimism/usdmny.ts
@@ -1,7 +1,7 @@
 import {
+  BRIDGED_USDC_OPTIMISM,
   optimism,
   SUSD_OPTIMISM,
-  USDC_OPTIMISM,
 } from '@dhedge/core-ui-kit/const';
 
 import type { PoolConfig } from '@dhedge/core-ui-kit/types';
@@ -17,10 +17,10 @@ export const USDMNY_OPTIMISM: PoolConfig = {
   },
   withdrawParams: {
     customTokens: [
-      USDC_OPTIMISM,
+      BRIDGED_USDC_OPTIMISM,
       {
         ...SUSD_OPTIMISM,
-        intermediateToken: USDC_OPTIMISM,
+        intermediateToken: BRIDGED_USDC_OPTIMISM,
         method: 'withdrawSUSD',
       },
     ],

diff --git a/libs/shared/constants/src/core-vaults/optimism/usdy.ts b/libs/shared/constants/src/core-vaults/optimism/usdy.ts
@@ -1,8 +1,8 @@
 import {
+  BRIDGED_USDC_OPTIMISM,
   DAI_OPTIMISM,
   optimism,
   SUSD_OPTIMISM,
-  USDC_OPTIMISM,
 } from '@dhedge/core-ui-kit/const';
 
 import type { PoolConfig } from '@dhedge/core-ui-kit/types';
@@ -18,10 +18,10 @@ export const USDY_OPTIMISM: PoolConfig = {
   },
   withdrawParams: {
     customTokens: [
-      USDC_OPTIMISM,
+      BRIDGED_USDC_OPTIMISM,
       {
         ...SUSD_OPTIMISM,
-        intermediateToken: USDC_OPTIMISM,
+        intermediateToken: BRIDGED_USDC_OPTIMISM,
         method: 'withdrawSUSD',
       },
       DAI_OPTIMISM,

diff --git a/libs/shared/providers/src/core-ui-toolkit/components/core-ui-toolkit-provider.tsx b/libs/shared/providers/src/core-ui-toolkit/components/core-ui-toolkit-provider.tsx
@@ -5,12 +5,8 @@ import type { FC, PropsWithChildren } from 'react';
 
 export const CoreUIToolkitProvider: FC<
   PropsWithChildren<TradingPanelContextConfig>
-> = ({ children, actions, poolConfigMap, poolAddress }) => (
-  <TradingPanelProvider
-    actions={actions}
-    poolAddress={poolAddress}
-    poolConfigMap={poolConfigMap}
-  >
+> = ({ children, actions, initialState }) => (
+  <TradingPanelProvider actions={actions} initialState={initialState}>
     {children}
   </TradingPanelProvider>
 );
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "*.{js,jsx,ts,tsx,mdx}": "eslint --fix"
   },
   "dependencies": {
-    "@dhedge/core-ui-kit": "^0.3.10",
+    "@dhedge/core-ui-kit": "^0.4.1",
     "@dhedge/crypto-assets": "^0.2.6",
     "@emotion/react": "11.10.6",
     "@emotion/styled": "11.10.6",

diff --git a/yarn.lock b/yarn.lock
@@ -1983,10 +1983,10 @@
     enabled "2.0.x"
     kuler "^2.0.0"
 
-"@dhedge/core-ui-kit@^0.3.10":
-  version "0.3.10"
-  resolved "https://registry.yarnpkg.com/@dhedge/core-ui-kit/-/core-ui-kit-0.3.10.tgz#bf58b9410f7545c7329d5531e26980f3f213e021"
-  integrity sha512-RvIfDqWWi2RWdeZrNxs93XNTzpLXWZdnqWylA1oLO/qRc1G52a9ZC0ThYup8UmlW020lJGJJ9oVHDVR1JDLSSw==
+"@dhedge/core-ui-kit@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@dhedge/core-ui-kit/-/core-ui-kit-0.4.1.tgz#838c56c905f1a110dcfd8a6b859992946d1985a9"
+  integrity sha512-MmxfFVUw8peC1ahhZKafmAMMKrdM9fFkzxqTDy8IeHuFmtOvFyN9A5j8o2eF3pXvM4cOXIE+9Ay73k9yf2A0WA==
   dependencies:
     "@wagmi/chains" "^0.2.25"
     lodash.chunk "^4.2.0"