Release 0.1.9 to master (#823)

* attempt to fix and get info

* enable android app bundles

* update homepage url

* Update navigation deps to latest versions (#818)

* update deps

* update snapshots

* Bugfix: improve payment deposit

* Bugfix: onboarding android (#820)

* fix skip

* snaps

* rm

* min height

* release 0.1.9 (#822)

Author: Bruno Barbieri

.circleci/config.yml

@@ -132,7 +132,10 @@ jobs:
           name: build:pre-release
           command:
             |
-              npm run build:android:pre-release
+              npm run build:android:pre-release:bundle
+      - store_artifacts:
+          path: android/app/build/outputs/bundle/release
+          destination: bundle
       - store_artifacts:
           path: android/app/build/outputs/apk/release
           destination: builds

android/app/build.gradle

@@ -174,8 +174,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 9
-        versionName "0.1.8"
+        versionCode 10
+        versionName "0.1.9"
         multiDexEnabled true
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy "minReactNative", "minReactNative46"

app/components/Nav/App/__snapshots__/index.test.js.snap

@@ -12,6 +12,7 @@ exports[`App should render correctly 1`] = `
       "getChildNavigation": [Function],
       "getScreenProps": [Function],
       "goBack": [Function],
+      "isFirstRouteInParent": [Function],
       "isFocused": [Function],
       "navigate": [Function],
       "router": Object {
@@ -416,6 +417,7 @@ exports[`App should render correctly 1`] = `
         "getChildNavigation": [Function],
         "getScreenProps": [Function],
         "goBack": [Function],
+        "isFirstRouteInParent": [Function],
         "isFocused": [Function],
         "navigate": [Function],
         "router": Object {

app/components/Nav/Main/__snapshots__/index.test.js.snap

@@ -20,6 +20,7 @@ exports[`Main should render correctly 1`] = `
       "getChildNavigation": [Function],
       "getScreenProps": [Function],
       "goBack": [Function],
+      "isFirstRouteInParent": [Function],
       "isFocused": [Function],
       "navigate": [Function],
       "pop": [Function],
@@ -310,6 +311,7 @@ exports[`Main should render correctly 1`] = `
         "getChildNavigation": [Function],
         "getScreenProps": [Function],
         "goBack": [Function],
+        "isFirstRouteInParent": [Function],
         "isFocused": [Function],
         "navigate": [Function],
         "pop": [Function],

app/components/UI/OnboardingWizard/__snapshots__/index.test.js.snap

@@ -47,6 +47,7 @@ exports[`OnboardingWizard should render correctly 1`] = `
   style={
     Array [
       Object {
+        "backgroundColor": "transparent",
         "bottom": 0,
         "flex": 1,
         "left": 0,
@@ -55,9 +56,7 @@ exports[`OnboardingWizard should render correctly 1`] = `
         "right": 0,
         "top": 0,
       },
-      Object {
-        "backgroundColor": "transparent",
-      },
+      Object {},
     ]
   }
   supportedOrientations={

app/components/UI/OnboardingWizard/index.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { Platform, TouchableOpacity, View, StyleSheet, Text } from 'react-native';
+import { Platform, TouchableOpacity, View, StyleSheet, Text, Dimensions } from 'react-native';
 import { colors, fontStyles } from '../../../styles/common';
 import { connect } from 'react-redux';
 import Step1 from './Step1';
@@ -18,6 +18,7 @@ import ElevatedView from 'react-native-elevated-view';
 import Modal from 'react-native-modal';
 import DeviceSize from '../../../util/DeviceSize';
 
+const MIN_HEIGHT = Dimensions.get('window').height;
 const styles = StyleSheet.create({
 	root: {
 		top: 0,
@@ -26,7 +27,8 @@ const styles = StyleSheet.create({
 		right: 0,
 		flex: 1,
 		margin: 0,
-		position: 'absolute'
+		position: 'absolute',
+		backgroundColor: colors.transparent
 	},
 	main: {
 		flex: 1,
@@ -118,7 +120,7 @@ class OnboardingWizard extends Component {
 				backdropOpacity={0}
 				disableAnimation
 				transparent
-				style={[styles.root, { backgroundColor: colors.transparent }]}
+				style={[styles.root, Platform.OS === 'android' ? { minHeight: MIN_HEIGHT } : {}]}
 			>
 				<View style={styles.main}>{this.onboardingWizardNavigator(step)}</View>
 				{step !== 1 && (

app/components/Views/LockScreen/index.js

@@ -5,6 +5,7 @@ import LottieView from 'lottie-react-native';
 import Engine from '../../../core/Engine';
 import SecureKeychain from '../../../core/SecureKeychain';
 import { baseStyles } from '../../../styles/common';
+import Logger from '../../../util/Logger';
 
 const LOGO_SIZE = 175;
 const styles = StyleSheet.create({
@@ -57,6 +58,7 @@ export default class LockScreen extends Component {
 
 	appState = 'active';
 	locked = true;
+	timedOut = false;
 	firstAnimation = React.createRef();
 	secondAnimation = React.createRef();
 	animationName = React.createRef();
@@ -81,24 +83,52 @@ export default class LockScreen extends Component {
 			this.firstAnimation.play();
 			this.appState = nextAppState;
 			this.unlockKeychain();
+			this.timeoutWatcher();
 		}
 	};
 
+	timeoutWatcher() {
+		setTimeout(() => {
+			if (!this.state.ready) {
+				Logger.log('Lockscreen::timeout - state', this.state);
+				Logger.log('Lockscreen::timeout - appState', this.appState);
+				Logger.log('Lockscreen::timeout - locked', this.locked);
+				Logger.log('Lockscreen::timeout - errorUnlockingKeychain', this.errorUnlockingKeychain);
+				Logger.error('Lockscreen::timeout', `${this.timedOut ? 10 : 5} sec timeout`);
+				// Retry one more time
+				if (!this.timedOut) {
+					this.unlockKeychain();
+					this.timeoutWatcher();
+					this.timedOut = true;
+				}
+			}
+		}, 5000);
+	}
+
 	componentWillUnmount() {
 		this.mounted = false;
 		AppState.removeEventListener('change', this.handleAppStateChange);
 	}
 
 	async unlockKeychain() {
+		let credentials = null;
 		try {
 			// Retreive the credentials
-			const credentials = await SecureKeychain.getGenericPassword();
+			Logger.log('Lockscreen::unlockKeychain - getting credentials');
+			credentials = await SecureKeychain.getGenericPassword();
 			if (credentials) {
+				Logger.log('Lockscreen::unlockKeychain - got credentials', !!credentials.password);
+
 				// Restore vault with existing credentials
 				const { KeyringController } = Engine.context;
+				Logger.log('Lockscreen::unlockKeychain - submitting password');
+
 				await KeyringController.submitPassword(credentials.password);
+				Logger.log('Lockscreen::unlockKeychain - keyring unlocked');
+
 				this.locked = false;
 				this.setState({ ready: true }, () => {
+					Logger.log('Lockscreen::unlockKeychain - state: ready');
 					if (Platform.OS === 'android') {
 						setTimeout(() => {
 							this.secondAnimation.play(0, 25);
@@ -109,13 +139,14 @@ export default class LockScreen extends Component {
 					} else {
 						this.secondAnimation.play();
 						this.animationName.play();
+						Logger.log('Lockscreen::unlockKeychain - playing animations');
 					}
 				});
 			} else {
 				this.props.navigation.navigate('Login');
 			}
 		} catch (error) {
-			console.log(`Keychain couldn't be accessed`, error); // eslint-disable-line
+			Logger.error('Lockscreen:unlockKeychain', error);
 		}
 	}