From 987256db226359105620bb92028d2626b0728ac8 Mon Sep 17 00:00:00 2001
From: Aditya Kulkarni <adityapk@gmail.com>
Date: Tue, 30 Aug 2022 16:10:22 -0500
Subject: [PATCH] v1.8.7

Revert to rustc 1.56 to fix compiler caused crashes
---
 .gitignore                                    | 1 +
 android/app/build.gradle                      | 4 ++--
 components/About.tsx                          | 2 +-
 components/InfoModal.tsx                      | 2 +-
 ios/ZecwalletMobile.xcodeproj/project.pbxproj | 8 ++++----
 package.json                                  | 2 +-
 rust/android/rust-toolchain                   | 2 +-
 rust/ios/rust-toolchain                       | 2 +-
 rust/rust-toolchain                           | 2 +-
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d4b24cff..15aedc082 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 # OSX
 #
 .DS_Store
+/ZecwalletMobile*/
 
 # Xcode
 #
diff --git a/android/app/build.gradle b/android/app/build.gradle
index d75a9b511..7cee5e00e 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 65
-        versionName "1.8.6"
+        versionCode 66
+        versionName "1.8.7"
 
         missingDimensionStrategy 'react-native-camera', 'general'
     }
diff --git a/components/About.tsx b/components/About.tsx
index 17debfff4..83e8eda5f 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.8.6</Text>
+          <Text style={{marginTop: 5, padding: 5, color: colors.text, fontSize: 28}}>Zecwallet Lite v1.8.7</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 19673a6e0..50fa5ddc8 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.8.6" />
+          <DetailLine label="Wallet Version" value="Zecwallet Lite v1.8.7" />
           <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 c4a9af1e7..dc9401cf8 100644
--- a/ios/ZecwalletMobile.xcodeproj/project.pbxproj
+++ b/ios/ZecwalletMobile.xcodeproj/project.pbxproj
@@ -507,7 +507,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 65;
+				CURRENT_PROJECT_VERSION = 66;
 				DEVELOPMENT_TEAM = 5N76B7JDDT;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = ZecwalletMobile/Info.plist;
@@ -520,7 +520,7 @@
 					"$(PROJECT_DIR)",
 					"$(SDKROOT)/usr/lib/swift",
 				);
-				MARKETING_VERSION = 1.8.6;
+				MARKETING_VERSION = 1.8.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -541,7 +541,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 65;
+				CURRENT_PROJECT_VERSION = 66;
 				DEVELOPMENT_TEAM = 5N76B7JDDT;
 				INFOPLIST_FILE = ZecwalletMobile/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -553,7 +553,7 @@
 					"$(PROJECT_DIR)",
 					"$(SDKROOT)/usr/lib/swift",
 				);
-				MARKETING_VERSION = 1.8.6;
+				MARKETING_VERSION = 1.8.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/package.json b/package.json
index e65602bde..2ac6bf595 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ZecwalletMobile",
-  "version": "1.8.6",
+  "version": "1.8.7",
   "private": true,
   "scripts": {
     "android": "react-native run-android",
diff --git a/rust/android/rust-toolchain b/rust/android/rust-toolchain
index 0a03ace41..e01e6c121 100644
--- a/rust/android/rust-toolchain
+++ b/rust/android/rust-toolchain
@@ -1 +1 @@
-1.62
+1.56
diff --git a/rust/ios/rust-toolchain b/rust/ios/rust-toolchain
index 0a03ace41..e01e6c121 100644
--- a/rust/ios/rust-toolchain
+++ b/rust/ios/rust-toolchain
@@ -1 +1 @@
-1.62
+1.56
diff --git a/rust/rust-toolchain b/rust/rust-toolchain
index 0a03ace41..e01e6c121 100644
--- a/rust/rust-toolchain
+++ b/rust/rust-toolchain
@@ -1 +1 @@
-1.62
+1.56