Merge pull request #1599 from bithyve/dev1

Release 0.0.96(95)
bithyve · Dec 21, 2022 · 0be6019 · 0be6019
2 parents 4b121e0 + e5cd577
commit 0be6019
Show file tree

Hide file tree

Showing 11 changed files with 277 additions and 260 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -147,7 +147,7 @@ android {
         applicationId "io.hexawallet.keeper"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 94
+        versionCode 95
         versionName "0.0.96"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'

diff --git a/ios/hexa_keeper.xcodeproj/project.pbxproj b/ios/hexa_keeper.xcodeproj/project.pbxproj
diff --git a/src/common/content/language/en.json b/src/common/content/language/en.json
@@ -469,9 +469,9 @@
     "skipHealthCheckPara01": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
     "skipHealthCheckPara02": "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris",
     "myWalletBackupTitle": "My Wallet Backup",
-    "SEED_BACKUP_CREATED": "Seed backup created",
-    "SEED_BACKUP_CONFIRMED": "Seed backup confirmed",
-    "SEED_BACKUP_CONFIRMATION_SKIPPED": "Seed health confirmation skipped",
+    "SEED_BACKUP_CREATED": "Recovery Phrase backup is created",
+    "SEED_BACKUP_CONFIRMED": "Recovery Phrase backup is confirmed",
+    "SEED_BACKUP_CONFIRMATION_SKIPPED": "Recovery Phrase health confirmation is skipped",
     "CLOUD_BACKUP_CREATED": "Cloud backup created",
     "CLOUD_BACKUP_FAILED": "Cloud backup failed",
     "CLOUD_BACKUP_CONFIRMATION_SKIPPED": "Cloud backup confirmation skipped",
@@ -511,4 +511,4 @@
     "12502": "We recommend signing in as it easily allows you to backup your wallet on your personal drive.",
     "default": "We encountered a non-standard error. Please try again after sometime or contact us"
   }
-}
+}
diff --git a/src/common/content/language/es.json b/src/common/content/language/es.json
@@ -468,9 +468,9 @@
     "skipHealthCheckPara01": "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.",
     "skipHealthCheckPara02": "Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris",
     "myWalletBackupTitle": "My Wallet Backup",
-    "SEED_BACKUP_CREATED": "Seed backup created",
-    "SEED_BACKUP_CONFIRMED": "Seed backup confirmed",
-    "SEED_BACKUP_CONFIRMATION_SKIPPED": "Seed health confirmation skipped",
+    "SEED_BACKUP_CREATED": "Recovery Phrase backup is created",
+    "SEED_BACKUP_CONFIRMED": "Recovery Phrase backup is confirmed",
+    "SEED_BACKUP_CONFIRMATION_SKIPPED": "Recovery Phrase health confirmation is skipped",
     "CLOUD_BACKUP_CREATED": "Cloud backup created",
     "CLOUD_BACKUP_FAILED": "Cloud backup failed",
     "CLOUD_BACKUP_CONFIRMATION_SKIPPED": "Cloud backup confirmation skipped",
@@ -510,4 +510,4 @@
     "12502": "We recommend signing in as it easily allows you to backup your wallet on your personal drive.",
     "default": "We encountered a non-standard error. Please try again after sometime or contact us"
   }
-}
+}
diff --git a/src/screens/AppSettings/AppSettings.tsx b/src/screens/AppSettings/AppSettings.tsx
@@ -1,7 +1,6 @@
-import React, { useContext, useEffect, useState, useCallback } from 'react';
-import { Alert, NativeModules, StyleSheet } from 'react-native';
+import React, { useContext, useEffect, useState, useCallback, useMemo } from 'react';
+import { Alert, StyleSheet } from 'react-native';
 import { Box, Pressable, ScrollView, Text, useColorMode } from 'native-base';
-import { getCloudBackupData, uploadData } from 'src/nativemodules/Cloud';
 import { hp, wp } from 'src/common/data/responsiveness/responsive';
 import BackupIcon from 'src/assets/images/svgs/backup.svg';
 import Twitter from 'src/assets/images/svgs/Twitter.svg';
@@ -19,28 +18,36 @@ import SettingsSwitchCard from 'src/components/SettingComponent/SettingsSwitchCa
 import openLink from 'src/utils/OpenLink';
 import RestClient, { TorStatus } from 'src/core/services/rest/RestClient';
 import { setTorEnabled } from 'src/store/reducers/settings';
+import { RealmSchema } from 'src/storage/realm/enum';
+import { RealmWrapperContext } from 'src/storage/realm/RealmProvider';
+import { BackupHistory } from 'src/common/data/enums/BHR';
 import { changeLoginMethod } from '../../store/sagaActions/login';
 import TorModalMap from './TorModalMap';
 import { useAppDispatch, useAppSelector } from '../../store/hooks';
 
 const RNBiometrics = new ReactNativeBiometrics();
