Merge branch 'release/v0.22.0'

stacks-archive · Jan 12, 2018 · 7c80d37 · 7c80d37
2 parents 062e31c + abddde1
commit 7c80d37
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/app/js/auth/components/AuthModal.js b/app/js/auth/components/AuthModal.js
@@ -264,7 +264,6 @@ class AuthModal extends Component {
     }
 
     let profileResponseData
-
     if (this.state.decodedToken.payload.do_not_include_profile) {
       profileResponseData = null
     } else {
@@ -274,7 +273,11 @@ class AuthModal extends Component {
     let transitPublicKey = undefined
     let hubUrl = undefined
 
-    const requestVersion = this.state.decodedToken.payload.version
+    let requestVersion = '0'
+    if (this.state.decodedToken.payload.hasOwnProperty('version')) {
+      requestVersion = this.state.decodedToken.payload.version
+    }
+
     if (isLaterVersion(requestVersion, '1.1.0') &&
         this.state.decodedToken.payload.public_keys.length > 0) {
       transitPublicKey = this.state.decodedToken.payload.public_keys[0]
@@ -469,7 +472,7 @@ class AuthModal extends Component {
         </ToolTip>
         <ToolTip id="scope-publish">
           <div>
-            <div>The app may publish data so that other users of the app can discover 
+            <div>The app may publish data so that other users of the app can discover
             and interact with you.
             </div>
           </div>

diff --git a/native/macos/Blockstack/Blockstack/Info.plist b/native/macos/Blockstack/Blockstack/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>82</string>
+	<string>83</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
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.22.0</string>
 	<key>CFBundleVersion</key>
-	<string>82</string>
+	<string>83</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSBackgroundOnly</key>