feat: final

bob-collective · Nov 18, 2024 · c28d78a · c28d78a
1 parent ef6af04
commit c28d78a
Show file tree

Hide file tree

Showing 6 changed files with 337 additions and 42 deletions.
diff --git a/apps/evm/package.json b/apps/evm/package.json
@@ -17,10 +17,10 @@
   },
   "dependencies": {
     "@dynamic-labs/bitcoin": "^3.6.2",
-    "@dynamic-labs/ethereum": "^v3.0.0-alpha.29",
+    "@dynamic-labs/ethereum": "^3.6.2",
     "@dynamic-labs/iconic": "^3.6.2",
-    "@dynamic-labs/sdk-react-core": "^v3.0.0-alpha.29",
-    "@dynamic-labs/wagmi-connector": "^v3.0.0-alpha.29",
+    "@dynamic-labs/sdk-react-core": "^3.6.2",
+    "@dynamic-labs/wagmi-connector": "^3.6.2",
     "@eth-optimism/sdk": "^3.1.6",
     "@ethersproject/providers": "^5.7.2",
     "@gobob/bob-sdk": "^3.0.3",

diff --git a/apps/evm/src/app/[lang]/(bridge)/bridge/page.tsx b/apps/evm/src/app/[lang]/(bridge)/bridge/page.tsx
@@ -1,11 +1,10 @@
-import { Metadata } from 'next';
 import { t } from '@lingui/macro';
+import { Metadata } from 'next';
 
 import { Bridge } from './Bridge';
 
-import { withLinguiPage } from '@/i18n/withLigui';
 import { getI18nInstance } from '@/i18n/appRouterI18n';
-import { PageLangParam } from '@/i18n/withLigui';
+import { PageLangParam, withLinguiPage } from '@/i18n/withLigui';
 
 export function generateMetadata({ params }: PageLangParam): Metadata {
   const i18n = getI18nInstance(params.lang);

diff --git a/apps/evm/src/app/[lang]/providers.tsx b/apps/evm/src/app/[lang]/providers.tsx
@@ -50,6 +50,7 @@ export function Providers({ children }: PropsWithChildren) {
           ]
         }
       }}
+      theme='dark'
     >
       <WagmiProvider config={getConfig({ isProd, multiInjectedProviderDiscovery: false })}>
         <QueryClientProvider client={queryClient}>

diff --git a/apps/evm/src/components/Layout/Header.tsx b/apps/evm/src/components/Layout/Header.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import { DynamicWidget } from '@dynamic-labs/sdk-react-core';
 import {
   Bars3,
   Button,
@@ -13,10 +14,9 @@ import {
   useMediaQuery
 } from '@gobob/ui';
 import { t, Trans } from '@lingui/macro';
+import { useLingui } from '@lingui/react';
 import { useState } from 'react';
 import { useTheme } from 'styled-components';
-import { useLingui } from '@lingui/react';
-import { useDynamicContext } from '@dynamic-labs/sdk-react-core';
 
 import { Logo } from '../Logo';
 import { SocialsGroup } from '../SocialsGroup';
@@ -42,8 +42,6 @@ const Header = ({ isTestnet, isFusion, ...props }: HeaderProps): JSX.Element =>
   const { setSidebarOpen } = useLayoutContext();
   const [isOpen, setOpen] = useState(false);
 
-  const { setShowAuthFlow } = useDynamicContext();
-
   const theme = useTheme();
   const isMobileViewport = useMediaQuery(theme.breakpoints.down('md'));
   const { isMobile: isMobileUserAgent } = useUserAgent();
@@ -116,9 +114,7 @@ const Header = ({ isTestnet, isFusion, ...props }: HeaderProps): JSX.Element =>
         </Popover>
         <SocialsGroup hidden={isMobile} variant='ghost' />
         <FusionPopover />
-        <Button variant='ghost' onPress={() => setShowAuthFlow(true)}>
-          Connect Modal
-        </Button>
+        <DynamicWidget />
       </Flex>
     </StyledHeader>
   );

diff --git a/apps/evm/src/components/Layout/Layout.style.tsx b/apps/evm/src/components/Layout/Layout.style.tsx
@@ -17,7 +17,6 @@ const StyledLayout = styled(Flex)`
 const StyledHeader = styled(Flex)`
   width: 100%;
   padding-right: ${({ theme }) => theme.spacing('3xl')};
-  overflow-x: hidden;
   z-index: 20;
   margin: 0 auto;
 `;
-Original file line number
+Diff line change
@@ Expand Up / @@ -50,6 +50,7 @@ export function Providers({ children }: PropsWithChildren) { @@
               ]
             }
           }}
+          theme='dark'
         >
           <WagmiProvider config={getConfig({ isProd, multiInjectedProviderDiscovery: false })}>
             <QueryClientProvider client={queryClient}>
@@ Expand Down @@