From f1f40c3249a18f5dc1022d1041a6d8f885c7daab Mon Sep 17 00:00:00 2001
From: Aditya Kulkarni <adityapk@gmail.com>
Date: Wed, 8 Sep 2021 09:43:13 -0700
Subject: [PATCH] v1.7.5

---
 android/app/build.gradle                      | 4 ++--
 app/rpc.ts                                    | 3 ++-
 components/About.tsx                          | 2 +-
 components/InfoModal.tsx                      | 2 +-
 ios/ZecwalletMobile.xcodeproj/project.pbxproj | 8 ++++----
 package.json                                  | 2 +-
 rust/Cargo.lock                               | 2 +-
 rust/lib/Cargo.toml                           | 2 +-
 8 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index bc6ea1c01..2bbf7c8f9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -136,8 +136,8 @@ android {
         applicationId "com.zecwalletmobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 44
-        versionName "1.7.4"
+        versionCode 45
+        versionName "1.7.5"
 
         missingDimensionStrategy 'react-native-camera', 'general'
     }
diff --git a/app/rpc.ts b/app/rpc.ts
index 63d0742dd..ef655e1b9 100644
--- a/app/rpc.ts
+++ b/app/rpc.ts
@@ -389,6 +389,7 @@ export default class RPC {
   async fetchTandZTransactions() {
     const listStr = await RPCModule.execute('list', '');
     const listJSON = JSON.parse(listStr);
+    const serverHeight = this.serverHeight || 0;
 
     let txlist = listJSON.map((tx: any) => {
       const type = tx.outgoing_metadata ? 'sent' : 'receive';
@@ -420,7 +421,7 @@ export default class RPC {
         address:
           type === 'sent' ? (tx.outgoing_metadata.length > 0 ? tx.outgoing_metadata[0].address : '') : tx.address,
         amount: tx.amount / 10 ** 8,
-        confirmations: tx.unconfirmed ? 0 : this.serverHeight - tx.block_height + 1,
+        confirmations: tx.unconfirmed ? 0 : serverHeight - tx.block_height + 1,
         txid: tx.txid,
         zec_price: tx.zec_price,
         time: tx.datetime,
diff --git a/components/About.tsx b/components/About.tsx
index 6034f8af7..035ff3627 100644
--- a/components/About.tsx
+++ b/components/About.tsx
@@ -20,7 +20,7 @@ const AboutModal: React.FunctionComponent<AboutModalProps> = ({closeModal}) => {
       }}>
       <View>
         <View style={{alignItems: 'center', backgroundColor: colors.card, paddingBottom: 25, paddingTop: 25}}>
-          <Text style={{marginTop: 5, padding: 5, color: colors.text, fontSize: 28}}>Zecwallet Lite v1.7.4</Text>
+          <Text style={{marginTop: 5, padding: 5, color: colors.text, fontSize: 28}}>Zecwallet Lite v1.7.5</Text>
         </View>
         <View style={{display: 'flex', alignItems: 'center', marginTop: -25}}>
           <Image source={require('../assets/img/logobig.png')} style={{width: 50, height: 50, resizeMode: 'contain'}} />
diff --git a/components/InfoModal.tsx b/components/InfoModal.tsx
index 32a6ad079..a8c14ff0e 100644
--- a/components/InfoModal.tsx
+++ b/components/InfoModal.tsx
@@ -57,7 +57,7 @@ const InfoModal: React.FunctionComponent<InfoModalProps> = ({info, closeModal})
         </View>
 
         <View style={{display: 'flex', margin: 10}}>
-          <DetailLine label="Wallet Version" value="Zecwallet Lite v1.7.4" />
+          <DetailLine label="Wallet Version" value="Zecwallet Lite v1.7.5" />
           <DetailLine label="Server Version" value={info?.version} />
           <DetailLine label="Lightwallet Server URL" value={info?.serverUri} />
           <DetailLine label="Network" value={info?.testnet ? 'Testnet' : 'Mainnet'} />
diff --git a/ios/ZecwalletMobile.xcodeproj/project.pbxproj b/ios/ZecwalletMobile.xcodeproj/project.pbxproj
index e6d30a1d5..e27b36abf 100644
--- a/ios/ZecwalletMobile.xcodeproj/project.pbxproj
+++ b/ios/ZecwalletMobile.xcodeproj/project.pbxproj
@@ -503,7 +503,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 44;
+				CURRENT_PROJECT_VERSION = 45;
 				DEVELOPMENT_TEAM = 5N76B7JDDT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = ZecwalletMobile/Info.plist;
@@ -515,7 +515,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.7.4;
+				MARKETING_VERSION = 1.7.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -536,7 +536,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 44;
+				CURRENT_PROJECT_VERSION = 45;
 				DEVELOPMENT_TEAM = 5N76B7JDDT;
 				INFOPLIST_FILE = ZecwalletMobile/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -547,7 +547,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.7.4;
+				MARKETING_VERSION = 1.7.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/package.json b/package.json
index d8a5e3363..4c64251ac 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ZecwalletMobile",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 8feacfe0b..72a185104 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -2703,7 +2703,7 @@ dependencies = [
 [[package]]
 name = "zecwalletlitelib"
 version = "0.1.0"
-source = "git+https://github.com/adityapk00/zecwallet-light-cli?rev=4e355ae8bd34215c97d4183a9cab7b3af83e95e1#4e355ae8bd34215c97d4183a9cab7b3af83e95e1"
+source = "git+https://github.com/adityapk00/zecwallet-light-cli?rev=415196633f6cffa7d7fa0e4ae303353d30baba6a#415196633f6cffa7d7fa0e4ae303353d30baba6a"
 dependencies = [
  "arr_macro",
  "base58",
diff --git a/rust/lib/Cargo.toml b/rust/lib/Cargo.toml
index e7200ebae..41cc36ce0 100644
--- a/rust/lib/Cargo.toml
+++ b/rust/lib/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2018"
 
 [dependencies]
 jni = { version = "0.10.2", default-features = false }
-zecwalletlitelib = { git="https://github.com/adityapk00/zecwallet-light-cli", default-features=false, rev="4e355ae8bd34215c97d4183a9cab7b3af83e95e1" }
+zecwalletlitelib = { git="https://github.com/adityapk00/zecwallet-light-cli", default-features=false, rev="415196633f6cffa7d7fa0e4ae303353d30baba6a" }
 #zecwalletlitelib = { path = "../../../zecwallet-light-cli/lib", default-features=false }
 lazy_static = "1.4.0"
 android_logger = "0.8.6"