Revert "Separate Cash,Savings,Invest"

This reverts commit d2995dc.

Author: youngkidwarrior

apps/next/pages/index.tsx

@@ -49,7 +49,7 @@ export const Page: NextPageWithLayout<InferGetServerSidePropsType<typeof getServ
         <title>Send</title>
       </Head>
       {session ? (
-        <HomeLayout TopNav={<TopNav header="Home" showLogo={true} backFunction="router" />}>
+        <HomeLayout TopNav={<TopNav header="Home" showLogo={true} />}>
           <HomeScreen />
         </HomeLayout>
       ) : (

packages/app/components/TopNav.tsx

@@ -101,16 +101,23 @@ export function TopNav({
   showOnGtLg = false,
   hideRightActions = false,
 }: TopNavProps) {
-  const [queryParams] = useRootScreenParams()
+  const [queryParams, setRootParams] = useRootScreenParams()
   const path = usePathname()
   const parts = path.split('/').filter(Boolean)
   const { push, back } = useRouter()
   const media = useMedia()
+  const { coin: selectedCoin } = useCoinFromTokenParam()
   const { profile } = useUser()
 
+  const hasSelectedCoin = Boolean(selectedCoin)
+
   const handleBack = () => {
     // pop to the base path if subroute. e.g. /account/settings/edit-profile -> /account
     // else, go to home page
+    if (hasSelectedCoin) {
+      setRootParams({ ...queryParams, token: undefined })
+      return
+    }
     if (backFunction === 'router') {
       back()
       return
@@ -162,7 +169,7 @@ export function TopNav({
               )
             case media.gtLg && !showOnGtLg:
               return null
-            case Boolean(queryParams.token):
+            case hasSelectedCoin:
               return (
                 <XStack ai="center" f={1}>
                   <Button onPress={handleBack}>
@@ -174,6 +181,9 @@ export function TopNav({
                       />
                     </ButtonOg.Icon>
                   </Button>
+                  <Paragraph size={'$8'} col={'$color10'}>
+                    Balance
+                  </Paragraph>
                 </XStack>
               )
             case !isSubRoute:

packages/app/features/home/HomeQuickActions.tsx

@@ -84,7 +84,7 @@ const Send = () => {
   )
 }
 
-const Invest = () => {
+const Trade = () => {
   const { coin } = useCoinFromTokenParam()
   const media = useMedia()
   const isSmallScreen = !media.gtXs
@@ -109,8 +109,8 @@ const Invest = () => {
         height={'auto'}
       >
         <Theme name="green">
-          <IconPlus
-            size={'$1.5'}
+          <IconSwap
+            size={'$1'}
             $theme-dark={{ color: '$primary' }}
             $theme-light={{ color: '$color12' }}
           />
@@ -123,7 +123,7 @@ const Invest = () => {
           numberOfLines={1}
           ellipsizeMode="tail"
         >
-          Invest
+          Trade
         </ButtonText>
       </YStack>
     </QuickActionButton>
@@ -200,5 +200,5 @@ const Earn = () => {
 
 HomeQuickActions.Deposit = Deposit
 HomeQuickActions.Send = Send
-HomeQuickActions.Invest = Invest
+HomeQuickActions.Trade = Trade
 HomeQuickActions.Earn = Earn