Merge branch 'release/v0.34.1'

stacks-archive · Sep 28, 2018 · e4cdacb · e4cdacb
2 parents 1f37f97 + 4bad63d
commit e4cdacb
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 23 deletions.
diff --git a/app/js/auth/views/initial.js b/app/js/auth/views/initial.js
@@ -20,6 +20,7 @@ const Accounts = ({ list, handleClick, processing, selectedIndex }) => {
           loading={processing && i === selectedIndex}
           disabled={processing}
           placeholder="Signing in..."
+          style={{ transform: 'translate3d(0,0,0)' }}
           hideID
         />
       )
@@ -102,7 +103,7 @@ const InitialScreen = ({
             app={app}
             appDomain={appDomain}
           />
-          <Buttons column overflow>
+          <Buttons flexDirection="column" overflow>
             <Accounts
               list={accounts}
               handleClick={login}

diff --git a/app/js/components/ui/containers/user.js b/app/js/components/ui/containers/user.js
@@ -5,7 +5,7 @@ import { User } from '@blockstack/ui/components/user'
 import CheckIcon from 'mdi-react/CheckIcon'
 import ChevronRightIcon from 'mdi-react/ChevronRightIcon'
 import Image from '@components/Image'
-import {Flex} from '@components/ui/components/primitives'
+import { Flex } from '@components/ui/components/primitives'
 
 const UserAvatar = ({
   id,
@@ -35,38 +35,47 @@ const UserAvatar = ({
         }}
       />
     ) : (
-      <Flex>{username ? firstLetter(username || '?') : <CheckIcon size={42} color="white" />}</Flex>
+      <Flex>
+        {username ? (
+          firstLetter(username || '?')
+        ) : (
+          <CheckIcon size={42} color="white" />
+        )}
+      </Flex>
     )}
     {camera && <User.Avatar.Camera />}
   </User.Avatar>
 )
 
 const UserButton = ({ username, id, hideID, avatarUrl, ...rest }) => (
-  <Button height={56} primary padding="5px" labelProps={{width: '100%'}} {...rest}>
+  <Button
+    height={56}
+    primary
+    padding="5px"
+    labelProps={{ width: '100%' }}
+    {...rest}
+  >
     <Button.Section>
-      <UserAvatar
-        username={username}
-        avatarUrl={avatarUrl}
-        id={id}
-      />
+      <UserAvatar username={username} avatarUrl={avatarUrl} id={id} />
     </Button.Section>
     <Button.Section
-      grow
-      column
-      padding="0 10px"
-      align="flex-start"
-      justify="center"
+      style={{ flexGrow: 1 }}
+      flexDirection="column"
+      px="10px"
+      alignItems="flex-start"
+      justifyContent="center"
       cd
       maxWidth="calc(100% - 102px) !important"
     >
-      <Type.p color="rgba(255,255,255,1)" overflow>
+      <Type.p color="rgba(255,255,255,1)" textAlign="left" width="100%" overflow>
         {username.includes('.') ? (
           <>
             <span style={{ color: 'rgba(255,255,255,1)' }}>
               {username.substr(0, username.indexOf('.'))}
             </span>
             <span style={{ color: 'rgba(255,255,255,0.5' }}>
-              .{username
+              .
+              {username
                 .split('.')
                 .slice(1)
                 .join('.')}
@@ -79,7 +88,12 @@ const UserButton = ({ username, id, hideID, avatarUrl, ...rest }) => (
       {id &&
         !hideID && <Type.small color="rgba(255,255,255,0.5)">{id}</Type.small>}
     </Button.Section>
-    <Button.Section align="center" justify="center" padding="0 10px 0 10px" mr='auto'>
+    <Button.Section
+      align="center"
+      justify="center"
+      padding="0 10px 0 10px"
+      mr="auto"
+    >
       <ChevronRightIcon size={24} color="white" />
     </Button.Section>
   </Button>

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

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