Merge pull request #3289 from bithyve/sprint

Build 257
bithyve · Oct 6, 2023 · a2c2ded · a2c2ded
2 parents 21b1b79 + b45a2ec
commit a2c2ded
Show file tree

Hide file tree

Showing 18 changed files with 200 additions and 191 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -85,7 +85,7 @@ android {
         applicationId "io.hexawallet.keeper"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 256
+        versionCode 257
         versionName "1.1.6"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'

diff --git a/ios/hexa_keeper.xcodeproj/project.pbxproj b/ios/hexa_keeper.xcodeproj/project.pbxproj
@@ -783,7 +783,7 @@
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 256;
+				CURRENT_PROJECT_VERSION = 257;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -915,7 +915,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution: Bithyve UK Ltd (Y5TCB759QL)";
-				CURRENT_PROJECT_VERSION = 256;
+				CURRENT_PROJECT_VERSION = 257;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1176,7 +1176,7 @@
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 256;
+				CURRENT_PROJECT_VERSION = 257;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1310,7 +1310,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution";
-				CURRENT_PROJECT_VERSION = 256;
+				CURRENT_PROJECT_VERSION = 257;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/ios/hexa_keeper/Info.plist b/ios/hexa_keeper/Info.plist
@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>256</string>
+	<string>257</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NFCReaderUsageDescription</key>

diff --git a/ios/hexa_keeperTests/Info.plist b/ios/hexa_keeperTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>256</string>
+	<string>257</string>
 </dict>
 </plist>
diff --git a/ios/hexa_keeper_dev-Info.plist b/ios/hexa_keeper_dev-Info.plist
@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>256</string>
+	<string>257</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NFCReaderUsageDescription</key>

diff --git a/src/assets/images/icon_vault_new.svg b/src/assets/images/icon_vault_new.svg
diff --git a/src/components/OptionCard.tsx b/src/components/OptionCard.tsx
@@ -17,7 +17,7 @@ export const OptionCard = ({ title, description, Icon, callback }: OptionProps)
     <Pressable onPress={callback}>
       <HStack
         padding={3}
-        width={Icon ? windowWidth * 0.9 : windowWidth * 0.85}
+        width={windowWidth * 0.85}
         justifyContent="space-between"
         alignItems={'center'}
         borderRadius={10}

diff --git a/src/screens/Channel/ConnectChannel.tsx b/src/screens/Channel/ConnectChannel.tsx
@@ -265,7 +265,9 @@ function ConnectChannel() {
           ) : (
             <VStack>
               <Text numberOfLines={2} color={`${colorMode}.greenText`} style={styles.instructions}>
-                {'\u2022 Please share the xPub from the Keeper web interface...'}
+                {`\u2022 Please ${
+                  mode === InteracationMode.HEALTH_CHECK ? 'do a health check' : 'share the xPub'
+                } from the Keeper web interface...`}
               </Text>
               <Text numberOfLines={3} color={`${colorMode}.greenText`} style={styles.instructions}>
                 {

diff --git a/src/screens/HomeScreen/VaultScreen.tsx b/src/screens/HomeScreen/VaultScreen.tsx
@@ -45,13 +45,13 @@ function VaultScreen() {
           <Text style={styles.titleText} color={`${colorMode}.primaryText`} testID="text_YourVault">
             Your Vault
           </Text>
-          {/* <Text style={styles.subTitleText} color="light.secondaryText">
-            Keys on Signing Devices
-          </Text> */}
         </Box>
         <TouchableOpacity testID="btn_vault" onPress={onVaultPress} activeOpacity={0.7}>
           <Box
-            style={!activeVault ? styles.emptyVaultSignerWrapper : styles.vaultDetailsWrapper}
+            style={[
+              styles.vaultDetailsWrapper,
+              { alignItems: !activeVault ? 'center' : 'flex-start' },
+            ]}
             backgroundColor={`${colorMode}.learnMoreBorder`}
           >
             {!activeVault ? (
@@ -99,7 +99,6 @@ function VaultScreen() {
             )}
           </Box>
         </TouchableOpacity>
-
         <ListItemView
           icon={<InheritanceIcon />}
           title="Inheritance Tools"
@@ -118,8 +117,7 @@ export default VaultScreen;
 
 const styles = StyleSheet.create({
   titleWrapper: {
-    marginVertical: windowHeight > 680 ? hp(5) : 0,
-    marginTop: hp(20),
+    marginVertical: hp(20),
   },
   titleText: {
     fontSize: 16,
@@ -132,18 +130,9 @@ const styles = StyleSheet.create({
   vaultDetailsWrapper: {
     paddingHorizontal: 15,
     borderRadius: 10,
-    marginVertical: hp(20),
     height: hp(210),
     justifyContent: 'center',
-  },
-  emptyVaultSignerWrapper: {
-    // paddingVertical: 45,
-    paddingHorizontal: 20,
-    borderRadius: 10,
-    marginVertical: hp(20),
-    height: hp(210),
-    alignItems: 'center',
-    justifyContent: 'center',
+    marginBottom: hp(20),
   },
   emptyVaultIllustration: {
     alignSelf: 'center',

diff --git a/src/screens/HomeScreen/WalletsScreen.tsx b/src/screens/HomeScreen/WalletsScreen.tsx
@@ -2,7 +2,6 @@ import { StyleSheet, TouchableOpacity, Animated, Pressable, View } from 'react-n
 import React, { useContext, useEffect, useState } from 'react';
 import useWallets from 'src/hooks/useWallets';
 import { useAppSelector } from 'src/store/hooks';
-import useBalance from 'src/hooks/useBalance';
 import { Box, useColorMode } from 'native-base';
 import { hp, windowHeight, windowWidth, wp } from 'src/constants/responsive';
 import { useNavigation } from '@react-navigation/native';
@@ -120,8 +119,8 @@ function WalletItem({
       onPress={() => {
         isCollaborativeWallet
           ? navigation.navigate('VaultDetails', {
-            collaborativeWalletId: item.collaborativeWalletId,
-          })
+              collaborativeWalletId: item.collaborativeWalletId,
+            })
           : navigation.navigate('WalletDetails', { walletId: item.id, walletIndex });
       }}
     >
@@ -162,7 +161,6 @@ function WalletList({
         bounces={false}
         snapToInterval={ITEM_SIZE}
         scrollEventThrottle={16}
-        contentContainerStyle={{ marginTop: '10%' }}
         onScroll={Animated.event([{ nativeEvent: { contentOffset: { x: scrollX } } }], {
           useNativeDriver: true,
           listener: (event) => {
@@ -416,9 +414,7 @@ const WalletsScreen = ({ navigation }) => {
   const [defaultWalletCreation, setDefaultWalletCreation] = useState(false);
 
   const { showToast } = useToastMessage();
-  const { recepitVerificationFailed } = useAppSelector(
-    (state) => state.login
-  );
+  const { recepitVerificationFailed } = useAppSelector((state) => state.login);
 
   const electrumClientConnectionStatus = useAppSelector(
     (state) => state.login.electrumClientConnectionStatus
@@ -526,7 +522,7 @@ const WalletsScreen = ({ navigation }) => {
       </Box>
       <KeeperModal
         dismissible={false}
-        close={() => { }}
+        close={() => {}}
         visible={recepitVerificationFailed}
         title="Failed to validate your subscription"
         subTitle="Do you want to downgrade to Pleb and continue?"
@@ -588,12 +584,11 @@ const styles = StyleSheet.create({
     justifyContent: 'flex-end',
   },
   titleWrapper: {
-    marginVertical: windowHeight > 680 ? hp(5) : 0,
     flexDirection: 'row',
     width: '100%',
-    alignSelf: 'center',
     alignItems: 'center',
-    marginTop: hp(20),
+    marginVertical: hp(20),
+    justifyContent: 'space-between',
   },
   titleText: {
     fontSize: 16,
@@ -676,7 +671,7 @@ const styles = StyleSheet.create({
   },
   netBalanceView: {
     width: '40%',
-    alignItems: 'center',
+    alignItems: 'flex-end',
   },
   AddNewWalletIllustrationWrapper: {
     flexDirection: 'row',

diff --git a/src/screens/HomeScreen/components/CurrencyInfo.tsx b/src/screens/HomeScreen/components/CurrencyInfo.tsx
@@ -24,16 +24,19 @@ function CurrencyInfo({
   const { getSatUnit, getBalance, getCurrencyIcon } = useBalance();
 
   return (
-    <HStack style={styles.vaultBalanceContainer} testID='view_currencyView'>
+    <HStack style={styles.vaultBalanceContainer} testID="view_currencyView">
       {getCurrencyIcon(BTC, variation)}
       {!hideAmounts ? (
         <Box style={styles.rowCenter}>
-          <Text color={color} style={{ fontSize }}>
+          <Text color={color} style={{ fontSize }} numberOfLines={1}>
             {` ${getBalance(amount)} ${getSatUnit()}`}
           </Text>
         </Box>
       ) : (
-        <Box style={[styles.rowCenter, styles.hiddenContainer, { height: fontSize + 1 }]} testID='view_hideCurrencyView'>
+        <Box
+          style={[styles.rowCenter, styles.hiddenContainer, { height: fontSize + 1 }]}
+          testID="view_hideCurrencyView"
+        >
           <Hidden style={{ color }} />
         </Box>
       )}