Merge branch 'release/v0.35.2'

the commit.
stacks-archive · Jan 2, 2019 · ef45caa · ef45caa
2 parents 78ca616 + ccab270
commit ef45caa
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/app/js/store/reducers.js b/app/js/store/reducers.js
@@ -39,7 +39,7 @@ export function initializeStateVersion() {
  * and other state is regenerated.
  * @type {number}
  */
-export const CURRENT_VERSION: number = 15
+export const CURRENT_VERSION: number = 16
 
 const AppReducer = combineReducers({
   account: AccountReducer,

diff --git a/app/js/update/index.js b/app/js/update/index.js
@@ -164,6 +164,10 @@ class UpdatePage extends React.Component {
 
               // generate new account and IDs
               this.createAccount().then(() => this.createNewIds())
+              .then(() => this.props.refreshIdentities(
+                  this.props.api, 
+                  this.props.identityAddresses
+                ))
             }, 150)
         )
       })
@@ -357,6 +361,7 @@ UpdatePage.propTypes = {
   router: PropTypes.object,
   identityAddresses: PropTypes.array,
   createNewIdentityWithOwnerAddress: PropTypes.func.isRequired,
+  refreshIdentities: PropTypes.func.isRequired,
   setDefaultIdentity: PropTypes.func.isRequired,
   initializeWallet: PropTypes.func.isRequired,
   updateApi: PropTypes.func.isRequired,

diff --git a/app/js/update/views/initial.js b/app/js/update/views/initial.js
@@ -144,7 +144,7 @@ class PasswordView extends React.Component {
           onSubmit: () => console.log('submit for validation'),
           fields,
           actions: {
-            split: true,
+            split: false,
             items: [
               {
                 label: ' ',

diff --git a/native/macos/Blockstack/Blockstack/Info.plist b/native/macos/Blockstack/Blockstack/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.35.1</string>
+	<string>0.35.2</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>113</string>
+	<string>114</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/native/macos/Blockstack/BlockstackLauncher/Info.plist b/native/macos/Blockstack/BlockstackLauncher/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.35.1</string>
+	<string>0.35.2</string>
 	<key>CFBundleVersion</key>
-	<string>113</string>
+	<string>114</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSBackgroundOnly</key>

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "blockstack-browser",
   "description": "The Blockstack browser",
-  "version": "0.35.1",
+  "version": "0.35.2",
   "author": "Blockstack PBC <admin@blockstack.com>",
   "dependencies": {
     "bigi": "^1.4.2",