Merge pull request #502 from 0xsend/dev

deploy
0xsend · Jun 29, 2024 · 20e5607 · 20e5607
2 parents 8ef8303 + 511349f
commit 20e5607
Show file tree

Hide file tree

Showing 32 changed files with 2,261 additions and 1,312 deletions.
diff --git a/apps/next/pages/account/index.tsx b/apps/next/pages/account/index.tsx
@@ -23,9 +23,7 @@ export const Page: NextPageWithLayout = () => {
 
 export const getServerSideProps = userProtectedGetSSP()
 Page.getLayout = (children) => (
-  <HomeLayout TopNav={<TopNav header="Account" button={ButtonOption.SETTINGS} />}>
-    {children}
-  </HomeLayout>
+  <HomeLayout TopNav={<TopNav header="Account" />}>{children}</HomeLayout>
 )
 
 export default Page
diff --git a/apps/next/pages/deposit/index.tsx b/apps/next/pages/deposit/index.tsx
@@ -9,7 +9,7 @@ export const Page: NextPageWithLayout = () => {
   return (
     <>
       <Head>
-        <title>Send | Desposit</title>
+        <title>Send | Deposit</title>
       </Head>
       <DepositScreen />
     </>
@@ -19,7 +19,7 @@ export const Page: NextPageWithLayout = () => {
 export const getServerSideProps = userProtectedGetSSP()
 
 Page.getLayout = (children) => (
-  <HomeLayout TopNav={<TopNav header="Desposit" />}>{children}</HomeLayout>
+  <HomeLayout TopNav={<TopNav header="Deposit" />}>{children}</HomeLayout>
 )
 
 export default Page
diff --git a/packages/app/__mocks__/solito/link.tsx b/packages/app/__mocks__/solito/link.tsx
@@ -2,9 +2,13 @@ import { View } from 'react-native'
 
 const mockSolitoLink = {
   __esModule: true,
-  default: jest.fn(),
   useLink: jest.fn(),
   Link: (props) => <View testID={'MockSolitoLink'} {...props} />,
 }
 
 module.exports = mockSolitoLink
+
+export const useLink = mockSolitoLink.useLink
+export const Link = mockSolitoLink.Link
+
+export default mockSolitoLink
diff --git a/packages/app/components/TopNav.tsx b/packages/app/components/TopNav.tsx
@@ -101,7 +101,7 @@ export function TopNav({
   const renderButton = () => {
     switch (true) {
       case button === undefined:
-        return <Button opacity={0} disabled />
+        return <Button opacity={0} disabled $gtMd={{ display: 'none' }} />
       case selectedCoin !== undefined:
         return (
           <ButtonOg