Merge pull request #3300 from bithyve/dev

build v1.1.7(258)

android/app/build.gradle

@@ -85,8 +85,8 @@ android {
         applicationId "io.hexawallet.keeper"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 257
-        versionName "1.1.6"
+        versionCode 258
+        versionName "1.1.7"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'
         multiDexEnabled true

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 = 257;
+				CURRENT_PROJECT_VERSION = 258;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -891,7 +891,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 1.1.6;
+				MARKETING_VERSION = 1.1.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -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 = 257;
+				CURRENT_PROJECT_VERSION = 258;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1022,7 +1022,7 @@
 					"$(inherited)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 1.1.6;
+				MARKETING_VERSION = 1.1.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1176,7 +1176,7 @@
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 257;
+				CURRENT_PROJECT_VERSION = 258;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1285,7 +1285,7 @@
 					"$(PROJECT_DIR)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 1.1.6;
+				MARKETING_VERSION = 1.1.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1310,7 +1310,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Distribution";
-				CURRENT_PROJECT_VERSION = 257;
+				CURRENT_PROJECT_VERSION = 258;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1418,7 +1418,7 @@
 					"$(PROJECT_DIR)",
 					"\"$(SRCROOT)\"",
 				);
-				MARKETING_VERSION = 1.1.6;
+				MARKETING_VERSION = 1.1.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexa_keeper",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "private": true,
   "scripts": {
     "ios": "react-native run-ios",

src/components/AppNumPad/KeyPadView.tsx

@@ -36,7 +36,7 @@ const KeyPadView: React.FC<Props> = ({
       <KeyPadButton title="8" onPressNumber={() => onPressNumber('8')} keyColor={keyColor} />
       <KeyPadButton title="9" onPressNumber={() => onPressNumber('9')} keyColor={keyColor} />
     </Box>
-    <Box flexDirection="row" height={hp('8%')}>
+    <Box style={styles.keyWrapperView}>
       <Box style={styles.emptyBtnView}>
         <Text style={{ padding: 15 }} />
       </Box>

src/components/BounceLoader.tsx

@@ -0,0 +1,54 @@
+import React from 'react'
+import { StyleSheet, Animated } from 'react-native'
+import { Box } from 'native-base'
+
+const BounceLoader = () => {
+    let opacity = new Animated.Value(0);
+
+    Animated.loop(
+        Animated.spring(opacity, {
+            toValue: 2,
+            friction: 4,
+            tension: 25,
+            useNativeDriver: true
+        })
+    ).start();
+
+    const bounce = opacity.interpolate({
+        inputRange: [1, 2, 3],
+        outputRange: [1, 6, 2]
+    })
+    const bounce1 = opacity.interpolate({
+        inputRange: [1, 3, 4],
+        outputRange: [2, 7, 3]
+    })
+    const bounce2 = opacity.interpolate({
+        inputRange: [1, 4, 5],
+        outputRange: [2, 8, 4]
+    })
+    const bounce3 = opacity.interpolate({
+        inputRange: [1, 5, 6],
+        outputRange: [2, 9, 5]
+    })
+    return (
+        <Box style={styles.container}>
+            <Animated.View style={[styles.ball, { transform: [{ translateY: bounce }] }]} />
+            <Animated.View style={[styles.ball, { transform: [{ translateY: bounce1 }] }]} />
+            <Animated.View style={[styles.ball, { transform: [{ translateY: bounce2 }] }]} />
+            <Animated.View style={[styles.ball, { transform: [{ translateY: bounce3 }] }]} />
+        </Box>
+    )
+}
+const styles = StyleSheet.create({
+    container: {
+        flexDirection: 'row'
+    },
+    ball: {
+        width: 8,
+        height: 8,
+        borderRadius: 10,
+        backgroundColor: '#6B9B92',
+        marginHorizontal: 3
+    },
+})
+export default BounceLoader

src/navigation/themes.js

@@ -62,6 +62,7 @@ export const customTheme = extendTheme({
       modalWhiteButton: Colors.White,
       modalGreenLearnMore: Colors.CastelGreenDark,
       greenButtonBackground: Colors.ForestGreen,
+      qrBorderColor: Colors.LightYellow,
       coffeeBackground: Colors.Coffee,
       yellowButtonBackground: Colors.MacaroniAndCheese,
       yellowButtonTextColor: Colors.Coffee,
@@ -121,6 +122,7 @@ export const customTheme = extendTheme({
       modalWhiteButton: Colors.pantoneGreenDark,
       modalGreenLearnMore: Colors.LightYellowDark,
       greenButtonBackground: Colors.ForestGreenDark,
+      qrBorderColor: Colors.White,
       coffeeBackground: Colors.CoffeeDark,
       yellowButtonBackground: Colors.LightYellowDark,
       yellowButtonTextColor: Colors.White,

src/screens/HomeScreen/WalletsScreen.tsx

@@ -119,8 +119,8 @@ function WalletItem({
       onPress={() => {
         isCollaborativeWallet
           ? navigation.navigate('VaultDetails', {
-              collaborativeWalletId: item.collaborativeWalletId,
-            })
+            collaborativeWalletId: item.collaborativeWalletId,
+          })
           : navigation.navigate('WalletDetails', { walletId: item.id, walletIndex });
       }}
     >
@@ -214,6 +214,9 @@ function WalletTile({ wallet, balances, isWhirlpoolWallet, hideAmounts, isCollab
           )}
 
           <Box style={styles.walletDetailsWrapper}>
+            {wallet?.type === 'IMPORTED' ? <Text color={`${colorMode}.white`} style={styles.walletType}>
+              Imported wallet
+            </Text> : null}
             <Text color={`${colorMode}.white`} style={styles.walletName}>
               {wallet?.presentationData?.name}
             </Text>
@@ -498,7 +501,7 @@ const WalletsScreen = ({ navigation }) => {
               </Box>
               <Box style={styles.addNewWallTextWrapper}>
                 <Text color="light.secondaryText" style={styles.addNewWallText}>
-                  Add a new Wallet or Import one
+                  Add a new wallet, import it, or create a collaborative wallet.
                 </Text>
               </Box>
             </Box>
@@ -522,7 +525,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?"
@@ -627,6 +630,11 @@ const styles = StyleSheet.create({
     fontSize: 13,
   },
   walletName: {
+    letterSpacing: 0.2,
+    fontSize: 14,
+    fontWeight: '400',
+  },
+  walletType: {
     letterSpacing: 0.2,
     fontSize: 11,
     fontWeight: '400',
@@ -685,7 +693,7 @@ const styles = StyleSheet.create({
     alignItems: 'flex-start',
   },
   addNewWallTextWrapper: {
-    width: '30%',
+    width: '50%',
     justifyContent: 'center',
   },
   addNewWallText: {

src/screens/LoginScreen/Login.tsx

@@ -35,8 +35,9 @@ import { credsAuth } from 'src/store/sagaActions/login';
 import { credsAuthenticated, setRecepitVerificationError } from 'src/store/reducers/login';
 import KeyPadView from 'src/components/AppNumPad/KeyPadView';
 import FogotPassword from './components/FogotPassword';
-import { increasePinFailAttempts, resetPinFailAttempts } from 'src/store/reducers/storage';
+import { resetPinFailAttempts } from 'src/store/reducers/storage';
 import { LocalizationContext } from 'src/context/Localization/LocContext';
+import BounceLoader from 'src/components/BounceLoader';
 
 const TIMEOUT = 60;
 const RNBiometrics = new ReactNativeBiometrics();
@@ -301,12 +302,19 @@ function LoginScreen({ navigation, route }) {
           {modelMessage}
         </Text>
         {modelButtonText === null ? (
-          <Text
-            color={`${colorMode}.greenText`}
-            style={[styles.modalMessageText, { paddingTop: hp(20) }]}
-          >
-            This step will take a few seconds. You would be able to proceed soon
-          </Text>
+          <Box style={styles.modalMessageWrapper}>
+            <Box style={{ width: '80%' }}>
+              <Text
+                color={`${colorMode}.greenText`}
+                style={[styles.modalMessageText, { paddingTop: hp(20) }]}
+              >
+                This step will take a few seconds. You would be able to proceed soon
+              </Text>
+            </Box>
+            <Box style={{ width: '20%' }}>
+              <BounceLoader />
+            </Box>
+          </Box>
         ) : null}
       </Box>
     );
@@ -648,8 +656,13 @@ const styles = StyleSheet.create({
   modalMessageText: {
     fontSize: 13,
     letterSpacing: 0.65,
-    width: wp(275),
+    // width: wp(275),
   },
+  modalMessageWrapper: {
+    flexDirection: 'row',
+    width: '100%',
+    alignItems: 'center'
+  }
 });
 
 export default LoginScreen;

src/screens/NewKeeperAppScreen/NewKeeperAppScreen.tsx

@@ -20,6 +20,7 @@ import LoadingAnimation from 'src/components/Loader';
 import { updateFCMTokens } from 'src/store/sagaActions/notifications';
 import Fonts from 'src/constants/Fonts';
 import { KEEPER_WEBSITE_BASE_URL } from 'src/core/config';
+import BounceLoader from 'src/components/BounceLoader';
 
 export function Tile({ title, subTitle, onPress, Icon = null, loading = false }) {
   const { colorMode } = useColorMode();
@@ -142,13 +143,20 @@ function NewKeeperApp({ navigation }: { navigation }) {
         <Box style={{ width: windowWidth * 0.7, marginBottom: hp(20) }}>
           <LoadingAnimation />
         </Box>
-        <Text color="light.greenText" fontSize={13} letterSpacing={0.65}>
+        <Text color={`${colorMode}.greenText`} style={styles.contentText}>
           {getSignUpModalContent().message}
         </Text>
         {!appCreated ? (
-          <Text color="light.greenText" fontSize={13} letterSpacing={0.65} pt={5}>
-            This step will take a few seconds. You would be able to proceed soon
-          </Text>
+          <Box style={styles.modalMessageWrapper}>
+            <Box style={{ width: '80%' }}>
+              <Text color={`${colorMode}.greenText`} style={styles.modalMessageText}>
+                This step will take a few seconds. You would be able to proceed soon
+              </Text>
+            </Box>
+            <Box style={{ width: '20%' }}>
+              <BounceLoader />
+            </Box>
+          </Box>
         ) : null}
       </Box>
     );
@@ -318,6 +326,20 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     flexWrap: 'wrap',
   },
+  modalMessageWrapper: {
+    flexDirection: 'row',
+    width: '100%',
+    alignItems: 'center'
+  },
+  modalMessageText: {
+    fontSize: 13,
+    letterSpacing: 0.65,
+    paddingTop: 5
+  },
+  contentText: {
+    fontSize: 13,
+    letterSpacing: 0.65,
+  }
 });
 
 export default NewKeeperApp;

src/screens/Recieve/ReceiveScreen.tsx

@@ -109,7 +109,7 @@ function ReceiveScreen({ route }: { route }) {
   return (
     <ScreenWrapper backgroundcolor={`${colorMode}.primaryBackground`}>
       <KeeperHeader title={common.receive} subtitle="Native segwit address" />
-      <Box style={styles.qrWrapper}>
+      <Box style={styles.qrWrapper} borderColor={`${colorMode}.qrBorderColor`}>
         <QRCode
           value={paymentURI || receivingAddress || 'address'}
           logoBackgroundColor="transparent"
@@ -183,10 +183,11 @@ const styles = StyleSheet.create({
     marginLeft: 30,
   },
   qrWrapper: {
-    marginTop: hp(50),
+    marginTop: hp(35),
     alignItems: 'center',
     alignSelf: 'center',
-    width: hp(200),
+    width: hp(250),
+    borderWidth: 30,
   },
   receiveAddressWrapper: {
     height: 28,
@@ -211,6 +212,8 @@ const styles = StyleSheet.create({
     width: '100%',
     alignItems: 'center',
     justifyContent: 'space-between',
+    borderBottomLeftRadius: 10,
+    borderTopLeftRadius: 10,
   },
   copyIconWrapper: {
     padding: 10,

src/screens/Recovery/EnterSeedScreen.tsx

@@ -228,11 +228,10 @@ function EnterSeedScreen({ route }) {
   };
 
   const onPressNextSeedReocvery = async () => {
-    if (true) {
-      if (true) {
-        const seedWord = 'orbit human gun end sock lava rare owner analyst warm pupil moral';
+    if (isSeedFilled(6)) {
+      if (isSeedFilled(12)) {
+        const seedWord = getSeedWord();
         setRecoveryLoading(true);
-
         dispatch(getAppImage(seedWord));
       } else {
         ref.current.scrollToIndex({ index: 5, animated: true });