Merge pull request #2106 from bithyve/dev

Build 132 Live
bithyve · Feb 16, 2023 · 9c63a5d · 9c63a5d
2 parents e37f468 + 8f2687e
commit 9c63a5d
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 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 131
+        versionCode 132
         versionName "1.0.1"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'

diff --git a/ios/hexa_keeper.xcodeproj/project.pbxproj b/ios/hexa_keeper.xcodeproj/project.pbxproj
@@ -709,7 +709,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
-				CURRENT_PROJECT_VERSION = 131;
+				CURRENT_PROJECT_VERSION = 132;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = hexa_keeper/Info.plist;
@@ -740,7 +740,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper/hexa_keeper.entitlements;
-				CURRENT_PROJECT_VERSION = 131;
+				CURRENT_PROJECT_VERSION = 132;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				INFOPLIST_FILE = hexa_keeper/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
@@ -892,7 +892,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "dev-AppIcon";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
-				CURRENT_PROJECT_VERSION = 131;
+				CURRENT_PROJECT_VERSION = 132;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = "hexa_keeper_dev-Info.plist";
@@ -923,7 +923,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = "dev-AppIcon";
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = hexa_keeper_dev.entitlements;
-				CURRENT_PROJECT_VERSION = 131;
+				CURRENT_PROJECT_VERSION = 132;
 				DEVELOPMENT_TEAM = Y5TCB759QL;
 				INFOPLIST_FILE = "hexa_keeper_dev-Info.plist";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";

diff --git a/src/core/wallets/operations/index.ts b/src/core/wallets/operations/index.ts
@@ -62,15 +62,14 @@ export default class WalletOperations {
         false
       ).address;
     } else {
-      let xpub = null;
-      let purpose = null;
-      if (wallet.entityKind === EntityKind.VAULT) {
-        xpub = (wallet as Vault).specs.xpubs[0];
-        purpose = WalletUtilities.getPurpose((wallet as Vault).signers[0].derivationPath);
-      } else {
-        xpub = (wallet as Wallet).specs.xpub;
-        purpose = WalletUtilities.getPurpose((wallet as Wallet).derivationDetails.xDerivationPath);
-      }
+      const xpub =
+        wallet.entityKind === EntityKind.VAULT
+          ? (wallet as Vault).specs.xpubs[0]
+          : (wallet as Wallet).specs.xpub;
+      const purpose = EntityKind.VAULT
+        ? undefined
+        : WalletUtilities.getPurpose((wallet as Wallet).derivationDetails.xDerivationPath);
+
       receivingAddress = WalletUtilities.getAddressByIndex(
         xpub,
         false,

diff --git a/src/screens/Send/AddSendAmount.tsx b/src/screens/Send/AddSendAmount.tsx
@@ -1,6 +1,6 @@
 import Text from 'src/components/KeeperText';
 import { Box, Input, Pressable } from 'native-base';
-import { TextInput } from 'react-native';
+import { Alert, TextInput } from 'react-native';
 import React, { useEffect, useState } from 'react';
 import { calculateSendMaxFee, sendPhaseOne } from 'src/store/sagaActions/send_and_receive';
 import { hp, windowWidth, wp } from 'src/common/data/responsiveness/responsive';
@@ -108,17 +108,22 @@ function AddSendAmount({ route }) {
       sender,
       recipient,
       address,
-      amount: parseInt(amountToSend),
+      amount: parseInt(amountToSend, 10),
       transferType,
     });
   };
   const { showToast } = useToastMessage();
 
   const executeSendPhaseOne = () => {
     const recipients = [];
+    if (!amountToSend) {
+      showToast('Please enter a valid amount');
+      return;
+    }
+
     recipients.push({
       address,
-      amount: amount ? parseInt(amount) : 0,
+      amount: amountToSend, // should be denominated in sats
     });
     dispatch(
       sendPhaseOne({