From da1c2c2fc0c50992bc0fcb108abbbe0aae2739d8 Mon Sep 17 00:00:00 2001
From: "Eng. Juan Combetto" <omniwired@gmail.com>
Date: Fri, 15 Sep 2023 14:41:27 +0900
Subject: [PATCH] feat(WalletManager): Add Wallet Manager title and back
 navigation (fix/omnifixes)

---
 .../screens/WalletManager/WalletHeader.tsx    | 20 -------------------
 .../WalletManager/WalletManagerScreen.tsx     | 14 ++++++++++---
 .../screens/WalletManager/WalletsScreen.tsx   | 13 +++++++++---
 3 files changed, 21 insertions(+), 26 deletions(-)
 delete mode 100644 packages/screens/WalletManager/WalletHeader.tsx

diff --git a/packages/screens/WalletManager/WalletHeader.tsx b/packages/screens/WalletManager/WalletHeader.tsx
deleted file mode 100644
index c9fbe3b3b7..0000000000
--- a/packages/screens/WalletManager/WalletHeader.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from "react";
-import { View } from "react-native";
-
-import { BrandText } from "../../components/BrandText";
-
-interface WalletHeaderProps {}
-
-export const WalletHeader: React.FC<WalletHeaderProps> = () => {
-  return (
-    <View>
-      <BrandText
-        style={{
-          fontSize: 20,
-        }}
-      >
-        Wallet manager
-      </BrandText>
-    </View>
-  );
-};
diff --git a/packages/screens/WalletManager/WalletManagerScreen.tsx b/packages/screens/WalletManager/WalletManagerScreen.tsx
index fa85f4bf2b..56f06b1d98 100644
--- a/packages/screens/WalletManager/WalletManagerScreen.tsx
+++ b/packages/screens/WalletManager/WalletManagerScreen.tsx
@@ -4,24 +4,32 @@ import { View } from "react-native";
 import { Assets } from "./Assets";
 import { MyNFTs } from "./MyNFTs";
 import { WalletDashboardHeader } from "./WalletDashboardHeader";
-import { WalletHeader } from "./WalletHeader";
 import { Wallets } from "./Wallets";
+import { BrandText } from "../../components/BrandText";
 import { ScreenContainer } from "../../components/ScreenContainer";
 import { MainConnectWalletButton } from "../../components/connectWallet/MainConnectWalletButton";
 import { useAreThereWallets } from "../../hooks/useAreThereWallets";
 import { useMaxResolution } from "../../hooks/useMaxResolution";
 import useSelectedWallet from "../../hooks/useSelectedWallet";
-import { ScreenFC } from "../../utils/navigation";
+import { ScreenFC, useAppNavigation } from "../../utils/navigation";
 import { neutral33 } from "../../utils/style/colors";
+import { fontSemibold20 } from "../../utils/style/fonts";
 import { layout } from "../../utils/style/layout";
 
 export const WalletManagerScreen: ScreenFC<"WalletManager"> = () => {
   const selectedWallet = useSelectedWallet();
   const areThereWallets = useAreThereWallets();
   const { height } = useMaxResolution();
+  const navigation = useAppNavigation();
 
   return (
-    <ScreenContainer headerChildren={<WalletHeader />}>
+    <ScreenContainer
+      headerChildren={
+        <BrandText style={fontSemibold20}>Wallet Manager</BrandText>
+      }
+      responsive
+      onBackPress={() => navigation.navigate("WalletManager")}
+    >
       {areThereWallets ? (
         <View
           style={{
diff --git a/packages/screens/WalletManager/WalletsScreen.tsx b/packages/screens/WalletManager/WalletsScreen.tsx
index 6b2dc2d684..c87a815d4d 100644
--- a/packages/screens/WalletManager/WalletsScreen.tsx
+++ b/packages/screens/WalletManager/WalletsScreen.tsx
@@ -1,7 +1,6 @@
 import React, { useState } from "react";
 import { View, TouchableOpacity } from "react-native";
 
-import { WalletHeader } from "./WalletHeader";
 import { WalletItem, WalletItemProps } from "./WalletItem";
 import chevronDownSVG from "../../../assets/icons/chevron-down.svg";
 import chevronUpSVG from "../../../assets/icons/chevron-up.svg";
@@ -14,9 +13,10 @@ import { PrimaryButton } from "../../components/buttons/PrimaryButton";
 import { ConnectWalletModal } from "../../components/connectWallet/ConnectWalletModal";
 import { useRewards } from "../../hooks/useRewards";
 import useSelectedWallet from "../../hooks/useSelectedWallet";
-import { ScreenFC } from "../../utils/navigation";
+import { ScreenFC, useAppNavigation } from "../../utils/navigation";
 import { walletProviderToNetworkKind } from "../../utils/network";
 import { neutral33, neutralA3, secondaryColor } from "../../utils/style/colors";
+import { fontSemibold20 } from "../../utils/style/fonts";
 
 interface WalletProps {
   index: number;
@@ -107,6 +107,7 @@ export const WalletManagerWalletsScreen: ScreenFC<
 > = () => {
   const [showConnectModal, setShowConnectModal] = useState(false);
   const selectedWallet = useSelectedWallet();
+  const navigation = useAppNavigation();
 
   // TODO: Handle multiple wallets addresses
   const { totalsRewards, claimReward } = useRewards(selectedWallet?.userId);
@@ -135,7 +136,13 @@ export const WalletManagerWalletsScreen: ScreenFC<
     : [];
 
   return (
-    <ScreenContainer headerChildren={<WalletHeader />}>
+    <ScreenContainer
+      headerChildren={
+        <BrandText style={fontSemibold20}>Wallet Manager</BrandText>
+      }
+      responsive
+      onBackPress={() => navigation.navigate("WalletManager")}
+    >
       <View
         style={{
           paddingVertical: 48,