Feature: address book + new send flow

app/actions/newTransaction/index.js

@@ -0,0 +1,72 @@
+import TransactionTypes from '../../core/TransactionTypes';
+
+const {
+	ASSET: { ETH, ERC20, ERC721 }
+} = TransactionTypes;
+
+/**
+ * Clears transaction object completely
+ */
+export function resetTransaction() {
+	return {
+		type: 'RESET_TRANSACTION'
+	};
+}
+
+/**
+ * Starts a new transaction state with an asset
+ *
+ * @param {object} selectedAsset - Asset to start the transaction with
+ */
+export function newAssetTransaction(selectedAsset) {
+	return {
+		type: 'NEW_ASSET_TRANSACTION',
+		selectedAsset,
+		assetType: selectedAsset.isETH ? ETH : selectedAsset.tokenId ? ERC721 : ERC20
+	};
+}
+
+/**
+ * Sets transaction to address and ensRecipient in case is available
+ *
+ * @param {string} from - Address to send the transaction from
+ * @param {string} to - Address to send the transaction to
+ * @param {string} ensRecipient - Resolved ens name to send the transaction to
+ * @param {string} transactionToName - Resolved address book name for to address
+ * @param {string} transactionFromName - Resolved address book name for from address
+ */
+export function setRecipient(from, to, ensRecipient, transactionToName, transactionFromName) {
+	return {
+		type: 'SET_RECIPIENT',
+		from,
+		to,
+		ensRecipient,
+		transactionToName,
+		transactionFromName
+	};
+}
+
+/**
+ * Sets asset as selectedAsset
+ *
+ * @param {object} selectedAsset - Asset to start the transaction with
+ */
+export function setSelectedAsset(selectedAsset) {
+	return {
+		type: 'SET_SELECTED_ASSET',
+		selectedAsset,
+		assetType: selectedAsset.isETH ? ETH : selectedAsset.tokenId ? ERC721 : ERC20
+	};
+}
+
+/**
+ * Sets transaction object to be sent
+ *
+ * @param {object} transaction - Transaction object with from, to, data, gas, gasPrice, value
+ */
+export function prepareTransaction(transaction) {
+	return {
+		type: 'PREPARE_TRANSACTION',
+		transaction
+	};
+}

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

@@ -155,6 +155,20 @@ exports[`App should render correctly 1`] = `
                       "getStateForAction": [Function],
                     },
                     "QRScanner": null,
+                    "SendFlowView": Object {
+                      "childRouters": Object {
+                        "Amount": null,
+                        "Confirm": null,
+                        "SendTo": null,
+                      },
+                      "getActionCreators": [Function],
+                      "getActionForPathAndParams": [Function],
+                      "getComponentForRouteName": [Function],
+                      "getComponentForState": [Function],
+                      "getPathAndParamsForState": [Function],
+                      "getScreenOptions": [Function],
+                      "getStateForAction": [Function],
+                    },
                     "SendView": Object {
                       "childRouters": Object {
                         "Send": null,
@@ -191,6 +205,8 @@ exports[`App should render correctly 1`] = `
                         "AdvancedSettings": null,
                         "ChoosePasswordSimple": null,
                         "CompanySettings": null,
+                        "ContactForm": null,
+                        "ContactsSettings": null,
                         "EnterPasswordSimple": null,
                         "ExperimentalSettings": null,
                         "GeneralSettings": null,
@@ -581,6 +597,20 @@ exports[`App should render correctly 1`] = `
                         "getStateForAction": [Function],
                       },
                       "QRScanner": null,
+                      "SendFlowView": Object {
+                        "childRouters": Object {
+                          "Amount": null,
+                          "Confirm": null,
+                          "SendTo": null,
+                        },
+                        "getActionCreators": [Function],
+                        "getActionForPathAndParams": [Function],
+                        "getComponentForRouteName": [Function],
+                        "getComponentForState": [Function],
+                        "getPathAndParamsForState": [Function],
+                        "getScreenOptions": [Function],
+                        "getStateForAction": [Function],
+                      },
                       "SendView": Object {
                         "childRouters": Object {
                           "Send": null,
@@ -617,6 +647,8 @@ exports[`App should render correctly 1`] = `
                           "AdvancedSettings": null,
                           "ChoosePasswordSimple": null,
                           "CompanySettings": null,
+                          "ContactForm": null,
+                          "ContactsSettings": null,
                           "EnterPasswordSimple": null,
                           "ExperimentalSettings": null,
                           "GeneralSettings": null,

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

@@ -163,6 +163,20 @@ exports[`Main should render correctly 1`] = `
               "getStateForAction": [Function],
             },
             "QRScanner": null,
+            "SendFlowView": Object {
+              "childRouters": Object {
+                "Amount": null,
+                "Confirm": null,
+                "SendTo": null,
+              },
+              "getActionCreators": [Function],
+              "getActionForPathAndParams": [Function],
+              "getComponentForRouteName": [Function],
+              "getComponentForState": [Function],
+              "getPathAndParamsForState": [Function],
+              "getScreenOptions": [Function],
+              "getStateForAction": [Function],
+            },
             "SendView": Object {
               "childRouters": Object {
                 "Send": null,
@@ -199,6 +213,8 @@ exports[`Main should render correctly 1`] = `
                 "AdvancedSettings": null,
                 "ChoosePasswordSimple": null,
                 "CompanySettings": null,
