From 9617ab7753332769556b683c822807a2ea6bed78 Mon Sep 17 00:00:00 2001
From: Thibaut <thibaut.sardan@gmail.com>
Date: Tue, 26 Feb 2019 15:58:02 +0100
Subject: [PATCH 1/7] fix(): account menu

---
 ios/NativeSigner.xcodeproj/project.pbxproj |  1 -
 package-lock.json                          | 13 ++--
 package.json                               |  1 +
 src/App.js                                 | 10 ++-
 src/screens/AccountList.js                 | 80 ++++++++++++++++++----
 5 files changed, 79 insertions(+), 26 deletions(-)

diff --git a/ios/NativeSigner.xcodeproj/project.pbxproj b/ios/NativeSigner.xcodeproj/project.pbxproj
index a39c0a312e..de4904455b 100644
--- a/ios/NativeSigner.xcodeproj/project.pbxproj
+++ b/ios/NativeSigner.xcodeproj/project.pbxproj
@@ -5,7 +5,6 @@
 	};
 	objectVersion = 46;
 	objects = {
-
 /* Begin PBXBuildFile section */
 		00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; };
 		00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
diff --git a/package-lock.json b/package-lock.json
index 0b6b3bacce..5edf198f42 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12970,6 +12970,11 @@
         "react-native-fit-image": "^1.5.2"
       }
     },
+    "react-native-popup-menu": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/react-native-popup-menu/-/react-native-popup-menu-0.15.0.tgz",
+      "integrity": "sha512-iJIzVNq46oCxKQVFw+4ceNwYDfbvbtn8nchSOluVB3NlPZKLCOZ+0u1KzA0fyxPtQdLf2yFbbVPi/A8XbP0eOg=="
+    },
     "react-native-qrcode": {
       "version": "0.2.7",
       "resolved": "https://registry.npmjs.org/react-native-qrcode/-/react-native-qrcode-0.2.7.tgz",
@@ -13093,11 +13098,6 @@
             "ansi-regex": "^3.0.0"
           }
         },
