Merge pull request #496 from Bit-Nation/release/1.2.0

Release/1.2.0 Former-commit-id: e44ef35 [formerly f2762a0] Former-commit-id: fffd634
Bit-Nation · Sep 3, 2018 · d70b091 · d70b091
2 parents 29e7ab0 + d21d679
commit d70b091
Show file tree

Hide file tree

Showing 27 changed files with 1,482 additions and 1,559 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -103,8 +103,8 @@ android {
         applicationId 'co.bitnation'
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 14
-        versionName "1.1.1"
+        versionCode 15
+        versionName "1.2.0"
         ndk {
             abiFilters "armeabi-v7a", "x86"
         }

diff --git a/android/app/src/main/assets/index.android.bundle b/android/app/src/main/assets/index.android.bundle
diff --git a/android/app/src/main/assets/index.android.bundle.meta b/android/app/src/main/assets/index.android.bundle.meta
@@ -1 +1 @@
-<θ��~Qd�$☧�!��'
+�A�m���y�֣蒟p�
diff --git a/android/app/src/main/res/drawable-mdpi/src_assets_images_bitnationlogo.png b/android/app/src/main/res/drawable-mdpi/src_assets_images_bitnationlogo.png
diff --git a/android/app/src/main/res/drawable-mdpi/src_assets_images_bitnationlogobig.png b/android/app/src/main/res/drawable-mdpi/src_assets_images_bitnationlogobig.png
diff --git a/android/app/src/main/res/drawable-mdpi/src_assets_images_chat_indicator.png b/android/app/src/main/res/drawable-mdpi/src_assets_images_chat_indicator.png
diff --git a/android/app/src/main/res/drawable-mdpi/src_assets_images_closeicon.png b/android/app/src/main/res/drawable-mdpi/src_assets_images_closeicon.png
diff --git a/android/app/src/main/res/drawable-mdpi/src_assets_images_disclosure.png b/android/app/src/main/res/drawable-mdpi/src_assets_images_disclosure.png
diff --git a/android/app/src/main/res/drawable-mdpi/src_assets_images_ethereumlogo.png b/android/app/src/main/res/drawable-mdpi/src_assets_images_ethereumlogo.png
diff --git a/android/app/src/main/res/drawable-mdpi/src_assets_images_moreicon.png b/android/app/src/main/res/drawable-mdpi/src_assets_images_moreicon.png
diff --git a/android/app/src/main/res/drawable-mdpi/src_assets_images_xpatlogo.png b/android/app/src/main/res/drawable-mdpi/src_assets_images_xpatlogo.png
diff --git a/android/app/src/main/res/drawable-xhdpi/src_assets_images_chat_indicator.png b/android/app/src/main/res/drawable-xhdpi/src_assets_images_chat_indicator.png
diff --git a/android/app/src/main/res/drawable-xhdpi/src_assets_images_closeicon.png b/android/app/src/main/res/drawable-xhdpi/src_assets_images_closeicon.png
diff --git a/android/app/src/main/res/drawable-xhdpi/src_assets_images_disclosure.png b/android/app/src/main/res/drawable-xhdpi/src_assets_images_disclosure.png
diff --git a/android/app/src/main/res/drawable-xhdpi/src_assets_images_ethereumlogo.png b/android/app/src/main/res/drawable-xhdpi/src_assets_images_ethereumlogo.png
diff --git a/android/app/src/main/res/drawable-xhdpi/src_assets_images_moreicon.png b/android/app/src/main/res/drawable-xhdpi/src_assets_images_moreicon.png
diff --git a/android/app/src/main/res/drawable-xhdpi/src_assets_images_xpatlogo.png b/android/app/src/main/res/drawable-xhdpi/src_assets_images_xpatlogo.png
diff --git a/android/app/src/main/res/drawable-xxhdpi/src_assets_images_chat_indicator.png b/android/app/src/main/res/drawable-xxhdpi/src_assets_images_chat_indicator.png
diff --git a/android/app/src/main/res/drawable-xxhdpi/src_assets_images_closeicon.png b/android/app/src/main/res/drawable-xxhdpi/src_assets_images_closeicon.png
diff --git a/android/app/src/main/res/drawable-xxhdpi/src_assets_images_disclosure.png b/android/app/src/main/res/drawable-xxhdpi/src_assets_images_disclosure.png
diff --git a/android/app/src/main/res/drawable-xxhdpi/src_assets_images_ethereumlogo.png b/android/app/src/main/res/drawable-xxhdpi/src_assets_images_ethereumlogo.png
diff --git a/android/app/src/main/res/drawable-xxhdpi/src_assets_images_moreicon.png b/android/app/src/main/res/drawable-xxhdpi/src_assets_images_moreicon.png
diff --git a/android/app/src/main/res/drawable-xxhdpi/src_assets_images_xpatlogo.png b/android/app/src/main/res/drawable-xxhdpi/src_assets_images_xpatlogo.png
diff --git a/ios/Pangea/Info.plist b/ios/Pangea/Info.plist
@@ -21,11 +21,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.2.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>15</string>
+	<string>16</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Pangea",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "private": true,
   "scripts": {
     "start": "node node_modules/react-native/local-cli/cli.js start",

diff --git a/src/screens/Passcode/EnterPasscodeContainer.js b/src/screens/Passcode/EnterPasscodeContainer.js
@@ -107,7 +107,7 @@ class EnterPasscodeContainer extends NavigatorComponent<Props & Actions & Settin
     const {
       navigator, passcodeType, title, onCancel, isLoggedIn,
     } = this.props;
-    const shouldShowForget = !(isLoggedIn === false) && this.props.accountId != null;
+    const shouldShowForget = isLoggedIn === false;
     if (passcodeType.type === 'pinCode') {
       return (<PinCodeScreen
         navigator={navigator}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<θ��~Qd�$☧�!��'
		�A�m��y�֣蒟p