+                "ContactForm": null,
+                "ContactsSettings": null,
                 "EnterPasswordSimple": null,
                 "ExperimentalSettings": null,
                 "GeneralSettings": null,
@@ -469,6 +485,20 @@ exports[`Main should render correctly 1`] = `
                 "getStateForAction": [Function],
               },
               "QRScanner": null,
+              "SendFlowView": Object {
+                "childRouters": Object {
+                  "Amount": null,
+                  "Confirm": null,
+                  "SendTo": null,
+                },
+                "getActionCreators": [Function],
+                "getActionForPathAndParams": [Function],
+                "getComponentForRouteName": [Function],
+                "getComponentForState": [Function],
+                "getPathAndParamsForState": [Function],
+                "getScreenOptions": [Function],
+                "getStateForAction": [Function],
+              },
               "SendView": Object {
                 "childRouters": Object {
                   "Send": null,
@@ -505,6 +535,8 @@ exports[`Main should render correctly 1`] = `
                   "AdvancedSettings": null,
                   "ChoosePasswordSimple": null,
                   "CompanySettings": null,
+                  "ContactForm": null,
+                  "ContactsSettings": null,
                   "EnterPasswordSimple": null,
                   "ExperimentalSettings": null,
                   "GeneralSettings": null,

app/components/Nav/Main/index.js

@@ -30,6 +30,7 @@ import ExperimentalSettings from '../../Views/Settings/ExperimentalSettings';
 import NetworksSettings from '../../Views/Settings/NetworksSettings';
 import NetworkSettings from '../../Views/Settings/NetworksSettings/NetworkSettings';
 import AppInformation from '../../Views/Settings/AppInformation';
+import Contacts from '../../Views/Settings/Contacts';
 import Wallet from '../../Views/Wallet';
 import TransactionsView from '../../Views/TransactionsView';
 import SyncWithExtension from '../../Views/SyncWithExtension';
@@ -38,6 +39,7 @@ import AddAsset from '../../Views/AddAsset';
 import Collectible from '../../Views/Collectible';
 import CollectibleView from '../../Views/CollectibleView';
 import Send from '../../Views/Send';
+import SendTo from '../../Views/SendFlow/SendTo';
 import RevealPrivateCredential from '../../Views/RevealPrivateCredential';
 import WalletConnectSessions from '../../Views/WalletConnectSessions';
 import OfflineMode from '../../Views/OfflineMode';
@@ -87,6 +89,10 @@ import contractMap from 'eth-contract-metadata';
 import MessageSign from '../../UI/MessageSign';
 import WalletConnectReturnToBrowserModal from '../../UI/WalletConnectReturnToBrowserModal';
 import AsyncStorage from '@react-native-community/async-storage';
