Fix multiple issues

src/components/HomeScreenHeader.tsx

@@ -105,7 +105,7 @@ const HomeScreenHeader: React.FC<HomeScreenHeaderProps> = ({
               color={`${colorMode}.choosePlanHome`}
               medium
             >
-              {capitalizeEachWord(title === wallet.more ? common.keeperSettings : title)}
+              {capitalizeEachWord(title === wallet.more ? common.moreOption : title)}
             </Text>
           </Box>
 

src/components/KeeperModal.tsx

@@ -155,7 +155,7 @@ function KeeperModal(props: ModalProps) {
             }
             style={styles.container}
           >
-            <Box style={styles.header}>
+            <Box>
               {showCloseIcon ? (
                 <TouchableOpacity testID="btn_close_modal" style={styles.close} onPress={close}>
                   {getCloseIcon()}
@@ -285,10 +285,6 @@ const getStyles = (subTitleWidth) =>
       lineHeight: 20,
       width: subTitleWidth,
     },
-    header: {
-      paddingBottom: hp(-10),
-      marginBottom: hp(-10),
-    },
     secCta: {
       color: '#073E39',
       borderRadius: 10,

src/components/ToastMessages.tsx

@@ -44,7 +44,7 @@ const styles = StyleSheet.create({
     width: windowWidth * 0.9,
     paddingLeft: 15,
     bottom: hp(40),
-    height: 70,
+    minHeight: hp(70),
     fontSize: 13,
     elevation: 6,
     shadowOpacity: 0.6,

src/context/Localization/language/en.json

@@ -75,6 +75,7 @@
     "disconnect": "Disconnect",
     "sats": "sats",
     "delete": "Delete",
+    "moreOption": "More Option",
     "tips": "Tips",
     "connectionError": "Connection error",
     "electrumErrorSubTitle": "Check your network and try again",

src/context/Localization/language/es.json

@@ -118,6 +118,7 @@
     "manageUTXO": "manage UTXO",
     "manageKeys": "Manage Keys",
     "manageKeysDesc": "Securely manage your keys with ease",
+    "moreOption": "More Option",
 
     "forThisVault": "for this vault",
     "saveChanges": "Save Changes",

src/hooks/useWalletAsset.ts

@@ -57,17 +57,17 @@ const useWalletAsset = () => {
         case VaultType.COLLABORATIVE:
           return [
             { tag: 'Collaborative', color: Colors.mintGreen },
-            { tag: getSchemeTag(wallet as Vault), color: Colors.LightMossGreen },
+            { tag: getSchemeTag(wallet as Vault), color: Colors.DesertSand },
           ];
         case VaultType.ASSISTED:
           return [
             { tag: 'Assisted', color: Colors.LightMossGreen },
-            { tag: getSchemeTag(wallet as Vault), color: Colors.mintGreen },
+            { tag: getSchemeTag(wallet as Vault), color: Colors.DesertSand },
           ];
         case VaultType.TIMELOCKED:
           return [
             { tag: 'Timelocked', color: Colors.mintGreen },
-            { tag: getSchemeTag(wallet as Vault), color: Colors.LightMossGreen },
+            { tag: getSchemeTag(wallet as Vault), color: Colors.DesertSand },
           ];
         case VaultType.CANARY:
           return [{ tag: 'Canary', color: Colors.LightMossGreen }];
@@ -76,12 +76,12 @@ const useWalletAsset = () => {
             wallet.scheme.miniscriptScheme?.usedMiniscriptTypes.includes(
               MiniscriptTypes.INHERITANCE
             ) && { tag: 'Inheritance Key', color: Colors.Aquamarine },
-            { tag: getSchemeTag(wallet as Vault), color: Colors.LightMossGreen },
+            { tag: getSchemeTag(wallet as Vault), color: Colors.DesertSand },
           ].filter(Boolean);
         default:
           return [
-            { tag: 'Multi-key', color: Colors.mintGreen },
-            { tag: getSchemeTag(wallet as Vault), color: Colors.LightMossGreen },
+            { tag: 'Multi-key', color: Colors.LabelLight3 },
+            { tag: getSchemeTag(wallet as Vault), color: Colors.DesertSand },
           ];
       }
     } else {
@@ -94,8 +94,11 @@ const useWalletAsset = () => {
         derivationPath && WalletUtilities.getPurpose(derivationPath) === DerivationPurpose.BIP86;
 
       return [
-        { tag: walletKind, color: Colors.LightMossGreen },
-        { tag: isTaprootWallet ? 'Taproot' : 'Single-Key', color: Colors.PaleCyan },
+        { tag: walletKind, color: Colors.DesertSand },
+        {
+          tag: isTaprootWallet ? 'Taproot' : 'Single-Key',
+          color: isTaprootWallet ? Colors.PaleCyan : Colors.LabelLight3,
+        },
       ];
     }
   };

src/screens/ChoosePlanScreen/components/SubscriptionList.tsx

@@ -2,7 +2,7 @@ import { Box, ScrollView, useColorMode } from 'native-base';
 import React, { useState } from 'react';
 import { View, TouchableOpacity, StyleSheet } from 'react-native';
 import CircleIconWrapper from 'src/components/CircleIconWrapper';
-import { wp } from 'src/constants/responsive';
+import { hp, wp } from 'src/constants/responsive';
 import { useSettingKeeper } from 'src/hooks/useSettingKeeper';
 import ArrowRightGreen from 'src/assets/images/right-green-icon.svg';
 import ArrowDownGreen from 'src/assets/images/down-green-icon.svg';
@@ -93,6 +93,7 @@ const SubscriptionList: React.FC<{
               toggleExpand(index);
             }}
             style={styles.touchable}
+            key={index}
           >
             <Box
               key={index}
@@ -233,10 +234,12 @@ const styles = StyleSheet.create({
   },
   divider: {
     height: 1,
-    marginVertical: 20,
+    marginTop: hp(20),
+    marginBottom: hp(10),
     opacity: 0.2,
   },
   price: {
+    paddingTop: hp(10),
     fontSize: 22,
     fontWeight: '700',
   },

src/screens/Home/HomeScreen.tsx

@@ -9,7 +9,7 @@ import ToastErrorIcon from 'src/assets/images/toast_error.svg';
 
 import KeysIcon from 'src/assets/images/homeGreenKeyIcon.svg';
 import ConciergeIcon from 'src/assets/images/faq-green.svg';
-import SettingIcon from 'src/assets/images/settingsGreenIcon.svg';
+import SettingIcon from 'src/assets/images/more-green.svg';
 import { resetRealyWalletState } from 'src/store/reducers/bhr';
 import InititalAppController from './InititalAppController';
 import { LocalizationContext } from 'src/context/Localization/LocContext';

src/screens/Home/components/Settings/Component/SettingModal.tsx

@@ -20,13 +20,15 @@ const SettingModal = ({ isUaiFlow, confirmPass, setConfirmPass }) => {
   const { primaryMnemonic }: KeeperApp = useQuery(RealmSchema.KeeperApp).map(
     getJSONFromRealmObject
   )[0];
-  const [confirmPassVisible, setConfirmPassVisible] = useState(isUaiFlow);
+  const [confirmPassVisible, setConfirmPassVisible] = useState(false);
   const [backupModalVisible, setBackupModalVisible] = useState(false);
+
   useEffect(() => {
-    if (confirmPass) {
+    if (confirmPass || isUaiFlow) {
+      navigation.setParams({ isUaiFlow: false });
       setConfirmPassVisible(true);
     }
-  }, [confirmPass]);
+  }, [confirmPass, isUaiFlow]);
 
   return (
     <Box>

src/screens/Vault/VaultDetails.tsx

@@ -350,7 +350,6 @@ function VaultDetails({ navigation, route }: ScreenProps) {
       <StatusBar barStyle={isDarkMode ? 'light-content' : 'dark-content'} />
       <VStack style={styles.topSection}>
         <WalletHeader
-          title={vault.presentationData?.name}
           data={vault}
           rightComponent={
             <TouchableOpacity

src/screens/WalletDetails/WalletDetails.tsx

@@ -158,7 +158,6 @@ function WalletDetails({ route }: ScreenProps) {
       <StatusBar barStyle={isDarkMode ? 'light-content' : 'dark-content'} />
       <Box style={styles.topContainer}>
         <WalletHeader
-          title={name}
           rightComponent={
             <TouchableOpacity
               style={styles.settingBtn}

src/theme/Colors.ts

@@ -185,6 +185,7 @@ const Colors = {
   horizontaldivider: 'rgba(232, 227, 221,1)',
   termsGrey: 'rgba(78, 92, 106, 1)',
   headerWhite: 'rgba(255, 255, 255, 1)',
+  DesertSand: 'rgba(234, 210, 181, 1)',
 
   darkBorderGreen: 'rgba(89, 116, 107, 1)',