-const { GoogleDrive } = NativeModules;
 
 function AppSettings({ navigation }) {
   const { colorMode } = useColorMode();
   const [darkMode, setDarkMode] = useState(false);
   const { appId } = useAppSelector((state) => state.storage);
   const { backupMethod } = useAppSelector((state) => state.bhr);
+  const { useQuery } = useContext(RealmWrapperContext);
+  const data: BackupHistory = useQuery(RealmSchema.BackupHistory);
 
   const { loginMethod }: { loginMethod: LoginMethod } = useAppSelector((state) => state.settings);
   const dispatch = useAppDispatch();
   const [sensorType, setSensorType] = useState('Biometrics');
   const { translations, formatString } = useContext(LocalizationContext);
   const { common } = translations;
   const { settings } = translations;
+  const backupWalletStrings = translations.BackupWallet;
+
   const [showTorModal, setShowTorModal] = useState(false);
   const [torStatus, settorStatus] = useState<TorStatus>(RestClient.getTorStatus());
 
+  const backupHistory = useMemo(() => data.sorted('date', true), [data]);
+
   const onChangeTorStatus = (status: TorStatus, message) => {
     settorStatus(status);
   };
@@ -113,26 +120,6 @@ function AppSettings({ navigation }) {
     setDarkMode(!darkMode);
   };
 
-  const backup = async () => {
-    try {
-      const res = await uploadData(appId, {
-        encData: 'vavadv',
-      });
-      console.log('RESSS', res);
-    } catch (error) {
-      console.log(error);
-    }
-  };
-
-  const doanload = async () => {
-    try {
-      const res = await getCloudBackupData();
-      console.log('CLOUD DATA', JSON.stringify(res));
-    } catch (error) {
-      console.log(error);
-    }
-  };
-
   function Option({ title, subTitle, onPress, Icon }) {
     return (
       <Pressable
@@ -203,7 +190,11 @@ function AppSettings({ navigation }) {
         >
           <Option
             title="App Backup"
-            subTitle="Recovery Phrases health check is due"
+            subTitle={
+              backupMethod === null
+                ? 'Recovery Phrases health check is due'
+                : backupWalletStrings[backupHistory[0].title]
+            }
             onPress={() => {
               navigation.navigate('BackupWallet');
             }}

diff --git a/src/screens/ExportSeedScreen/ExportSeedScreen.tsx b/src/screens/ExportSeedScreen/ExportSeedScreen.tsx
@@ -30,9 +30,6 @@ function ExportSeedScreen({ route, navigation }) {
   const { backupMethod } = useAppSelector((state) => state.bhr);
   const seedText = translations.seed;
 
-  console.log('showWordIndex', showWordIndex, typeof showWordIndex);
-
-  console.log('showWordIndex', showWordIndex, typeof showWordIndex);
 
   useEffect(() => {
     if (backupMethod !== null) {

diff --git a/src/screens/Send/AddSendAmount.tsx b/src/screens/Send/AddSendAmount.tsx
@@ -2,7 +2,7 @@ import { Box, Input, Pressable, Text } from 'native-base';
 import { Keyboard, TextInput } from 'react-native';
 import React, { useEffect, useState } from 'react';
 import { calculateSendMaxFee, sendPhaseOne } from 'src/store/sagaActions/send_and_receive';
-import { hp, windowHeight, windowWidth, wp } from 'src/common/data/responsiveness/responsive';
+import { hp, windowWidth, wp } from 'src/common/data/responsiveness/responsive';
 
 import AppNumPad from 'src/components/AppNumPad';
 import Buttons from 'src/components/Buttons';
@@ -19,9 +19,9 @@ import { useAppSelector } from 'src/store/hooks';
 import { useDispatch } from 'react-redux';
 import { useNavigation } from '@react-navigation/native';
 import useToastMessage from 'src/hooks/useToastMessage';
-import WalletDetails from './WalletDetails';
 import { TransferType } from 'src/common/data/enums/TransferType';
 import { Vault } from 'src/core/wallets/interfaces/vault';
+import WalletDetails from './WalletDetails';
 
 function AddSendAmount({ route }) {
   const navigation = useNavigation();
@@ -94,14 +94,13 @@ function AddSendAmount({ route }) {
     },
     []
   );
-  console.log(windowHeight);
   return (
     <ScreenWrapper>
       <HeaderTitle
         title={
           transferType == TransferType.WALLET_TO_WALLET ? `Sending to Wallet` : `Enter the amount`
         }
-        // subtitle={`Sending to ${address}`}
+      // subtitle={`Sending to ${address}`}
       />
       <Box
         style={{
@@ -120,78 +119,83 @@ function AddSendAmount({ route }) {
           marginVertical: hp(10),
         }}
       ></Box>
-      <Box marginX={3}>
-        <Box backgroundColor="light.lightYellow" style={styles.inputWrapper}>
-          <Box flexDirection="row" alignItems="center">
-            <Box marginRight={2}>
-              <BitcoinInput />
+      <Box
+        style={{
+          flex: 1,
+          justifyContent: 'space-between'
+        }}
+      >
+        <Box marginX={3}>
+          <Box backgroundColor="light.lightYellow" style={styles.inputWrapper}>
+            <Box flexDirection="row" alignItems="center">
+              <Box marginRight={2}>
+                <BitcoinInput />
+              </Box>
+              <Box
+                marginLeft={2}
+                width={0.5}
+                backgroundColor="light.borderSaperator"
+                opacity={0.3}
+                height={7}
+              />
+              <Input
+                placeholder="Enter Amount (sats)"
+                placeholderTextColor="light.greenText"
+                color="light.greenText"
+                opacity={0.5}
+                width="70%"
+                fontSize={RFValue(12)}
+                letterSpacing={1.04}
+                fontWeight={300}
+                borderWidth="0"
+                value={amount}
+                onChangeText={(value) => setAmount(value)}
+                onFocus={() => Keyboard.dismiss()}
+              />
             </Box>
-            <Box
-              marginLeft={2}
-              width={0.5}
-              backgroundColor="light.borderSaperator"
-              opacity={0.3}
-              height={7}
-            />
-            <Input
-              placeholder="Enter Amount (sats)"
-              placeholderTextColor="light.greenText"
-              color="light.greenText"
-              opacity={0.5}
-              width="70%"
-              fontSize={RFValue(12)}
-              letterSpacing={1.04}
-              fontWeight={300}
-              borderWidth="0"
-              value={amount}
-              onChangeText={(value) => setAmount(value)}
-              onFocus={() => Keyboard.dismiss()}
-            />
+            <Pressable
+              onPress={() => {
+                const confirmBalance = sender.specs.balances.confirmed;
+                if (confirmBalance)
+                  dispatch(
+                    calculateSendMaxFee({ numberOfRecipients: recipientCount, wallet: sender })
+                  );
+              }}
+              style={styles.sendMaxWrapper}
+            >
+              <Text color="light.sendMax" style={styles.sendMaxText}>
+                Send Max
+              </Text>
+            </Pressable>
           </Box>
-          <Pressable
-            onPress={() => {
-              const confirmBalance = sender.specs.balances.confirmed;
-              if (confirmBalance)
-                dispatch(
-                  calculateSendMaxFee({ numberOfRecipients: recipientCount, wallet: sender })
-                );
-            }}
-            style={styles.sendMaxWrapper}
-          >
-            <Text color="light.sendMax" style={styles.sendMaxText}>
-              Send Max
-            </Text>
-          </Pressable>
-        </Box>
 
-        <Box style={styles.addNoteWrapper}>
-          <TextInput placeholder="Add a note" style={styles.textInput} />
-        </Box>
-        <Box style={styles.ctaBtnWrapper}>
-          <Box ml={windowWidth * -0.09}>
-            <Buttons
-              secondaryText="Cancel"
-              secondaryCallback={() => {
-                navigation.goBack();
-              }}
-              primaryText="Send"
-              primaryDisable={Boolean(!amount)}
-              primaryCallback={executeSendPhaseOne}
-            />
+          <Box style={styles.addNoteWrapper}>
+            <TextInput placeholder="Add a note" style={styles.textInput} />
+          </Box>
+          <Box style={styles.ctaBtnWrapper}>
+            <Box ml={windowWidth * -0.09}>
+              <Buttons
+                secondaryText="Cancel"
+                secondaryCallback={() => {
+                  navigation.goBack();
+                }}
+                primaryText="Send"
+                primaryDisable={Boolean(!amount)}
+                primaryCallback={executeSendPhaseOne}
+              />
+            </Box>
           </Box>
         </Box>
+        <Box style={styles.appNumPadWrapper}>
+          <AppNumPad
+            setValue={setAmount}
+            clear={() => setAmount('')}
+            color="#073E39"
+            height={65}
+            darkDeleteIcon={true}
+          />
+        </Box>
       </Box>
-      {/* {!isKeyboardVisible && ( */}
-      <Box style={styles.appNumPadWrapper}>
-        <AppNumPad
-          setValue={setAmount}
-          clear={() => setAmount('')}
-          color="#073E39"
-          height={windowHeight > 670 ? 85 : 65}
-          darkDeleteIcon={true}
-        />
-      </Box>
-      {/* )} */}
     </ScreenWrapper>
   );
 }
@@ -250,11 +254,8 @@ const styles = ScaledSheet.create({
     justifyContent: 'flex-end',
   },
   appNumPadWrapper: {
-    justifyContent: 'center',
-    alignItems: 'center',
-    width: windowWidth,
-    position: 'absolute',
-    bottom: 0,
+    width: '110%',
+    marginLeft: '-5%'
   },
 });
 export default AddSendAmount;
diff --git a/src/screens/SignTransaction/SignerList.tsx b/src/screens/SignTransaction/SignerList.tsx
@@ -49,6 +49,7 @@ function SignerList({
                 fontWeight={200}
                 fontFamily="heading"
                 letterSpacing={1.12}
+                maxWidth={width * 0.6}
               >
                 {`${signer.signerName} (${signer.xpubInfo.xfp})`}
               </Text>