+import Amount from '../../Views/SendFlow/Amount';
+import Confirm from '../../Views/SendFlow/Confirm';
+import ContactForm from '../../Views/Settings/Contacts/ContactForm';
+import TransactionTypes from '../../../core/TransactionTypes';
 
 const styles = StyleSheet.create({
 	flex: {
@@ -203,6 +209,12 @@ const MainNavigator = createStackNavigator(
 				CompanySettings: {
 					screen: AppInformation
 				},
+				ContactsSettings: {
+					screen: Contacts
+				},
+				ContactForm: {
+					screen: ContactForm
+				},
 				SyncWithExtensionView: {
 					screen: SyncWithExtension
 				},
@@ -242,6 +254,19 @@ const MainNavigator = createStackNavigator(
 				}
 			})
 		},
+		SendFlowView: {
+			screen: createStackNavigator({
+				SendTo: {
+					screen: SendTo
+				},
+				Amount: {
+					screen: Amount
+				},
+				Confirm: {
+					screen: Confirm
+				}
+			})
+		},
 		ApprovalView: {
 			screen: createStackNavigator({
 				Approval: {
@@ -728,13 +753,19 @@ class Main extends PureComponent {
 			await TransactionController.updateTransaction(updatedTx);
 			await TransactionController.approveTransaction(transactionMeta.id);
 		} catch (error) {
-			Alert.alert(strings('transactions.transaction_error'), error && error.message, [{ text: 'OK' }]);
+			Alert.alert(strings('transactions.transaction_error'), error && error.message, [
+				{ text: strings('navigation.ok') }
+			]);
 			this.setState({ transactionHandled: false });
 		}
 	};
 
 	onUnapprovedTransaction = async transactionMeta => {
-		if (this.props.transaction.value || this.props.transaction.to) {
+		if (
+			this.props.transaction.value ||
+			this.props.transaction.to ||
+			transactionMeta.origin === TransactionTypes.MMM
+		) {
 			return;
 		}
 		// Check if it's a payment channel deposit transaction to sign

app/components/UI/AccountList/index.js

@@ -102,7 +102,11 @@ class AccountList extends PureComponent {
 		/**
 		 * Current provider ticker
 		 */
-		ticker: PropTypes.string
+		ticker: PropTypes.string,
+		/**
+		 * Whether it will show options to create or import accounts
+		 */
+		enableAccountsAddition: PropTypes.bool
 	};
 
 	state = {
@@ -150,6 +154,7 @@ class AccountList extends PureComponent {
 		const previousIndex = this.state.selectedAccountIndex;
 		const { PreferencesController } = Engine.context;
 		const { keyrings } = this.props;
+
 		requestAnimationFrame(async () => {
 			try {
 				this.mounted && this.setState({ selectedAccountIndex: newIndex });
@@ -158,6 +163,14 @@ class AccountList extends PureComponent {
 					keyrings && keyrings.length ? keyrings : Engine.context.KeyringController.state.keyrings;
 				const accountsOrdered = allKeyrings.reduce((list, keyring) => list.concat(keyring.accounts), []);
 
+				// If not enabled is used from address book so we don't change accounts
+				if (!this.props.enableAccountsAddition) {
+					this.props.onAccountChange(accountsOrdered[newIndex]);
+					const orderedAccounts = this.getAccounts();
+					this.mounted && this.setState({ orderedAccounts });
+					return;
+				}
+
 				PreferencesController.setSelectedAddress(accountsOrdered[newIndex]);
 
 				this.props.onAccountChange();
@@ -281,6 +294,7 @@ class AccountList extends PureComponent {
 
 	render() {
 		const { orderedAccounts } = this.state;
+		const { enableAccountsAddition } = this.props;
 		return (
 			<SafeAreaView style={styles.wrapper} testID={'account-list'}>
 				<View style={styles.titleWrapper}>
@@ -293,28 +307,30 @@ class AccountList extends PureComponent {
 					ref={this.flatList}
 					style={styles.accountsWrapper}
 					testID={'account-number-button'}
-					getItemLayout={(data, index) => ({ length: 80, offset: 80 * index, index })} // eslint-disable-line
+					getItemLayout={(_, index) => ({ length: 80, offset: 80 * index, index })} // eslint-disable-line
 				/>
-				<View style={styles.footer}>
-					<TouchableOpacity
-						style={styles.footerButton}
-						testID={'create-account-button'}
-						onPress={this.addAccount}
-					>
-						{this.state.loading ? (
-							<ActivityIndicator size="small" color={colors.blue} />
-						) : (
-							<Text style={styles.btnText}>{strings('accounts.create_new_account')}</Text>
-						)}
-					</TouchableOpacity>
-					<TouchableOpacity
-						onPress={this.importAccount}
-						style={styles.footerButton}
-						testID={'import-account-button'}
-					>
-						<Text style={styles.btnText}>{strings('accounts.import_account')}</Text>
-					</TouchableOpacity>
-				</View>
+				{enableAccountsAddition && (
+					<View style={styles.footer}>
+						<TouchableOpacity
+							style={styles.footerButton}
+							testID={'create-account-button'}
+							onPress={this.addAccount}
+						>
+							{this.state.loading ? (
+								<ActivityIndicator size="small" color={colors.blue} />
+							) : (
+								<Text style={styles.btnText}>{strings('accounts.create_new_account')}</Text>
+							)}
+						</TouchableOpacity>
+						<TouchableOpacity
+							onPress={this.importAccount}
+							style={styles.footerButton}
+							testID={'import-account-button'}
+						>
+							<Text style={styles.btnText}>{strings('accounts.import_account')}</Text>
+						</TouchableOpacity>
+					</View>
+				)}
 			</SafeAreaView>
 		);
 	}

app/components/UI/AccountSelect/index.js

@@ -176,11 +176,11 @@ class AccountSelect extends PureComponent {
 			const state = PaymentChannelsClient.getState();
 			mainBalance = `${state.balance} ${strings('unit.sai')}`;
 		} else if (primaryCurrency === 'ETH') {
-			mainBalance = renderFromWei(balance) + ' ' + getTicker(ticker);
-			secondaryBalance = weiToFiat(balance, conversionRate, currentCurrency.toUpperCase());
+			mainBalance = `${renderFromWei(balance)} ${getTicker(ticker)}`;
+			secondaryBalance = weiToFiat(balance, conversionRate, currentCurrency);
 		} else {
-			mainBalance = weiToFiat(balance, conversionRate, currentCurrency.toUpperCase());
-			secondaryBalance = renderFromWei(balance) + ' ' + getTicker(ticker);
+			mainBalance = weiToFiat(balance, conversionRate, currentCurrency);
+			secondaryBalance = `${renderFromWei(balance)} ${getTicker(ticker)}`;
 		}
 
 		return (

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

@@ -73,7 +73,6 @@ exports[`ActionModal should render correctly 1`] = `
           Object {
             "borderTopColor": "#bbc0c5",
             "borderTopWidth": 1,
-            "flex": 0,
             "flexDirection": "row",
             "padding": 16,
           }