From e17664bd278ca6d85cdef088c1c051724fcf6d29 Mon Sep 17 00:00:00 2001
From: Aditya Kulkarni <adityapk@gmail.com>
Date: Thu, 14 Oct 2021 10:32:59 -0700
Subject: [PATCH] v1.7.8

---
 android/app/build.gradle                      |  4 ++--
 components/About.tsx                          |  2 +-
 components/InfoModal.tsx                      |  2 +-
 components/ReceiveScreen.tsx                  | 13 ++++++-------
 ios/ZecwalletMobile.xcodeproj/project.pbxproj |  8 ++++----
 package.json                                  |  2 +-
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 50a49e3a2..a6cc774e7 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 47
-        versionName "1.7.7"
+        versionCode 48
+        versionName "1.7.8"
 
         missingDimensionStrategy 'react-native-camera', 'general'
     }
diff --git a/components/About.tsx b/components/About.tsx
index 0b89eb719..991a2c85c 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.7</Text>
+          <Text style={{marginTop: 5, padding: 5, color: colors.text, fontSize: 28}}>Zecwallet Lite v1.7.8</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 86cdbfd59..84b498171 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.7" />
+          <DetailLine label="Wallet Version" value="Zecwallet Lite v1.7.8" />
           <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/components/ReceiveScreen.tsx b/components/ReceiveScreen.tsx
index 74d4e7915..3f1a53f8d 100644
--- a/components/ReceiveScreen.tsx
+++ b/components/ReceiveScreen.tsx
@@ -293,15 +293,14 @@ const ReceiveScreen: React.FunctionComponent<ReceiveScreenProps> = ({
       return;
     }
 
-    let address = '';
-    if (addressList && addressList.length > 0) {
-      address = addressList[0];
+    if (addressList && typeof addressList === 'string' && addressList.length > 0) {
+      const address = JSON.parse(addressList)[0];
+      // Show the toast in settimeout, because it sometimes gets lost.
+      setTimeout(() => {
+        Toast.show(`Importing ${Utils.trimToSmall(address)}`, Toast.LONG);
+      }, 1000);
     }
 
-    // Show the toast in settimeout, because it sometimes gets lost.
-    setTimeout(() => {
-      Toast.show(`Importing ${Utils.trimToSmall(address)}`, Toast.LONG);
-    }, 1000);
     startRescan();
   };
 
diff --git a/ios/ZecwalletMobile.xcodeproj/project.pbxproj b/ios/ZecwalletMobile.xcodeproj/project.pbxproj
index 231c543f8..f3bff1949 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 = 47;
+				CURRENT_PROJECT_VERSION = 48;
 				DEVELOPMENT_TEAM = 5N76B7JDDT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = ZecwalletMobile/Info.plist;
@@ -515,7 +515,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.7.7;
+				MARKETING_VERSION = 1.7.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -536,7 +536,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 47;
+				CURRENT_PROJECT_VERSION = 48;
 				DEVELOPMENT_TEAM = 5N76B7JDDT;
 				INFOPLIST_FILE = ZecwalletMobile/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -547,7 +547,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 				);
-				MARKETING_VERSION = 1.7.7;
+				MARKETING_VERSION = 1.7.8;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/package.json b/package.json
index 26a05a0c6..e1c33fcd2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ZecwalletMobile",
-  "version": "1.7.7",
+  "version": "1.7.8",
   "private": true,
   "scripts": {
     "android": "react-native run-android",