Fixed PR comments

packages/commonwealth/client/scripts/App.tsx

@@ -1,11 +1,8 @@
-import { FarcasterExtension } from '@magic-ext/farcaster';
-import { OAuthExtension } from '@magic-ext/oauth2';
 import { OpenFeatureProvider } from '@openfeature/react-sdk';
 import { OpenFeature } from '@openfeature/web-sdk';
 import { QueryClientProvider } from '@tanstack/react-query';
 import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
 import useInitApp from 'hooks/useInitApp';
-import { Magic } from 'magic-sdk';
 import router from 'navigation/Router';
 import React, { StrictMode } from 'react';
 import { HelmetProvider } from 'react-helmet-async';
@@ -21,12 +18,6 @@ import { Mava } from './views/components/Mava';
 
 OpenFeature.setProvider(openFeatureProvider);
 
-// need to instantiate it early because the farcaster sdk has an async constructor which will cause a race condition
-// if instantiated right before the login is called;
-export const defaultMagic = new Magic(process.env.MAGIC_PUBLISHABLE_KEY!, {
-  extensions: [new FarcasterExtension(), new OAuthExtension()],
-});
-
 const App = () => {
   const { isLoading } = useInitApp();
   const { isAddedToHomeScreen, isMarketingPage, isIOS, isAndroid } =

packages/commonwealth/client/scripts/controllers/app/login.ts

@@ -15,6 +15,7 @@ import {
   WalletSsoSource,
 } from '@hicommonwealth/shared';
 import { CosmosExtension } from '@magic-ext/cosmos';
+import { FarcasterExtension } from '@magic-ext/farcaster';
 import { OAuthExtension } from '@magic-ext/oauth2';
 import axios from 'axios';
 import { notifyError } from 'controllers/app/notifications';
@@ -32,11 +33,16 @@ import {
 import { welcomeOnboardModal } from 'state/ui/modals/welcomeOnboardModal';
 import { userStore } from 'state/ui/user';
 import { z } from 'zod';
-import { defaultMagic } from '../../App';
 import Account from '../../models/Account';
 import AddressInfo from '../../models/AddressInfo';
 import type BlockInfo from '../../models/BlockInfo';
 
+// need to instantiate it early because the farcaster sdk has an async constructor which will cause a race condition
+// if instantiated right before the login is called;
+export const defaultMagic = new Magic(process.env.MAGIC_PUBLISHABLE_KEY!, {
+  extensions: [new FarcasterExtension(), new OAuthExtension()],
+});
+
 function storeActiveAccount(account: Account) {
   const user = userStore.getState();
   user.setData({ activeAccount: account });