From ac47cd45948c20f555c15036bde104a7a19549a7 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Tue, 6 Oct 2020 21:07:39 -0400
Subject: [PATCH 1/6] interface: replace icons for group settings

---
 .../src/views/landscape/components/GroupSettings.tsx      | 4 ++--
 .../src/views/landscape/components/GroupSwitcher.tsx      | 4 ++--
 .../src/views/landscape/components/PopoverRoutes.tsx      | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/interface/src/views/landscape/components/GroupSettings.tsx b/pkg/interface/src/views/landscape/components/GroupSettings.tsx
index 7f21bc6fa..7b7d8c9a6 100644
--- a/pkg/interface/src/views/landscape/components/GroupSettings.tsx
+++ b/pkg/interface/src/views/landscape/components/GroupSettings.tsx
@@ -40,8 +40,8 @@ export function GroupSettings(props: GroupSettingsProps) {
   const { metadata } = association;
   const currentPrivate = "invite" in props.group.policy;
   const initialValues: FormSchema = {
-    name: metadata.title,
-    description: metadata.description,
+    name: metadata?.title,
+    description: metadata?.description,
     isPrivate: currentPrivate,
   };
 
diff --git a/pkg/interface/src/views/landscape/components/GroupSwitcher.tsx b/pkg/interface/src/views/landscape/components/GroupSwitcher.tsx
index f320d041b..e6c33d47c 100644
--- a/pkg/interface/src/views/landscape/components/GroupSwitcher.tsx
+++ b/pkg/interface/src/views/landscape/components/GroupSwitcher.tsx
@@ -127,7 +127,7 @@ export function GroupSwitcher(props: {
                       <Icon
                         mr={2}
                         color="gray"
-                        icon="Circle"
+                        icon="Node"
                       />
                       <Text> Participants</Text>
                     </GroupSwitcherItem>
@@ -156,7 +156,7 @@ export function GroupSwitcher(props: {
               <Box mr={1} flex='1'>
                 <Text overflow='hidden' display='inline-block' maxWidth='144px'  style={{ textOverflow: 'ellipsis', whiteSpace: 'pre'}}>{title}</Text>
               </Box>
-              <Icon mt="0px" display="block" icon="ChevronSouth" />
+              <Icon size='12px' ml='1' mt="0px" display="inline-block" icon="ChevronSouth" />
             </Box>
           </Dropdown>
           <Row collapse pr={1} justifyContent="flex-end" alignItems="center">
diff --git a/pkg/interface/src/views/landscape/components/PopoverRoutes.tsx b/pkg/interface/src/views/landscape/components/PopoverRoutes.tsx
index 11bd16c05..90a99aa29 100644
--- a/pkg/interface/src/views/landscape/components/PopoverRoutes.tsx
+++ b/pkg/interface/src/views/landscape/components/PopoverRoutes.tsx
@@ -25,7 +25,7 @@ const SidebarItem = ({ selected, icon, text, to }) => {
       px={3}
       py={1}
     >
-      <Icon icon={icon} />
+      <Icon icon={icon} mr='2'/>
       <Text color={selected ? "black" : "gray"}>{text}</Text>
     </HoverBoxLink>
   );
@@ -90,19 +90,19 @@ export function PopoverRoutes(
                     borderRightColor="washedGray"
                   >
                     <SidebarItem
-                      icon="Circle"
+                      icon="Node"
                       selected={view === "participants"}
                       to={relativeUrl("/participants")}
                       text="Participants"
                     />
                     <SidebarItem
-                      icon="Circle"
+                      icon="Gear"
                       selected={view === "settings"}
                       to={relativeUrl("/settings")}
                       text="Group Settings"
                     />
                     <SidebarItem
-                      icon="Circle"
+                      icon="Smiley"
                       selected={view === "profile"}
                       to={relativeUrl("/profile")}
                       text="Group Profile"

From 631f230f4e58f6d8f3e70ce328eab278576cd205 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Tue, 6 Oct 2020 21:19:35 -0400
Subject: [PATCH 2/6] interface: use cursor:pointer on buttons

---
 .../src/views/apps/chat/components/profile-overlay.js         | 2 +-
 .../src/views/apps/profile/components/lib/BucketList.tsx      | 2 +-
 .../src/views/apps/profile/components/lib/DisplayForm.tsx     | 2 +-
 .../src/views/apps/profile/components/lib/RemoteContent.tsx   | 2 +-
 .../src/views/apps/profile/components/lib/S3Form.tsx          | 2 +-
 .../src/views/apps/profile/components/lib/Security.tsx        | 4 ++--
 pkg/interface/src/views/apps/publish/components/Notebook.tsx  | 3 ++-
 pkg/interface/src/views/apps/publish/components/Settings.tsx  | 2 +-
 .../src/views/apps/publish/components/Subscribers.tsx         | 2 +-
 pkg/interface/src/views/components/RemoteContent.tsx          | 1 +
 pkg/interface/src/views/components/UnjoinedResource.tsx       | 2 +-
 11 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkg/interface/src/views/apps/chat/components/profile-overlay.js b/pkg/interface/src/views/apps/chat/components/profile-overlay.js
index 52c4d82a6..07a69183f 100644
--- a/pkg/interface/src/views/apps/chat/components/profile-overlay.js
+++ b/pkg/interface/src/views/apps/chat/components/profile-overlay.js
@@ -119,7 +119,7 @@ export class ProfileOverlay extends PureComponent {
           )}
           <div className="mono gray2">{cite(`~${ship}`)}</div>
           {!isOwn && (
-            <Button mt={2} width="100%" onClick={this.createAndRedirectToDM}>
+            <Button mt={2} width="100%" style={{ cursor: 'pointer' }} onClick={this.createAndRedirectToDM}>
               Send Message
             </Button>
           )}
diff --git a/pkg/interface/src/views/apps/profile/components/lib/BucketList.tsx b/pkg/interface/src/views/apps/profile/components/lib/BucketList.tsx
index cfe4725ba..335aad10c 100644
--- a/pkg/interface/src/views/apps/profile/components/lib/BucketList.tsx
+++ b/pkg/interface/src/views/apps/profile/components/lib/BucketList.tsx
@@ -93,7 +93,7 @@ export function BucketList({
           </Box>
         ))}
         <Input mt="2" label="New Bucket" id="newBucket" />
-        <Button mt="2" borderColor="washedGrey" type="submit">
+        <Button mt="2" style={{ cursor: 'pointer' }} borderColor="washedGrey" type="submit">
           Add
         </Button>
       </Form>
diff --git a/pkg/interface/src/views/apps/profile/components/lib/DisplayForm.tsx b/pkg/interface/src/views/apps/profile/components/lib/DisplayForm.tsx
index 952f94ceb..ef76a10fc 100644
--- a/pkg/interface/src/views/apps/profile/components/lib/DisplayForm.tsx
+++ b/pkg/interface/src/views/apps/profile/components/lib/DisplayForm.tsx
@@ -126,7 +126,7 @@ export default function DisplayForm(props: DisplayFormProps) {
               id="nicknames"
               caption="Do not show user-set nicknames"
             />
-            <Button border={1} borderColor="washedGray" type="submit">
+            <Button border={1} style={{ cursor: 'pointer' }} borderColor="washedGray" type="submit">
               Save
             </Button>
           </Box>
diff --git a/pkg/interface/src/views/apps/profile/components/lib/RemoteContent.tsx b/pkg/interface/src/views/apps/profile/components/lib/RemoteContent.tsx
index afd5fac5f..852a6ebe7 100644
--- a/pkg/interface/src/views/apps/profile/components/lib/RemoteContent.tsx
+++ b/pkg/interface/src/views/apps/profile/components/lib/RemoteContent.tsx
@@ -76,7 +76,7 @@ export default function RemoteContentForm(props: RemoteContentFormProps) {
               id="oembedShown"
               caption="Embedded content may contain scripts"
             />
-            <Button border={1} borderColor="washedGray" type="submit">
+            <Button style={{ cursor: 'pointer' }} border={1} borderColor="washedGray" type="submit">
               Save
             </Button>
           </Box>
diff --git a/pkg/interface/src/views/apps/profile/components/lib/S3Form.tsx b/pkg/interface/src/views/apps/profile/components/lib/S3Form.tsx
index 1647bda19..963e2feb1 100644
--- a/pkg/interface/src/views/apps/profile/components/lib/S3Form.tsx
+++ b/pkg/interface/src/views/apps/profile/components/lib/S3Form.tsx
@@ -78,7 +78,7 @@ export default function S3Form(props: S3FormProps) {
               label="Secret Access Key"
               id="s3secretAccessKey"
             />
-            <Button type="submit">Submit</Button>
+            <Button style={{ cursor: 'pointer' }} type="submit">Submit</Button>
           </Form>
         </Formik>
       </Col>
diff --git a/pkg/interface/src/views/apps/profile/components/lib/Security.tsx b/pkg/interface/src/views/apps/profile/components/lib/Security.tsx
index 0fdfaac52..fe8731906 100644
--- a/pkg/interface/src/views/apps/profile/components/lib/Security.tsx
+++ b/pkg/interface/src/views/apps/profile/components/lib/Security.tsx
@@ -19,7 +19,7 @@ export default function SecuritySettings({ api }: SecuritySettingsProps) {
       <Box fontSize={0} mt={2} color="gray">
         You will be logged out of your Urbit on this browser.
         <form method="post" action="/~/logout">
-          <Button narrow mt='4' border={1}>
+          <Button mt='4' border={1} style={{ cursor: 'pointer' }}>
             Logout
           </Button>
         </form>
@@ -31,7 +31,7 @@ export default function SecuritySettings({ api }: SecuritySettingsProps) {
         You will be logged out of all browsers that have currently logged into your Urbit.
         <form method="post" action="/~/logout">
           <input type="hidden" name="all" />
-          <Button error narrow mt={4} border={1}>
+          <Button destructive mt={4} border={1} style={{ cursor: 'pointer' }}>
             Logout
           </Button>
         </form>
diff --git a/pkg/interface/src/views/apps/publish/components/Notebook.tsx b/pkg/interface/src/views/apps/publish/components/Notebook.tsx
index eb3819eac..d8596941c 100644
--- a/pkg/interface/src/views/apps/publish/components/Notebook.tsx
+++ b/pkg/interface/src/views/apps/publish/components/Notebook.tsx
@@ -108,7 +108,7 @@ export class Notebook extends PureComponent<
         <Row justifyContent={["flex-start", "flex-end"]}>
           {isWriter && (
             <Link to={relativePath("/new")}>
-              <Button primary border>
+              <Button primary border style={{ cursor: 'pointer' }}>
                 New Post
               </Button>
             </Link>
@@ -124,6 +124,7 @@ export class Notebook extends PureComponent<
               <Button
                 ml={isWriter ? 2 : 0}
                 destructive
+                style={{ cursor: 'pointer' }}
                 onClick={() => {
                   this.setState({ isUnsubscribing: true });
                   api.publish
diff --git a/pkg/interface/src/views/apps/publish/components/Settings.tsx b/pkg/interface/src/views/apps/publish/components/Settings.tsx
index 6e0cd7b43..8eac7fa80 100644
--- a/pkg/interface/src/views/apps/publish/components/Settings.tsx
+++ b/pkg/interface/src/views/apps/publish/components/Settings.tsx
@@ -56,7 +56,7 @@ export function Settings(props: SettingsProps) {
           Permanently delete this notebook. (All current members will no longer
           see this notebook.)
         </Label>
-        <Button mt="2" onClick={onDelete} destructive>
+        <Button mt="2" onClick={onDelete} destructive style={{ cursor: 'pointer' }}>
           Delete this notebook
         </Button>
       </Col>
diff --git a/pkg/interface/src/views/apps/publish/components/Subscribers.tsx b/pkg/interface/src/views/apps/publish/components/Subscribers.tsx
index db986541f..6124f8377 100644
--- a/pkg/interface/src/views/apps/publish/components/Subscribers.tsx
+++ b/pkg/interface/src/views/apps/publish/components/Subscribers.tsx
@@ -82,7 +82,7 @@ export class Subscribers extends Component<SubscribersProps> {
     return (
       <Box mt="3">
         { role === 'admin' && (
-          <Button mb={3} border onClick={this.addAll}>
+          <Button mb={3} border onClick={this.addAll} style={{ cursor: 'pointer' }}>
             Add all members as writers
           </Button>
         )}
diff --git a/pkg/interface/src/views/components/RemoteContent.tsx b/pkg/interface/src/views/components/RemoteContent.tsx
index 28ed350b7..14384281e 100644
--- a/pkg/interface/src/views/components/RemoteContent.tsx
+++ b/pkg/interface/src/views/components/RemoteContent.tsx
@@ -151,6 +151,7 @@ export default class RemoteContent extends PureComponent<RemoteContentProps, Rem
             style={{ display: 'inline-flex', height: '1.66em' }} // Height is hacked to line-height until Button supports proper size
             ml={1}
             onClick={this.unfoldEmbed}
+            style={{ cursor: 'pointer' }}
           >
             {this.state.unfold ? 'collapse' : 'expand'}
           </Button> : null}
diff --git a/pkg/interface/src/views/components/UnjoinedResource.tsx b/pkg/interface/src/views/components/UnjoinedResource.tsx
index 91d202965..110820773 100644
--- a/pkg/interface/src/views/components/UnjoinedResource.tsx
+++ b/pkg/interface/src/views/components/UnjoinedResource.tsx
@@ -87,7 +87,7 @@ export function UnjoinedResource(props: UnjoinedResourceProps) {
         <Box mb={4}>
           <RichText color="gray">{description}</RichText>
         </Box>
-        <StatelessAsyncButton onClick={onJoin} mx="auto" border>
+        <StatelessAsyncButton onClick={onJoin} mx="auto" border style={{ cursor: 'pointer' }}>
           Join Channel
         </StatelessAsyncButton>
       </Col>

From 5d600fcc1ff0a6aa84ba4aad4a9298a8798cc1f9 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Tue, 6 Oct 2020 21:22:29 -0400
Subject: [PATCH 3/6] interface: loading spinner should have gray bg

---
 pkg/interface/src/views/components/AsyncButton.tsx          | 2 +-
 pkg/interface/src/views/components/StatelessAsyncButton.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/interface/src/views/components/AsyncButton.tsx b/pkg/interface/src/views/components/AsyncButton.tsx
index 86f90dc3c..fcb6cb721 100644
--- a/pkg/interface/src/views/components/AsyncButton.tsx
+++ b/pkg/interface/src/views/components/AsyncButton.tsx
@@ -38,7 +38,7 @@ export function AsyncButton({
       {isSubmitting ? (
         <LoadingSpinner
           foreground={rest.primary ? "white" : 'black'}
-          background="transparent"
+          background="gray"
           awaiting
           text={loadingText}
         />
diff --git a/pkg/interface/src/views/components/StatelessAsyncButton.tsx b/pkg/interface/src/views/components/StatelessAsyncButton.tsx
index 6c2aa48fc..fedccd73e 100644
--- a/pkg/interface/src/views/components/StatelessAsyncButton.tsx
+++ b/pkg/interface/src/views/components/StatelessAsyncButton.tsx
@@ -44,7 +44,7 @@ export function StatelessAsyncButton({
       ) : state === "loading" ? (
         <LoadingSpinner
           foreground={rest.primary ? "white" : "black"}
-          background="transparent"
+          background="gray"
         />
       ) : state === "success" ? (
         "Done"

From 2e54e7c833824433d5e805ff295e93e20d4b8fe5 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Tue, 6 Oct 2020 21:41:31 -0400
Subject: [PATCH 4/6] interface: prevent profileoverlay crash, redirect
 properly

---
 .../apps/chat/components/profile-overlay.js   | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkg/interface/src/views/apps/chat/components/profile-overlay.js b/pkg/interface/src/views/apps/chat/components/profile-overlay.js
index 07a69183f..03f51f978 100644
--- a/pkg/interface/src/views/apps/chat/components/profile-overlay.js
+++ b/pkg/interface/src/views/apps/chat/components/profile-overlay.js
@@ -73,7 +73,7 @@ export class ProfileOverlay extends PureComponent {
   }
 
   render() {
-    const { contact, ship, color, topSpace, bottomSpace, group, association, hideNicknames, hideAvatars } = this.props;
+    const { contact, ship, color, topSpace, bottomSpace, group, association, hideNicknames, hideAvatars, history } = this.props;
 
     let top, bottom;
     if (topSpace < OVERLAY_HEIGHT / 2) {
@@ -104,6 +104,8 @@ export class ProfileOverlay extends PureComponent {
     /*if (!group.hidden) {
     }*/
 
+    const isHidden = group.hidden;
+
     return (
       <div
         ref={this.popoverRef}
@@ -123,14 +125,16 @@ export class ProfileOverlay extends PureComponent {
               Send Message
             </Button>
           )}
-          {isOwn && !group.hidden (
-            <Link
-              to={'/~profile/identity'}
-              className="b--black b--white-d ba black white-d mt3 tc pa2 pointer db"
+          {(isOwn) ? (
+            <Button
+              mt='2'
+              width='100%'
+              style={{ cursor: 'pointer '}}
+              onClick={() => (isHidden) ? history.push('/~profile/identity') : history.push(`${history.location.pathname}/popover/profile`)}
             >
-              Edit Group Identity
-            </Link>
-          )}
+              Edit Identity
+            </Button>
+          ) : <div />}
         </div>
       </div>
     );

From db6d32286129d100c8c739ef5755cdcec81f38d3 Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde.park@sunshinegardens.org>
Date: Tue, 6 Oct 2020 21:45:48 -0400
Subject: [PATCH 5/6] interface: amend sidebar to use 'adjust'

---
 .../views/landscape/components/Sidebar/SidebarListHeader.tsx    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/interface/src/views/landscape/components/Sidebar/SidebarListHeader.tsx b/pkg/interface/src/views/landscape/components/Sidebar/SidebarListHeader.tsx
index 6f243aea7..b1a224e37 100644
--- a/pkg/interface/src/views/landscape/components/Sidebar/SidebarListHeader.tsx
+++ b/pkg/interface/src/views/landscape/components/Sidebar/SidebarListHeader.tsx
@@ -70,7 +70,7 @@ export function SidebarListHeader(props: {
           </FormikOnBlur>
         }
       >
-        <Icon color="gray" icon="Menu" />
+        <Icon color="gray" icon="Adjust" />
       </Dropdown>
     </Row>
   );

From 9d5645f8d7e4eaa4fe281454a1a15c3d4c77e6dd Mon Sep 17 00:00:00 2001
From: Matilde Park <matilde@tlon.io>
Date: Wed, 7 Oct 2020 00:32:29 -0400
Subject: [PATCH 6/6] interface: fix default app tiles linking as anchor

---
 .../src/views/apps/launch/components/tiles/tile.js          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/interface/src/views/apps/launch/components/tiles/tile.js b/pkg/interface/src/views/apps/launch/components/tiles/tile.js
index ca65f07aa..a76baa34d 100644
--- a/pkg/interface/src/views/apps/launch/components/tiles/tile.js
+++ b/pkg/interface/src/views/apps/launch/components/tiles/tile.js
@@ -10,7 +10,7 @@ import { Box } from "@tlon/indigo-react";
 export default class Tile extends React.Component {
   render() {
     const { bg, to, p, ...props } = this.props;
-    
+
     let childElement = (
       <Box p={typeof p === 'undefined' ? 2 : p} bg={bg} width="100%" height="100%">
         {props.children}
@@ -18,12 +18,12 @@ export default class Tile extends React.Component {
     );
 
     if (to) {
-      if (routeList.indexOf(to) === -1) {
+      if (routeList.indexOf(to) !== -1 || to === '/~landscape/home' || to === '/~profile') {
         childElement= (<Link to={to}>{childElement}</Link>);
       } else {
         childElement= (<a href={to}>{childElement}</a>);
       }
-      
+
     }
 
     return (