Minor Bugfixes (#1143)

* Change instapay endpoint * version bump * fix instapay endpoint * recreate accounts and keep selected account * update changelog * preserve prefs * fix unit tests
MetaMask · Oct 7, 2019 · 2f485d8 · 2f485d8
1 parent 0e458fd
commit 2f485d8
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Current Develop Branch
 
+## v0.2.7 - Oct 7 2019
+- [#1143](https://github.com/MetaMask/metamask-mobile/pull/1143): Minor bugfixes (#1143)
+
 ## v0.2.6 - Oct 4 2019
 - [#1139](https://github.com/MetaMask/metamask-mobile/pull/1139): Fix onboarding carousel dimensions (#1139)
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -174,8 +174,8 @@ android {
         applicationId "io.metamask"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 19
-        versionName "0.2.6"
+        versionCode 20
+        versionName "0.2.7"
         multiDexEnabled true
         testBuildType System.getProperty('testBuildType', 'debug')
         missingDimensionStrategy "minReactNative", "minReactNative46"

diff --git a/app/components/Views/ChoosePassword/index.js b/app/components/Views/ChoosePassword/index.js
@@ -162,7 +162,11 @@ class ChoosePassword extends PureComponent {
 		 * The action to update the lock time
 		 * in the redux store
 		 */
-		setLockTime: PropTypes.func
+		setLockTime: PropTypes.func,
+		/**
+		 * A string representing the selected address => account
+		 */
+		selectedAddress: PropTypes.string
 	};
 
 	state = {
@@ -206,10 +210,31 @@ class ChoosePassword extends PureComponent {
 		} else {
 			try {
 				this.setState({ loading: true });
-				const { KeyringController } = Engine.context;
+				const { KeyringController, PreferencesController } = Engine.context;
 				const mnemonic = await KeyringController.exportSeedPhrase('');
 				const seed = JSON.stringify(mnemonic).replace(/"/g, '');
+				// Preserve the selected address
+				const selectedAddress = this.props.selectedAddress;
+				// Preserve the keyring before restoring
+				const hdKeyring = KeyringController.state.keyrings[0];
+				// Preserve all the prefs
+				const prefs = PreferencesController.state;
+				const existingAccountCount = hdKeyring.accounts.length;
+				// Recreate keyring
 				await KeyringController.createNewVaultAndRestore(this.state.password, seed);
+				for (let i = 0; i < existingAccountCount - 1; i++) {
+					await KeyringController.addNewAccount();
+				}
+
+				// Set prefs again
+				await PreferencesController.update(prefs);
+
+				// Reselect previous selected account if still available
+				if (hdKeyring.accounts.includes(selectedAddress)) {
+					await PreferencesController.update({ selectedAddress });
+				} else {
+					await PreferencesController.update({ selectedAddress: hdKeyring[0] });
+				}
 
 				if (this.state.biometryType) {
 					const authOptions = {
@@ -518,12 +543,16 @@ class ChoosePassword extends PureComponent {
 	}
 }
 
+const mapStateToProps = state => ({
+	selectedAddress: state.engine.backgroundState.PreferencesController.selectedAddress
+});
+
 const mapDispatchToProps = dispatch => ({
 	passwordSet: () => dispatch(passwordSet()),
 	setLockTime: time => dispatch(setLockTime(time))
 });
 
 export default connect(
-	null,
+	mapStateToProps,
 	mapDispatchToProps
 )(ChoosePassword);
diff --git a/app/components/Views/ChoosePassword/index.test.js b/app/components/Views/ChoosePassword/index.test.js
@@ -13,6 +13,13 @@ describe('ChoosePassword', () => {
 			user: {
 				passwordSet: true,
 				seedphraseBackedUp: false
+			},
+			engine: {
+				backgroundState: {
+					PreferencesController: {
+						selectedAddress: '0xe7E125654064EEa56229f273dA586F10DF96B0a1'
+					}
+				}
 			}
 		};
 

diff --git a/app/core/PaymentChannelsClient.js b/app/core/PaymentChannelsClient.js
@@ -20,7 +20,7 @@ const {
 
 // eslint-disable-next-line
 const createInfuraProvider = require('eth-json-rpc-infura/src/createProvider');
-const PUBLIC_URL = 'https://daicard.io';
+const PUBLIC_URL = 'hub.connext.network';
 
 const { hasPendingOps } = new Connext.Utils();
 // Constants for channel max/min - this is also enforced on the hub
@@ -94,10 +94,10 @@ class PaymentChannelsClient {
 		const ethprovider = new EthQuery(infuraProvider);
 		switch (type) {
 			case 'rinkeby':
-				hubUrl = `${PUBLIC_URL}/api/rinkeby/hub`;
+				hubUrl = `https://rinkeby.${PUBLIC_URL}/api/hub`;
 				break;
 			case 'mainnet':
-				hubUrl = `${PUBLIC_URL}/api/mainnet/hub`;
+				hubUrl = `https://mainnet.${PUBLIC_URL}/api/hub`;
 				break;
 			default:
 				throw new Error(`Unrecognized network: ${type}`);

diff --git a/ios/MetaMask.xcodeproj/project.pbxproj b/ios/MetaMask.xcodeproj/project.pbxproj
@@ -2537,7 +2537,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 					"\"$(SRCROOT)/MetaMask\"",
 				);
-				MARKETING_VERSION = 0.2.6;
+				MARKETING_VERSION = 0.2.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2605,7 +2605,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 					"\"$(SRCROOT)/MetaMask\"",
 				);
-				MARKETING_VERSION = 0.2.6;
+				MARKETING_VERSION = 0.2.7;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "private": true,
   "scripts": {
     "restart-packager-clean": "watchman watch-del-all && rm -rf $TMPDIR/react-* && yarn start -- --reset-cache",