Skip to content
This repository was archived by the owner on Apr 17, 2023. It is now read-only.

Commit ef45caa

Browse files
committed
Merge branch 'release/v0.35.2'
the commit.
2 parents 78ca616 + ccab270 commit ef45caa

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

app/js/store/reducers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export function initializeStateVersion() {
3939
* and other state is regenerated.
4040
* @type {number}
4141
*/
42-
export const CURRENT_VERSION: number = 15
42+
export const CURRENT_VERSION: number = 16
4343

4444
const AppReducer = combineReducers({
4545
account: AccountReducer,

app/js/update/index.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,10 @@ class UpdatePage extends React.Component {
164164

165165
// generate new account and IDs
166166
this.createAccount().then(() => this.createNewIds())
167+
.then(() => this.props.refreshIdentities(
168+
this.props.api,
169+
this.props.identityAddresses
170+
))
167171
}, 150)
168172
)
169173
})
@@ -357,6 +361,7 @@ UpdatePage.propTypes = {
357361
router: PropTypes.object,
358362
identityAddresses: PropTypes.array,
359363
createNewIdentityWithOwnerAddress: PropTypes.func.isRequired,
364+
refreshIdentities: PropTypes.func.isRequired,
360365
setDefaultIdentity: PropTypes.func.isRequired,
361366
initializeWallet: PropTypes.func.isRequired,
362367
updateApi: PropTypes.func.isRequired,

app/js/update/views/initial.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class PasswordView extends React.Component {
144144
onSubmit: () => console.log('submit for validation'),
145145
fields,
146146
actions: {
147-
split: true,
147+
split: false,
148148
items: [
149149
{
150150
label: ' ',

native/macos/Blockstack/Blockstack/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>0.35.1</string>
20+
<string>0.35.2</string>
2121
<key>CFBundleURLTypes</key>
2222
<array>
2323
<dict>
@@ -30,7 +30,7 @@
3030
</dict>
3131
</array>
3232
<key>CFBundleVersion</key>
33-
<string>113</string>
33+
<string>114</string>
3434
<key>LSApplicationCategoryType</key>
3535
<string>public.app-category.utilities</string>
3636
<key>LSMinimumSystemVersion</key>

native/macos/Blockstack/BlockstackLauncher/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>0.35.1</string>
20+
<string>0.35.2</string>
2121
<key>CFBundleVersion</key>
22-
<string>113</string>
22+
<string>114</string>
2323
<key>LSApplicationCategoryType</key>
2424
<string>public.app-category.utilities</string>
2525
<key>LSBackgroundOnly</key>

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "blockstack-browser",
33
"description": "The Blockstack browser",
4-
"version": "0.35.1",
4+
"version": "0.35.2",
55
"author": "Blockstack PBC <[email protected]>",
66
"dependencies": {
77
"bigi": "^1.4.2",

0 commit comments

Comments
 (0)