Merge branch 'develop'

packages/web/components/MegaMenu/MegaMenuFooter.tsx

@@ -25,6 +25,7 @@ import { XPSeedsBalance } from './XPSeedsBalance';
 // Display player XP and Seed
 export const MegaMenuFooter = () => {
   const { isConnected, isConnecting } = useAccount();
+  const { disconnect } = useWeb3(); 
   const { fetching, user } = useUser();
   const name = usePlayerName(user);
   const linkURL = usePlayerURL(user);
@@ -139,7 +140,7 @@ export const MegaMenuFooter = () => {
                   Dashboard
                 </MenuItem>
               </MetaLink>
-              {/* <MenuItem
+              <MenuItem
                 onClick={disconnect}
                 sx={{
                   '&:hover, &:active, &:focus': {
@@ -151,7 +152,7 @@ export const MegaMenuFooter = () => {
               >
                 <LogOut w={4} h={4} mr={4} fill="white" />
                 Disconnect
-              </MenuItem> */}
+              </MenuItem>
             </MenuList>
           </Menu>
           <HStack justify="flex-end">

packages/web/components/MegaMenu/MegaMenuHeader.tsx

@@ -582,7 +582,7 @@ export const MegaMenuHeader: React.FC = () => {
           >
             <HStack w="15%" flexShrink={1}>
               <Logo
-                link={'/'}
+                link={'/dashboard'}
                 pos={{ base: 'initial', lg: 'relative' }}
                 left={0}
                 top="auto"

packages/web/pages/quest/[id]/complete.tsx

@@ -23,7 +23,6 @@ type Props = InferGetStaticPropsType<typeof getStaticProps>;
 const PageContainer = lazy(() => import('components/Container'));
 
 const SubmitQuestCompletionPage: React.FC<Props> = ({ quest }) => {
-  useUser({ redirectTo: '/quests', redirectIfNotFound: true });
   const toast = useToast();
   const router = useRouter();
   const [createQuestCompletionState, createQuestCompletion] =

packages/web/utils/metamask.ts

@@ -58,7 +58,7 @@ export const addTokenToMetamask = async ({
   address: string;
   symbol: string;
   decimals: number;
-}): Promise<boolean> => {
+}): Promise<boolean> => 
   // try {
   //   await window.ethereum.request({
   //     method: 'wallet_watchAsset',
@@ -76,5 +76,5 @@ export const addTokenToMetamask = async ({
   //   console.error(`Unable to add token: ${symbol}.`, addError);
   //   errorHandler(addError as Error);
   // }
-  return false;
-};
+   false
+;

packages/web/utils/networks.ts

@@ -84,6 +84,4 @@ export function getHexChainId(chain?: string): string {
   }
 }
 
-export const getNumberId = (chainId: string): number => {
-  return parseInt(chainId, 16);
-}
+export const getNumberId = (chainId: string): number => parseInt(chainId, 16)