Merge branch 'release/v0.34.2'

stacks-archive · Oct 26, 2018 · f6bb52c · f6bb52c
2 parents 84ec3e2 + 7cd28ad
commit f6bb52c
Show file tree

Hide file tree

Showing 9 changed files with 9,670 additions and 7,255 deletions.
diff --git a/app/js/data/apps.js b/app/js/data/apps.js
@@ -369,7 +369,7 @@ const apps = {
       website: 'https://www.stealthy.im/',
       launchLink: 'https://www.stealthy.im/',
       developer: 'Prabhaav Bhardwaj',
-      status: 'user_ready_chat',
+      status: 'user_ready',
       storageRequired: true
     }, {
       name: 'Hermes',

diff --git a/app/js/profiles/components/registration/RegistrationSubmittedView.js b/app/js/profiles/components/registration/RegistrationSubmittedView.js
@@ -19,7 +19,7 @@ const RegistrationSubmittedView = (props) => {
         {bodyContent}
         <img
           role="presentation"
-          src="/images/blockstack-logo-vertical.svg"
+          src="/static/images/blockstack-logo-vertical.svg"
           className="m-b-20"
           style={{ width: '210px', display: 'block', marginRight: 'auto', marginLeft: 'auto' }}
         />

diff --git a/app/js/profiles/store/identity/actions.js b/app/js/profiles/store/identity/actions.js
@@ -394,6 +394,7 @@ function refreshIdentities(
                         `refreshIdentities: resolveZoneFileToProfile for ${nameOwned} error`,
                         error
                       )
+                      dispatch(updateProfile(index, DEFAULT_PROFILE, zoneFile))
                       resolve()
                       return Promise.resolve()
                     })

diff --git a/app/js/utils/window-utils.js b/app/js/utils/window-utils.js
@@ -11,10 +11,11 @@ export function isWindowsBuild() {
 }
 
 export function isWebAppBuild() {
-  const isWebAppBuildCompileFlag = false
-  return isWebAppBuildCompileFlag === true
+  const isWebAppCompileFlag = ( process.env.NODE_ENV === 'production' && typeof process.env.WEBAPP !== 'undefined' )
+  return isWebAppCompileFlag
 }
 
+
 /**
  * Will determine whether or not we should try to
  *  perform "private" core endpoint functions --

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.34.1</string>
+	<string>0.34.2</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>110</string>
+	<string>111</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.34.1</string>
+	<string>0.34.2</string>
 	<key>CFBundleVersion</key>
-	<string>100</string>
+	<string>111</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSBackgroundOnly</key>