-        "strip-bom": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-          "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
-        },
         "yargs": {
           "version": "8.0.2",
           "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz",
@@ -14973,8 +14973,7 @@
     "strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
-      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
-      "dev": true
+      "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM="
     },
     "strip-eof": {
       "version": "1.0.0",
diff --git a/package.json b/package.json
index 15fa11bee0..4ebf2ae18f 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
     "react-native-camera": "^1.9.0",
     "react-native-keyboard-aware-scroll-view": "^0.5.0",
     "react-native-markdown-renderer": "^3.2.8",
+    "react-native-popup-menu": "^0.15.0",
     "react-native-qrcode": "^0.2.7",
     "react-native-secure-storage": "https://github.com/debris/react-native-secure-storage",
     "react-native-simple-picker": "^2.1.0",
diff --git a/src/App.js b/src/App.js
index 93cb8a240e..9b30dda081 100644
--- a/src/App.js
+++ b/src/App.js
@@ -25,6 +25,8 @@ import {
   withNavigation
 } from 'react-navigation';
 import { Provider as UnstatedProvider } from 'unstated';
+import { MenuProvider } from 'react-native-popup-menu';
+
 import '../ReactotronConfig';
 import colors from './colors';
 import Background from './components/Background';
@@ -55,9 +57,11 @@ export default class App extends Component {
   render() {
     return (
       <UnstatedProvider>
-        <StatusBar barStyle="light-content" />
-        <Background />
-        <Screens />
+        <MenuProvider backHandler={true}>
+          <StatusBar barStyle="light-content" />
+          <Background />
+          <Screens />
+        </MenuProvider>
       </UnstatedProvider>
     );
   }
diff --git a/src/screens/AccountList.js b/src/screens/AccountList.js
index 99fd4a846a..bd720a82a6 100644
--- a/src/screens/AccountList.js
+++ b/src/screens/AccountList.js
@@ -20,6 +20,14 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { FlatList, StyleSheet, Text, View } from 'react-native';
 import { Subscribe } from 'unstated';
+import {
+  Menu,
+  MenuOptions,
+  MenuOption,
+  MenuTrigger,
+} from 'react-native-popup-menu';
+import Icon from 'react-native-vector-icons/MaterialIcons';
+
 import colors from '../colors';
 import AccountCard from '../components/AccountCard';
 import Background from '../components/Background';
@@ -31,6 +39,7 @@ export default class AccountList extends React.PureComponent {
   static navigationOptions = {
     title: 'Accounts'
   };
+
   render() {
     return (
       <Subscribe to={[AccountsStore]}>
@@ -86,11 +95,33 @@ class AccountListView extends React.PureComponent {
     this.scrollToIndex();
   }
 
+  AccountMenu = () => {
+    const addIcon = <Icon name="add" size={35} color={colors.bg_text_sec} />
+
+    return (
+      <View style={styles.menuView}>
+        <Menu
+          onSelect={value => this.props.navigation.navigate(value)}
+        >
+          <MenuTrigger children={addIcon} />
+          <MenuOptions customStyles={menuOptionsStyles}>
+            <MenuOption value={'AccountNew'} text='New Account' />
+            <MenuOption value={'AccountRecover'} text='Recover Account' />
+            <MenuOption value={'About'} text='About' />
+          </MenuOptions>
+        </Menu>
+      </View>
+    )
+  };
+
   render() {
     return (
       <View style={styles.body}>
         <Background />
-        <Text style={styles.title}>ACCOUNTS</Text>
+        <View style={styles.header}>
+          <Text style={styles.title}>ACCOUNTS</Text>
+          {this.AccountMenu()}
+        </View>
         <FlatList
           ref={list => {
             this.list = list;
@@ -115,11 +146,6 @@ class AccountListView extends React.PureComponent {
           enableEmptySections
         />
         <View style={styles.bottom}>
-          <Button
-            buttonStyles={{ height: 60 }}
-            title="Add Account"
-            onPress={() => this.props.navigation.navigate('AccountAdd')}
-          />
           <Button
             buttonStyles={{ height: 60, marginTop: 20 }}
             title="Scan"
@@ -132,24 +158,27 @@ class AccountListView extends React.PureComponent {
 }
 
 const styles = StyleSheet.create({
-  title: {
-    color: colors.bg_text_sec,
-    fontSize: 18,
-    fontFamily: 'Manifold CF',
-    fontWeight: 'bold',
-    paddingBottom: 20
-  },
   body: {
     backgroundColor: colors.bg,
     flex: 1,
     flexDirection: 'column',
     padding: 20
   },
+  bottom: {
+    marginTop: 20,
+  },
   content: {
     flex: 1
   },
-  bottom: {
-    marginTop: 20,
+  header: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingBottom: 20,
+    justifyContent: 'center',
+  },
+  menuView: {
+    flex: 1,
+    alignItems: 'flex-end',
   },
   introContainer: {
     padding: 30,
@@ -161,5 +190,26 @@ const styles = StyleSheet.create({
     textAlign: 'center',
     fontSize: 16,
     marginBottom: 20
+  },
+  title: {
+    color: colors.bg_text_sec,
+    fontSize: 18,
+    fontFamily: 'Manifold CF',
+    fontWeight: 'bold',
+    flexDirection: 'column',
+    justifyContent: 'center',
   }
 });
+
+const menuOptionsStyles = {
+  optionWrapper: {
+    padding: 15,
+  },
+  optionText: {
+    fontFamily: 'Roboto',
+    fontSize: 16
+  },
+};
+
+
+

From e4c75a7d120f35c278ac7bce1b9d930b4ad0b0b9 Mon Sep 17 00:00:00 2001
From: Thibaut <thibaut.sardan@gmail.com>
Date: Tue, 26 Feb 2019 17:46:59 +0100
Subject: [PATCH 2/7] fix(): account details menu (account deletion not
 handled)

---
 src/App.js                           |   7 --
 src/screens/About.js                 |   2 -
 src/screens/AccountAdd.js            | 133 ---------------------------
 src/screens/AccountBackup.js         |  42 +++------
 src/screens/AccountDetails.js        |  84 ++++++++++++++---
 src/screens/AccountEdit.js           |   8 +-
 src/screens/AccountList.js           |   2 +-
 src/screens/AccountNetworkChooser.js |   1 -
 src/screens/AccountPin.js            |  20 ++--
 src/screens/AccountUnlock.js         |   8 +-
 src/screens/PrivacyPolicy.js         |   2 -
 src/screens/TermsAndConditions.js    |   1 -
 12 files changed, 108 insertions(+), 202 deletions(-)
 delete mode 100644 src/screens/AccountAdd.js

diff --git a/src/App.js b/src/App.js
index 9b30dda081..6e32ca21b8 100644
--- a/src/App.js
+++ b/src/App.js
@@ -33,7 +33,6 @@ import Background from './components/Background';
 import HeaderLeftHome from './components/HeaderLeftHome';
 import SecurityHeader from './components/SecurityHeader';
 import About from './screens/About';
-import AccountAdd from './screens/AccountAdd';
 import AccountBackup from './screens/AccountBackup';
 import AccountDetails from './screens/AccountDetails';
 import AccountEdit from './screens/AccountEdit';
@@ -160,12 +159,6 @@ const Screens = createStackNavigator(
               headerLeft: <HeaderLeftHome />
             }
           },
-          AccountAdd: {
-            screen: AccountAdd,
-            navigationOptions: {
-              headerLeft: <HeaderLeftHome />
-            }
-          },
           AccountNetworkChooser: {
             screen: AccountNetworkChooser
           },
diff --git a/src/screens/About.js b/src/screens/About.js
index bb86b6283b..e13a8efed6 100644
--- a/src/screens/About.js
+++ b/src/screens/About.js
@@ -27,8 +27,6 @@ export default class About extends React.PureComponent {
   };
 
   render() {
-    const { navigation } = this.props;
-    const isWelcome = navigation.getParam('isWelcome');
     return (
       <ScrollView style={styles.body} contentContainerStyle={{ padding: 20 }}>
         <Text style={styles.title}>PARITY SIGNER (v2.0-beta)</Text>
diff --git a/src/screens/AccountAdd.js b/src/screens/AccountAdd.js
deleted file mode 100644
index fd13dfdd86..0000000000
--- a/src/screens/AccountAdd.js
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
-// This file is part of Parity.
-
-// Parity is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Parity is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
-
-'use strict';
-
-import React from 'react';
-import { ScrollView, StyleSheet, Text } from 'react-native';
-import Icon from 'react-native-vector-icons/MaterialIcons';
-import { Subscribe } from 'unstated';
-import colors from '../colors';
-import Background from '../components/Background';
-import TouchableItem from '../components/TouchableItem';
-import AccountsStore from '../stores/AccountsStore';
-
-export default class AccountAdd extends React.PureComponent {
-  static navigationOptions = {
-    title: 'Add Account',
-    headerBackTitle: 'Back'
-  };
-
-  render() {
-    return (
-      <Subscribe to={[AccountsStore]}>
-        {accounts => <AccountAddView {...this.props} accounts={accounts} />}
-      </Subscribe>
-    );
-  }
-}
-
-class AccountAddView extends React.PureComponent {
-  componentWillMount() {
-    this.props.navigation.addListener('willFocus', () => {
-      this.props.accounts.resetNew();
-    });
-  }
-
-  render() {
-    const { navigation } = this.props;
-    const isWelcome = navigation.getParam('isWelcome');
-    return (
-      <ScrollView style={styles.body} contentContainerStyle={{ padding: 20 }}>
-        <Background />
-        {isWelcome && <Text style={styles.titleTop}>GETTING STARTED</Text>}
-        <TouchableItem
-          style={styles.card}
-          onPress={() => navigation.navigate('AccountNew', { isWelcome })}
-        >
-          <Icon
-            style={{
-              textAlign: 'center',
-              color: colors.card_text,
-              fontSize: 66
-            }}
-            name="layers"
-          />
-          <Text style={[styles.cardText, { marginTop: 20 }]}>
-            Create New Account
-          </Text>
-        </TouchableItem>
-        <TouchableItem
-          style={[styles.card, { marginTop: 20 }]}
-          onPress={() => navigation.navigate('AccountRecover', { isWelcome })}
-        >
-          <Icon
-            style={{
-              textAlign: 'center',
-              color: colors.card_text,
-              fontSize: 66
-            }}
-            name="graphic-eq"
-          />
-          <Text style={[styles.cardText, { marginTop: 20 }]}>
-            Recover Account
-          </Text>
-        </TouchableItem>
-        <TouchableItem
-          style={[styles.card, { marginTop: 20 }]}
-          onPress={() => navigation.navigate('About')}
-        >
-          <Text style={styles.cardText}>About</Text>
-        </TouchableItem>
-      </ScrollView>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  body: {
-    flex: 1,
-    flexDirection: 'column',
-    overflow: 'hidden',
-    backgroundColor: colors.bg
-  },
-  top: {
-    flex: 1
-  },
-  bottom: {
-    flexBasis: 50,
-    paddingBottom: 15
-  },
-  titleTop: {
-    color: colors.bg_text_sec,
-    fontSize: 24,
-    fontFamily: 'Manifold CF',
-    fontWeight: 'bold',
-    paddingBottom: 20,
-    textAlign: 'center'
-  },
-  card: {
-    backgroundColor: colors.card_bg,
-    padding: 20
-  },
-  cardText: {
-    textAlign: 'center',
-    color: colors.card_text,
-    fontFamily: 'Manifold CF',
-    fontSize: 20,
-    fontWeight: 'bold'
-  }
-});
diff --git a/src/screens/AccountBackup.js b/src/screens/AccountBackup.js
index d8ca2c696b..637f1271c1 100644
--- a/src/screens/AccountBackup.js
+++ b/src/screens/AccountBackup.js
@@ -80,16 +80,16 @@ class AccountBackupView extends React.PureComponent {
           chainId={selected.chainId}
           title={selected.name}
         />
-        <Text style={styles.titleTop}>RECOVERY WORDS</Text>
+        <Text style={styles.titleTop}>RECOVERY PHRASE</Text>
         <Text style={styles.hintText}>
           Write these words down on paper. Keep it safe. These words allow
-          anyone to recover this account.
+          anyone to recover and access the funds of this account.
         </Text>
         <TouchableItem
           onPress={() => {
             Alert.alert(
-              'Use paper to store seed phrases',
-              `It's not recommended to transfer or store seed phrases digitally and unencrypted. Everyone who have the phrase is able to spend funds from this account.
+              'Write this recovery phrase on paper',
+              `It's not recommended to transfer or store a recovery phrase digitally and unencrypted. Anyone in possession of this recovery phrase is able to spend funds from this account.
               `,
               [
                 {
@@ -119,22 +119,20 @@ class AccountBackupView extends React.PureComponent {
             {selected.seed}
           </Text>
         </TouchableItem>
-        <Button
-          buttonStyles={[styles.nextStep, { marginBottom: 20 }]}
-          title="Done Backup"
-          onPress={() => {
-            if (isNew) {
+        {(isNew) &&
+          <Button
+            buttonStyles={[styles.nextStep, { marginBottom: 20 }]}
+            title="Backup Done"
+            onPress={() => {
+
               Alert.alert(
-                'Important information',
-                "Make sure you've backed up recovery words for your account. Recovery words are the only way to restore access to your account in case of device failure/lost.",
+                'Important',
+                "Make sure you've backed up this recovery phrase. It is the only way to restore your account in case of device failure/lost.",
                 [
                   {
                     text: 'Proceed',
                     onPress: () => {
-                      this.props.navigation.navigate('AccountPin', {
-                        isWelcome: navigation.getParam('isWelcome'),
-                        isNew
-                      });
+                      this.props.navigation.navigate('AccountPin', { isNew });
                     }
                   },
                   {
@@ -143,21 +141,9 @@ class AccountBackupView extends React.PureComponent {
                   }
                 ]
               );
-            } else {
-              navigation.navigate('AccountList');
-            }
-          }}
-        />
-
-        {!isNew && (
-          <Button
-            buttonStyles={{ marginBottom: 40 }}
-            title="Change PIN"
-            onPress={() => {
-              navigation.navigate('AccountPin', { isNew });
             }}
           />
-        )}
+        }
 
         {!isNew && (
           <Button
diff --git a/src/screens/AccountDetails.js b/src/screens/AccountDetails.js
index aa4a0f0dba..a4269cfdd8 100644
--- a/src/screens/AccountDetails.js
+++ b/src/screens/AccountDetails.js
@@ -19,8 +19,16 @@
 import React from 'react';
 import { ScrollView, StyleSheet, Text, View } from 'react-native';
 import { Subscribe } from 'unstated';
+import {
+  Menu,
+  MenuOptions,
+  MenuOption,
+  MenuTrigger,
+} from 'react-native-popup-menu';
+import Icon from 'react-native-vector-icons/MaterialIcons';
+
 import colors from '../colors';
-import AccountDetailsCard from '../components/AccountDetailsCard';
+import AccountCard from '../components/AccountCard';
 import QrView from '../components/QrView';
 import AccountsStore from '../stores/AccountsStore';
 import TxStore from '../stores/TxStore';
@@ -62,6 +70,37 @@ class AccountDetailsView extends React.Component {
     this.subscription.remove();
   }
 
+  onOptionSelect = (value) => {
+    const navigate = this.props.navigation.navigate
+
+    if (value !== 'AccountEdit') {
+      navigate('AccountUnlock', {
+        next: value
+      });
+    } else {
+      navigate(value);
+    }
+  }
+
+  showEditMenu = () => {
+    const editIcon = <Icon name="more-vert" size={35} color={colors.bg_text_sec} />
+
+    return (
+      <View style={styles.menuView}>
+        <Menu
+          onSelect={this.onOptionSelect}
+        >
+          <MenuTrigger children={editIcon} />
+          <MenuOptions customStyles={menuOptionsStyles}>
+            <MenuOption value={'AccountEdit'} text='Edit' />
+            <MenuOption value={'AccountPin'} text='Change Pin' />
+            <MenuOption value={'AccountBackup'} text='View Recovery Phrase' />
+          </MenuOptions>
+        </Menu>
+      </View>
+    )
+  };
+
   render() {
     const account = this.props.accounts.getSelected();
     if (!account) {
@@ -73,12 +112,14 @@ class AccountDetailsView extends React.Component {
         contentContainerStyle={styles.bodyContent}
         style={styles.body}
       >
-        <Text style={styles.title}>ACCOUNT</Text>
-        <AccountDetailsCard
+        <View style={styles.header}>
+          <Text style={styles.title}>ACCOUNT</Text>
+          {this.showEditMenu()}
+        </View>
+        <AccountCard
           address={account.address}
           chainId={account.chainId}
           title={account.name}
-          onPress={() => this.props.navigation.navigate('AccountEdit')}
         />
         <View style={styles.qr}>
           <QrView text={accountId(account)} />
@@ -98,13 +139,6 @@ const styles = StyleSheet.create({
   bodyContent: {
     paddingBottom: 40
   },
-  title: {
-    color: colors.bg_text_sec,
-    fontSize: 18,
-    fontFamily: 'Manifold CF',
-    fontWeight: 'bold',
-    paddingBottom: 20
-  },
   wrapper: {
     borderRadius: 5
   },
@@ -133,5 +167,33 @@ const styles = StyleSheet.create({
   },
   actionButtonContainer: {
     flex: 1
+  },
+  header: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingBottom: 20,
+    justifyContent: 'center',
+  },
+  menuView: {
+    flex: 1,
+    alignItems: 'flex-end',
+  },
+  title: {
+    color: colors.bg_text_sec,
+    fontSize: 18,
+    fontFamily: 'Manifold CF',
+    fontWeight: 'bold',
+    flexDirection: 'column',
+    justifyContent: 'center',
   }
 });
+
+const menuOptionsStyles = {
+  optionWrapper: {
+    padding: 15,
+  },
+  optionText: {
+    fontFamily: 'Roboto',
+    fontSize: 16
+  },
+};
diff --git a/src/screens/AccountEdit.js b/src/screens/AccountEdit.js
index 5d6cde140d..fe79045e19 100644
--- a/src/screens/AccountEdit.js
+++ b/src/screens/AccountEdit.js
@@ -63,13 +63,7 @@ export default class AccountEdit extends React.PureComponent {
                 onChangeText={name => accounts.updateSelected({ name })}
                 onEndEditing={text => accounts.saveSelected()}
                 value={selected.name}
-                placeholder="Enter a new account name"
-              />
-              <Button
-                title="Manage/Backup Account"
-                onPress={() => {
-                  this.props.navigation.navigate('AccountUnlock');
-                }}
+                placeholder="New name"
               />
             </ScrollView>
           );
diff --git a/src/screens/AccountList.js b/src/screens/AccountList.js
index bd720a82a6..6040ee004a 100644
--- a/src/screens/AccountList.js
+++ b/src/screens/AccountList.js
@@ -147,7 +147,7 @@ class AccountListView extends React.PureComponent {
         />
         <View style={styles.bottom}>
           <Button
-            buttonStyles={{ height: 60, marginTop: 20 }}
+            buttonStyles={{ height: 60 }}
             title="Scan"
             onPress={() => this.props.navigation.navigate('QrScanner')}
           />
diff --git a/src/screens/AccountNetworkChooser.js b/src/screens/AccountNetworkChooser.js
index 2a3f472e62..68275fa69a 100644
--- a/src/screens/AccountNetworkChooser.js
+++ b/src/screens/AccountNetworkChooser.js
@@ -45,7 +45,6 @@ class AccountNetworkChooserView extends React.PureComponent {
   render() {
     const { navigation } = this.props;
     const { accounts } = this.props;
-    const isWelcome = navigation.getParam('isWelcome');
     return (
       <ScrollView style={styles.body} contentContainerStyle={{ padding: 20 }}>
         <Text style={styles.title}>CHOOSE NETWORK</Text>
diff --git a/src/screens/AccountPin.js b/src/screens/AccountPin.js
index a6c54d4a63..efcc48cf8e 100644
--- a/src/screens/AccountPin.js
+++ b/src/screens/AccountPin.js
@@ -52,7 +52,7 @@ class AccountPinView extends React.PureComponent {
   };
 
   async submit() {
-    const { accounts, type, navigation } = this.props;
+    const { accounts, navigation } = this.props;
     const accountCreation = navigation.getParam('isNew');
     const { pin } = this.state;
     if (
@@ -64,15 +64,23 @@ class AccountPinView extends React.PureComponent {
         account = accounts.getNew();
         await accounts.submitNew(pin);
         await accounts.select(account);
+        accounts.refreshList();
+        navigation.popToTop();
+        navigation.navigate('AccountList', {
+          accountId: accountId(account)
+        });
       } else {
         account = accounts.getSelected();
         await accounts.save(account, pin);
+        const resetAction = StackActions.reset({
+          index: 1,
+          actions: [
+            NavigationActions.navigate({ routeName: 'AccountList' }),
+            NavigationActions.navigate({ routeName: 'AccountDetails' })
+          ]
+        });
+        this.props.navigation.dispatch(resetAction);
       }
-      accounts.refreshList();
-      navigation.popToTop();
-      navigation.navigate('AccountList', {
-        accountId: accountId(account)
-      });
     } else {
       if (this.state.pin.length < 6) {
         this.setState({ pinTooShort: true });
diff --git a/src/screens/AccountUnlock.js b/src/screens/AccountUnlock.js
index b8d4b024cd..abcd8c38ed 100644
--- a/src/screens/AccountUnlock.js
+++ b/src/screens/AccountUnlock.js
@@ -66,6 +66,9 @@ export class AccountUnlockAndSign extends React.PureComponent {
 
 export class AccountUnlock extends React.Component {
   render() {
+    const { navigation } = this.props;
+    const next = navigation.getParam('next', 'AccountList');
+
     return (
       <Subscribe to={[AccountsStore]}>
         {accounts => (
@@ -76,12 +79,11 @@ export class AccountUnlock extends React.Component {
             }}
             navigate={() => {
               const resetAction = StackActions.reset({
-                index: 3,
+                index: 2,
                 actions: [
                   NavigationActions.navigate({ routeName: 'AccountList' }),
                   NavigationActions.navigate({ routeName: 'AccountDetails' }),
-                  NavigationActions.navigate({ routeName: 'AccountEdit' }),
-                  NavigationActions.navigate({ routeName: 'AccountBackup' })
+                  NavigationActions.navigate({ routeName: next })
                 ]
               });
               this.props.navigation.dispatch(resetAction);
diff --git a/src/screens/PrivacyPolicy.js b/src/screens/PrivacyPolicy.js
index 5f4c03940e..acc8db33df 100644
--- a/src/screens/PrivacyPolicy.js
+++ b/src/screens/PrivacyPolicy.js
@@ -29,8 +29,6 @@ export default class PrivacyPolicy extends React.PureComponent {
   };
 
   render() {
-    const { navigation } = this.props;
-    const isWelcome = navigation.getParam('isWelcome');
     return (
       <View style={styles.body}>
         <ScrollView contentContainerStyle={{}}>
diff --git a/src/screens/TermsAndConditions.js b/src/screens/TermsAndConditions.js
index b05868ba1c..129c7442dd 100644
--- a/src/screens/TermsAndConditions.js
+++ b/src/screens/TermsAndConditions.js
@@ -40,7 +40,6 @@ export default class TermsAndConditions extends React.PureComponent {
   render() {
     const { navigation } = this.props;
     const { tocAgreement, ppAgreement } = this.state;
-    const isWelcome = navigation.getParam('isWelcome');
     return (
       <View style={styles.body}>
         <ScrollView contentContainerStyle={{}}>

From d7d096fdca15e32bf89665f53c7d17b1aaba62c3 Mon Sep 17 00:00:00 2001
From: Thibaut <thibaut.sardan@gmail.com>
Date: Thu, 28 Feb 2019 17:49:59 +0100
Subject: [PATCH 3/7] fix(): handle account deletion

---
 src/screens/AccountBackup.js  | 27 ----------------
 src/screens/AccountDetails.js | 60 +++++++++++++++++++----------------
 src/screens/AccountUnlock.js  | 23 ++++++++------
 3 files changed, 47 insertions(+), 63 deletions(-)

diff --git a/src/screens/AccountBackup.js b/src/screens/AccountBackup.js
index 637f1271c1..acd9b08959 100644
--- a/src/screens/AccountBackup.js
+++ b/src/screens/AccountBackup.js
@@ -144,33 +144,6 @@ class AccountBackupView extends React.PureComponent {
             }}
           />
         }
-
-        {!isNew && (
-          <Button
-            buttonStyles={styles.deleteButton}
-            title="Delete Account"
-            onPress={() => {
-              Alert.alert(
-                'Delete Account',
-                `Are you sure to delete ${selected.name || selected.address} and its private key?`,
-                [
-                  {
-                    text: 'Delete',
-                    style: 'destructive',
-                    onPress: () => {
-                      accounts.deleteAccount(selected);
-                      this.props.navigation.navigate('AccountList');
-                    }
-                  },
-                  {
-                    text: 'Cancel',
-                    style: 'cancel'
-                  }
-                ]
-              );
-            }}
-          />
-        )}
       </ScrollView>
     );
   }
diff --git a/src/screens/AccountDetails.js b/src/screens/AccountDetails.js
index a4269cfdd8..ed29f112d7 100644
--- a/src/screens/AccountDetails.js
+++ b/src/screens/AccountDetails.js
@@ -17,7 +17,7 @@
 'use strict';
 
 import React from 'react';
-import { ScrollView, StyleSheet, Text, View } from 'react-native';
+import { Alert, ScrollView, StyleSheet, Text, View } from 'react-native';
 import { Subscribe } from 'unstated';
 import {
   Menu,
@@ -66,6 +66,31 @@ class AccountDetailsView extends React.Component {
     });
   }
 
+  onDelete = () => {
+    const accounts = this.props.accounts
+    const selected = accounts.getSelected();
+
+    Alert.alert(
+      'Delete Account',
+      `Do you really want to delete ${selected.name || selected.address}?
+This account can only be recovered with its associated recovery phrase.`,
+      [
+        {
+          text: 'Delete',
+          style: 'destructive',
+          onPress: () => {
+            accounts.deleteAccount(selected);
+            this.props.navigation.navigate('AccountList');
+          }
+        },
+        {
+          text: 'Cancel',
+          style: 'cancel'
+        }
+      ]
+    );
+  }
+
   componentWillUnmount() {
     this.subscription.remove();
   }
@@ -75,7 +100,8 @@ class AccountDetailsView extends React.Component {
 
     if (value !== 'AccountEdit') {
       navigate('AccountUnlock', {
-        next: value
+        next: value,
+        onDelete: this.onDelete
       });
     } else {
       navigate(value);
@@ -95,6 +121,7 @@ class AccountDetailsView extends React.Component {
             <MenuOption value={'AccountEdit'} text='Edit' />
             <MenuOption value={'AccountPin'} text='Change Pin' />
             <MenuOption value={'AccountBackup'} text='View Recovery Phrase' />
+            <MenuOption value={'AccountDelete'} ><Text style={styles.deleteText}>Delete</Text></MenuOption>
           </MenuOptions>
         </Menu>
       </View>
@@ -139,34 +166,12 @@ const styles = StyleSheet.create({
   bodyContent: {
     paddingBottom: 40
   },
-  wrapper: {
-    borderRadius: 5
-  },
-  address: {
-    flex: 1
-  },
   qr: {
     marginTop: 20,
     backgroundColor: colors.card_bg
   },
-  qrButton: {
-    marginTop: 20,
-    backgroundColor: colors.card_bg
-  },
   deleteText: {
-    fontFamily: 'Manifold CF',
-    textAlign: 'right'
-  },
-  changePinText: {
-    textAlign: 'left',
-    color: 'green'
-  },
-  actionsContainer: {
-    flex: 1,
-    flexDirection: 'row'
-  },
-  actionButtonContainer: {
-    flex: 1
+    color: 'red'
   },
   header: {
     flexDirection: 'row',
@@ -178,6 +183,7 @@ const styles = StyleSheet.create({
     flex: 1,
     alignItems: 'flex-end',
   },
+
   title: {
     color: colors.bg_text_sec,
     fontSize: 18,
@@ -195,5 +201,5 @@ const menuOptionsStyles = {
   optionText: {
     fontFamily: 'Roboto',
     fontSize: 16
-  },
-};
+  }
+}
diff --git a/src/screens/AccountUnlock.js b/src/screens/AccountUnlock.js
index abcd8c38ed..f2ff609afe 100644
--- a/src/screens/AccountUnlock.js
+++ b/src/screens/AccountUnlock.js
@@ -78,15 +78,20 @@ export class AccountUnlock extends React.Component {
               return await accounts.unlockAccount(accounts.getSelected(), pin);
             }}
             navigate={() => {
-              const resetAction = StackActions.reset({
-                index: 2,
-                actions: [
-                  NavigationActions.navigate({ routeName: 'AccountList' }),
-                  NavigationActions.navigate({ routeName: 'AccountDetails' }),
-                  NavigationActions.navigate({ routeName: next })
-                ]
-              });
-              this.props.navigation.dispatch(resetAction);
+              if (next === 'AccountDelete') {
+                navigation.goBack();
+                navigation.state.params.onDelete();
+              } else {
+                const resetAction = StackActions.reset({
+                  index: 2,
+                  actions: [
+                    NavigationActions.navigate({ routeName: 'AccountList' }),
+                    NavigationActions.navigate({ routeName: 'AccountDetails' }),
+                    NavigationActions.navigate({ routeName: next })
+                  ]
+                });
+                this.props.navigation.dispatch(resetAction);
+              }
             }}
           />
         )}

From 6bb383368529e6685facc960a8f3aa0a3019b70a Mon Sep 17 00:00:00 2001
From: Thibaut <thibaut.sardan@gmail.com>
Date: Fri, 1 Mar 2019 11:01:26 +0100
Subject: [PATCH 4/7] fix(): add onboarding message when no account

---
 src/assets/img/onboardingArrow.png | Bin 0 -> 1350 bytes
 src/screens/AccountList.js         |  45 +++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 12 deletions(-)
 create mode 100644 src/assets/img/onboardingArrow.png

diff --git a/src/assets/img/onboardingArrow.png b/src/assets/img/onboardingArrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa5bc6fc15e9bfbe309edd92c9701b8fbe55517e
GIT binary patch
literal 1350
zcmV-M1-bf(P)<h;3K|Lk000e1NJLTq001xm006}Z1^@s65?ygE00006VoOIv00000
z008+zyMF)x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;{yQ+Gc)IM;gA3T02y>e
zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00gc{L_t(|+U=cPXdOiq$A7!M
zk=C}TjTN=6_=Q*%q-uQ-u_!G*%m^cbAbx@mqD2IKXh6{xQ4kct2cJ|Bwb%!7)!j!+
ziHah&LIo>UNCdT&R%uLY(c~sR+zI#OlEmEHuRY0`r*r4-&Ys`?&zYH>otq>mDtVDT
z2keX=cX=0frsyh@!cG9R0Za%x)d*k;m;$DNDPRB=LZ*NzU<z0_Y5+?YU|iT0jQ~|)
zFEa%Uz(Pp30_t<XLdZhMLdeDeQ@}z<wE}(CjamrVRKjw=LdcR>JwT!ifV{{igx{$)
z1z`I6=rWA}<BJKPq7k5K3K)QekcE(ikSVZOa==2!lGw%p3n5d$#sLc<OJW-bl$B|l
zUo`?uD+XWy24DaNu;c)2ATt01FaQHs+5i>#bfyuYPuOFofGN-#z_|7h8nY0xB(@~B
zBsK+10aL&fXs(<o?7vm*oz9CarS^&`p|%BC-7BV5)Hi;g@-9qj1ehu(H9ixo2Uxk7
z6gXueWB``Lra(^>uwKZ<fd!Paggv4WV6Cu^YXs;Q_8$h&gR({~Kwf04faUSyY45^m
zZ3^@^Ca^YubA|n<Mt}>2eMBR`1qNUM2C#Slj;aF4i|h>1jaGqQv?*|r@by>k!oS)8
zE)n*y{6Y)B#ljxa4lry0Jt&uH51}iC{evoiyvWv3UrssUUHDy_0`l&E-}t2lfQ`aF
zq!D1&_}8d_E`Yqq5@3_4`c9hymjdTR`?z=EXKeu23w!@e2b3M)I_&^bfdi@lW=P-z
z+7#GGeLeJ8<1ADIz!qT-dKV_O0o)?&&t^MF3&5Z%fV{{qr@o9b0vyz)z^%gm+`CZK
z2H=GK>0Ae<B@CYxz*bqM3IMo``lgOU-i5>30PYa>$NzV5TC(s-8sa}!1pwR(te=|y
z17B(bcu?4T=ITC62ap%pa^Nme_0D|GE0Y3u0%u42Fz~fDfcu60_H47yQUc^fb_H;I
z{5S!;JKuB5qQH~FmwcwxhtdM%MYa}rKvccb%=u+dU^}oP+TVB=2Gs!MMYbAvOjNzx
zY#Y5+U<dV`h(o{!%{Gwq@b0ezex&}hs(ZZ)yEQ5BqHz9O;QfU(lJw~AZw9^+H*ia{
z$=fpp;+*F#aqSNm>U^(4=q2EqXpaI<wbEGH<-5NXcwAIH;awPNrOl*^&ToiuKegWT
zk#`}q+HTq<=T`%t2<MLhkF=xhv<uGn#R2NtSoIHZcjF7|QUc^fR*5~%wpcX@JnUWA
z*RE?+I_UgLU{Av;!!zE6_u6@#q(jc17nejfi|W_C3)|a$t+WHq-x!xer1QHv;e1;a
zh{?JGc$WGP_s4-py$f%2DpZp;Ilm2f6}VbdkHi^f(aDY?X~F3v_AUcVU(W~l0=Un+
zFx=^GI$40@>w$ZKhk&aZz8(dhjtN_(3niI{!{-Ax05`>@k4-b2HwL^3Jnvojt()_!
zBs%#5wSSYCP}^M54{V^e*>24o=l>N4s@Gbbl(jmL4K&fEjsbgt-El5I+RKOPO8jdX
zb2&d6ANlqJ`+&XPg_D$|RASf+h`JNhekF7S_{qC)loFT!0R5L)V1TPg>i_@%07*qo
IM6N<$f~(kHasU7T

literal 0
HcmV?d00001

diff --git a/src/screens/AccountList.js b/src/screens/AccountList.js
index 6040ee004a..3be667b297 100644
--- a/src/screens/AccountList.js
+++ b/src/screens/AccountList.js
@@ -18,7 +18,7 @@
 
 import PropTypes from 'prop-types';
 import React from 'react';
-import { FlatList, StyleSheet, Text, View } from 'react-native';
+import { FlatList, Image, StyleSheet, Text, View } from 'react-native';
 import { Subscribe } from 'unstated';
 import {
   Menu,
@@ -95,6 +95,17 @@ class AccountListView extends React.PureComponent {
     this.scrollToIndex();
   }
 
+  showOnboardingMessage = () => {
+    return (
+      <View style={styles.onboardingWrapper} >
+        <Text style={styles.onboardingText}>Nothing here yet.
+        Click on the + to add an account</Text>
+        <View style={styles.onboardingArrowWrapper}><Image style={styles.onboardingArrow} source={require('../assets/img/onboardingArrow.png')}
+        /></View>
+      </View>
+    )
+  }
+
   AccountMenu = () => {
     const addIcon = <Icon name="add" size={35} color={colors.bg_text_sec} />
 
@@ -122,6 +133,7 @@ class AccountListView extends React.PureComponent {
           <Text style={styles.title}>ACCOUNTS</Text>
           {this.AccountMenu()}
         </View>
+        {this.props.accounts.length < 1 && this.showOnboardingMessage()}
         <FlatList
           ref={list => {
             this.list = list;
@@ -180,17 +192,6 @@ const styles = StyleSheet.create({
     flex: 1,
     alignItems: 'flex-end',
   },
-  introContainer: {
-    padding: 30,
-    flex: 1,
-    flexDirection: 'column',
-    justifyContent: 'center'
-  },
-  introText: {
-    textAlign: 'center',
-    fontSize: 16,
-    marginBottom: 20
-  },
   title: {
     color: colors.bg_text_sec,
     fontSize: 18,
@@ -198,6 +199,26 @@ const styles = StyleSheet.create({
     fontWeight: 'bold',
     flexDirection: 'column',
     justifyContent: 'center',
+  },
+  onboardingWrapper: {
+    flex: 1,
+    flexDirection: 'row',
+    alignItems: 'flex-end'
+  },
+  onboardingArrowWrapper:
+  {
+    flex: 1,
+    paddingBottom: 20,
+    paddingLeft: 5
+  },
+  onboardingArrow: {
+    resizeMode: 'contain'
+  },
+  onboardingText: {
+    flex: 5,
+    fontFamily: 'Roboto',
+    fontSize: 20,
+    color: colors.bg_text_sec,
   }
 });
 

From c3584941189a0bba338c73ff20668230eef4d1dd Mon Sep 17 00:00:00 2001
From: Thibaut <thibaut.sardan@gmail.com>
Date: Fri, 1 Mar 2019 12:13:32 +0100
Subject: [PATCH 5/7] fix(): refactoring menu as component

---
 src/components/PopupMenu.js   | 62 +++++++++++++++++++++++++++++++++++
 src/screens/AccountDetails.js | 50 +++++++---------------------
 src/screens/AccountList.js    | 49 +++++++--------------------
 3 files changed, 86 insertions(+), 75 deletions(-)
 create mode 100644 src/components/PopupMenu.js

diff --git a/src/components/PopupMenu.js b/src/components/PopupMenu.js
new file mode 100644
index 0000000000..e287a46cb6
--- /dev/null
+++ b/src/components/PopupMenu.js
@@ -0,0 +1,62 @@
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// This file is part of Parity.
+
+// Parity is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+// @flow
+
+import React from 'react';
+import { Text } from 'react-native';
+import {
+    Menu,
+    MenuOptions,
+    MenuOption,
+    MenuTrigger,
+} from 'react-native-popup-menu';
+import Icon from 'react-native-vector-icons/MaterialIcons';
+import colors from '../colors';
+
+export default class PopupMenu extends React.PureComponent {
+
+
+    render() {
+        const { onSelect, menuTriggerIconName, menuItems } = this.props
+        const menuTriggerIcon = <Icon name={menuTriggerIconName} size={35} color={colors.bg_text_sec} />
+        return (
+            <Menu
+                onSelect={onSelect}
+            >
+                <MenuTrigger children={menuTriggerIcon} />
+                <MenuOptions customStyles={menuOptionsStyles}>
+                    {
+                        menuItems.map((menuItem, index) => (
+                            <MenuOption key={index} value={menuItem.value} >
+                                <Text style={(menuItem.textStyle) ? menuItem.textStyle : null} >{menuItem.text}</Text>
+                            </MenuOption>
+                        ))
+                    }
+                </MenuOptions>
+            </Menu>
+        );
+    }
+}
+const menuOptionsStyles = {
+    optionWrapper: {
+        padding: 15,
+    },
+    optionText: {
+        fontFamily: 'Roboto',
+        fontSize: 16
+    },
+};
diff --git a/src/screens/AccountDetails.js b/src/screens/AccountDetails.js
index ed29f112d7..b650a8d7fd 100644
--- a/src/screens/AccountDetails.js
+++ b/src/screens/AccountDetails.js
@@ -19,13 +19,6 @@
 import React from 'react';
 import { Alert, ScrollView, StyleSheet, Text, View } from 'react-native';
 import { Subscribe } from 'unstated';
-import {
-  Menu,
-  MenuOptions,
-  MenuOption,
-  MenuTrigger,
-} from 'react-native-popup-menu';
-import Icon from 'react-native-vector-icons/MaterialIcons';
 
 import colors from '../colors';
 import AccountCard from '../components/AccountCard';
@@ -33,6 +26,7 @@ import QrView from '../components/QrView';
 import AccountsStore from '../stores/AccountsStore';
 import TxStore from '../stores/TxStore';
 import { accountId } from '../util/account';
+import PopupMenu from '../components/PopupMenu'
 
 export default class AccountDetails extends React.Component {
   static navigationOptions = {
@@ -108,26 +102,6 @@ This account can only be recovered with its associated recovery phrase.`,
     }
   }
 
-  showEditMenu = () => {
-    const editIcon = <Icon name="more-vert" size={35} color={colors.bg_text_sec} />
-
-    return (
-      <View style={styles.menuView}>
-        <Menu
-          onSelect={this.onOptionSelect}
-        >
-          <MenuTrigger children={editIcon} />
-          <MenuOptions customStyles={menuOptionsStyles}>
-            <MenuOption value={'AccountEdit'} text='Edit' />
-            <MenuOption value={'AccountPin'} text='Change Pin' />
-            <MenuOption value={'AccountBackup'} text='View Recovery Phrase' />
-            <MenuOption value={'AccountDelete'} ><Text style={styles.deleteText}>Delete</Text></MenuOption>
-          </MenuOptions>
-        </Menu>
-      </View>
-    )
-  };
-
   render() {
     const account = this.props.accounts.getSelected();
     if (!account) {
@@ -141,7 +115,17 @@ This account can only be recovered with its associated recovery phrase.`,
       >
         <View style={styles.header}>
           <Text style={styles.title}>ACCOUNT</Text>
-          {this.showEditMenu()}
+          <View style={styles.menuView}>
+            <PopupMenu
+              onSelect={this.onOptionSelect}
+              menuTriggerIconName={"more-vert"}
+              menuItems={[
+                { value: 'AccountEdit', text: 'Edit' },
+                { value: 'AccountPin', text: 'Change Pin' },
+                { value: 'AccountBackup', text: 'View Recovery Phrase' },
+                { value: 'AccountDelete', text: 'Delete', textStyle: styles.deleteText }]}
+            />
+          </View>
         </View>
         <AccountCard
           address={account.address}
@@ -193,13 +177,3 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
   }
 });
-
-const menuOptionsStyles = {
-  optionWrapper: {
-    padding: 15,
-  },
-  optionText: {
-    fontFamily: 'Roboto',
-    fontSize: 16
-  }
-}
diff --git a/src/screens/AccountList.js b/src/screens/AccountList.js
index 3be667b297..81260d7f92 100644
--- a/src/screens/AccountList.js
+++ b/src/screens/AccountList.js
@@ -20,13 +20,7 @@ import PropTypes from 'prop-types';
 import React from 'react';
 import { FlatList, Image, StyleSheet, Text, View } from 'react-native';
 import { Subscribe } from 'unstated';
-import {
-  Menu,
-  MenuOptions,
-  MenuOption,
-  MenuTrigger,
-} from 'react-native-popup-menu';
-import Icon from 'react-native-vector-icons/MaterialIcons';
+
 
 import colors from '../colors';
 import AccountCard from '../components/AccountCard';
@@ -34,6 +28,7 @@ import Background from '../components/Background';
 import Button from '../components/Button';
 import AccountsStore from '../stores/AccountsStore';
 import { accountId } from '../util/account';
+import PopupMenu from '../components/PopupMenu';
 
 export default class AccountList extends React.PureComponent {
   static navigationOptions = {
@@ -106,32 +101,22 @@ class AccountListView extends React.PureComponent {
     )
   }
 
-  AccountMenu = () => {
-    const addIcon = <Icon name="add" size={35} color={colors.bg_text_sec} />
-
-    return (
-      <View style={styles.menuView}>
-        <Menu
-          onSelect={value => this.props.navigation.navigate(value)}
-        >
-          <MenuTrigger children={addIcon} />
-          <MenuOptions customStyles={menuOptionsStyles}>
-            <MenuOption value={'AccountNew'} text='New Account' />
-            <MenuOption value={'AccountRecover'} text='Recover Account' />
-            <MenuOption value={'About'} text='About' />
-          </MenuOptions>
-        </Menu>
-      </View>
-    )
-  };
-
   render() {
     return (
       <View style={styles.body}>
         <Background />
         <View style={styles.header}>
           <Text style={styles.title}>ACCOUNTS</Text>
-          {this.AccountMenu()}
+          <View style={styles.menuView}>
+            <PopupMenu
+              onSelect={value => this.props.navigation.navigate(value)}
+              menuTriggerIconName={"add"}
+              menuItems={[
+                { value: 'AccountNew', text: 'New Account' },
+                { value: 'AccountRecover', text: 'Recover Account' },
+                { value: 'About', text: 'About' }]}
+            />
+          </View>
         </View>
         {this.props.accounts.length < 1 && this.showOnboardingMessage()}
         <FlatList
@@ -222,15 +207,5 @@ const styles = StyleSheet.create({
   }
 });
 
-const menuOptionsStyles = {
-  optionWrapper: {
-    padding: 15,
-  },
-  optionText: {
-    fontFamily: 'Roboto',
-    fontSize: 16
-  },
-};
-
 
 

From 1f058b545d668caa13f51c43a2ef6839e426d2b4 Mon Sep 17 00:00:00 2001
From: Thibaut <thibaut.sardan@gmail.com>
Date: Fri, 1 Mar 2019 15:54:26 +0100
Subject: [PATCH 6/7] fix(): address comments

---
 src/components/PopupMenu.js | 5 ++---
 src/screens/AccountList.js  | 5 +----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/PopupMenu.js b/src/components/PopupMenu.js
index e287a46cb6..945172342b 100644
--- a/src/components/PopupMenu.js
+++ b/src/components/PopupMenu.js
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-// @flow
+'use strict';
 
 import React from 'react';
 import { Text } from 'react-native';
@@ -28,8 +28,6 @@ import Icon from 'react-native-vector-icons/MaterialIcons';
 import colors from '../colors';
 
 export default class PopupMenu extends React.PureComponent {
-
-
     render() {
         const { onSelect, menuTriggerIconName, menuItems } = this.props
         const menuTriggerIcon = <Icon name={menuTriggerIconName} size={35} color={colors.bg_text_sec} />
@@ -51,6 +49,7 @@ export default class PopupMenu extends React.PureComponent {
         );
     }
 }
+
 const menuOptionsStyles = {
     optionWrapper: {
         padding: 15,
diff --git a/src/screens/AccountList.js b/src/screens/AccountList.js
index 81260d7f92..302ae6276b 100644
--- a/src/screens/AccountList.js
+++ b/src/screens/AccountList.js
@@ -205,7 +205,4 @@ const styles = StyleSheet.create({
     fontSize: 20,
     color: colors.bg_text_sec,
   }
-});
-
-
-
+});
\ No newline at end of file

From 5d2b57733df71387cec9417d380238c93609c95f Mon Sep 17 00:00:00 2001
From: Thibaut <thibaut.sardan@gmail.com>
Date: Sat, 2 Mar 2019 00:37:24 +0100
Subject: [PATCH 7/7] fix(): address comments, clean and fix a warning

---
 src/components/AccountSeed.js | 5 ++---
 src/components/PopupMenu.js   | 6 ++----
 src/screens/AccountBackup.js  | 2 +-
 src/screens/AccountPin.js     | 1 -
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/components/AccountSeed.js b/src/components/AccountSeed.js
index 6a04c67fad..0e771c7417 100644
--- a/src/components/AccountSeed.js
+++ b/src/components/AccountSeed.js
@@ -142,9 +142,7 @@ export default class AccountSeed extends Component {
   }
 
   renderSuggestions() {
-    const { value, valid } = this.props;
-
-    const invalidStyles = !valid ? styles.invalidInput : {};
+    const { value } = this.props;
     const words = value.length ? value.split(' ') : [];
     const wordPosition = this.getWordPosition();
     let searchInput = this.getSearchInput();
@@ -163,6 +161,7 @@ export default class AccountSeed extends Component {
               : {};
           return (
             <TouchableItem
+              key={i}
               onPress={e => {
                 words[wordPosition] = suggestion;
                 this.props.onChangeText(words.join(' '));
diff --git a/src/components/PopupMenu.js b/src/components/PopupMenu.js
index 945172342b..59967e0f2d 100644
--- a/src/components/PopupMenu.js
+++ b/src/components/PopupMenu.js
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -32,9 +32,7 @@ export default class PopupMenu extends React.PureComponent {
         const { onSelect, menuTriggerIconName, menuItems } = this.props
         const menuTriggerIcon = <Icon name={menuTriggerIconName} size={35} color={colors.bg_text_sec} />
         return (
-            <Menu
-                onSelect={onSelect}
-            >
+            <Menu onSelect={onSelect}>
                 <MenuTrigger children={menuTriggerIcon} />
                 <MenuOptions customStyles={menuOptionsStyles}>
                     {
diff --git a/src/screens/AccountBackup.js b/src/screens/AccountBackup.js
index acd9b08959..b9e5b3879c 100644
--- a/src/screens/AccountBackup.js
+++ b/src/screens/AccountBackup.js
@@ -89,7 +89,7 @@ class AccountBackupView extends React.PureComponent {
           onPress={() => {
             Alert.alert(
               'Write this recovery phrase on paper',
-              `It's not recommended to transfer or store a recovery phrase digitally and unencrypted. Anyone in possession of this recovery phrase is able to spend funds from this account.
+              `It is not recommended to transfer or store a recovery phrase digitally and unencrypted. Anyone in possession of this recovery phrase is able to spend funds from this account.
               `,
               [
                 {
diff --git a/src/screens/AccountPin.js b/src/screens/AccountPin.js
index efcc48cf8e..972eba95b1 100644
--- a/src/screens/AccountPin.js
+++ b/src/screens/AccountPin.js
@@ -64,7 +64,6 @@ class AccountPinView extends React.PureComponent {
         account = accounts.getNew();
         await accounts.submitNew(pin);
         await accounts.select(account);
-        accounts.refreshList();
         navigation.popToTop();
         navigation.navigate('AccountList', {
           accountId: accountId(account)