Finish merge with v1.0.3

Signed-off-by: Marquis Kurt <software@marquiskurt.net>

package-lock.json

@@ -1064,9 +1064,9 @@
       },
       "dependencies": {
         "@babel/runtime": {
-          "version": "7.6.3",
-          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.6.3.tgz",
-          "integrity": "sha512-kq6anf9JGjW8Nt5rYfEuGRaEAaH1mkv3Bbu6rYvLOpPh/RusSJXuKPEAoZ7L7gybZkchE8+NV5g9vKF4AGAtsA==",
+          "version": "7.7.2",
+          "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.2.tgz",
+          "integrity": "sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw==",
           "dev": true,
           "requires": {
             "regenerator-runtime": "^0.13.2"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperspace",
-  "productName": "Hyperspace",
+  "productName": "Hyperspace Desktop",
   "version": "1.1.0-beta1",
   "description": "A beautiful, fluffy client for the fediverse",
   "author": "Marquis Kurt <hyperspacedev@marquiskurt.net>",

public/electron.js

@@ -375,7 +375,7 @@ function createMenubar() {
             role: 'help',
             submenu: [
                 {
-                    label: 'Hyperspace Docs',
+                    label: 'Hyperspace Desktop Docs',
                     click () { require('electron').shell.openExternal('https://hyperspace.marquiskurt.net/docs/') }
                 },
                 {
@@ -396,7 +396,7 @@ function createMenubar() {
             label: app.getName(),
             submenu: [
                 {
-                    label: 'About Hyperspace',
+                    label: 'About Hyperspace Desktop',
                     click() {
                         safelyGoTo("hyperspace://hyperspace/app/#/about")
                     }

src/components/AppLayout/AppLayout.tsx

@@ -287,7 +287,7 @@ export class AppLayout extends Component<any, IAppLayoutState> {
                         {this.state.brandName
                             ? this.state.brandName
                             : "Hyperspace"}{" "}
-                        {this.state.developerMode ? "(Beta)" : null}
+                        Desktop {this.state.developerMode ? "(Beta)" : null}
                     </Typography>
                 </div>
             );
@@ -295,7 +295,7 @@ export class AppLayout extends Component<any, IAppLayoutState> {
             return (
                 <div className={classes.titleBarRoot}>
                     <Typography className={classes.titleBarText}>
-                        Careful: you're running in developer mode.
+                        🛠 Careful: you're running in developer mode.
                     </Typography>
                 </div>
             );

src/components/Post/Post.tsx

@@ -646,7 +646,7 @@ export class Post extends React.Component<any, IPostState> {
                             />
                         }
                         action={
-                            <Tooltip title="More">
+                            <Tooltip title="More" placement="left">
                                 <IconButton
                                     key={`${post.id}_submenu`}
                                     id={`${post.id}_submenu`}

src/index.tsx

@@ -22,12 +22,6 @@ if (userLoggedIn()) {
     refreshUserAccountData();
 }
 
-window.onstorage = (event: any) => {
-    if (event.key == "account") {
-        window.location.reload();
-    }
-};
-
 ReactDOM.render(
     <HashRouter>
         <SnackbarProvider

src/pages/About.tsx

@@ -23,11 +23,9 @@ import AssignmentIcon from "@material-ui/icons/Assignment";
 import AssignmentIndIcon from "@material-ui/icons/AssignmentInd";
 import NetworkCheckIcon from "@material-ui/icons/NetworkCheck";
 import UpdateIcon from "@material-ui/icons/Update";
-import InfoIcon from "@material-ui/icons/Info";
 import NotesIcon from "@material-ui/icons/Notes";
 import CodeIcon from "@material-ui/icons/Code";
 import TicketAccountIcon from "mdi-material-ui/TicketAccount";
-import MastodonIcon from "mdi-material-ui/Mastodon";
 import EditIcon from "@material-ui/icons/Edit";
 import VpnKeyIcon from "@material-ui/icons/VpnKey";
 
@@ -107,9 +105,16 @@ class AboutPage extends Component<any, IAboutPageState> {
         });
     }
 
+    shouldRenderInstanceContact(): boolean {
+        if (this.state.instance != null) {
+            return this.state.instance.version.match(/Pleroma/) == null;
+        } else {
+            return false;
+        }
+    }
+
     render() {
         const { classes } = this.props;
-
         return (
             <div className={classes.pageLayoutConstraints}>
                 <Paper>
@@ -139,7 +144,7 @@ class AboutPage extends Component<any, IAboutPageState> {
                             <Typography variant="h4" component="p">
                                 {this.state.brandName
                                     ? this.state.brandName
-                                    : "Hyperspace"}
+                                    : "Hyperspace Desktop"}
                             </Typography>
                             <Typography>
                                 Version{" "}
@@ -297,7 +302,7 @@ class AboutPage extends Component<any, IAboutPageState> {
                         </div>
                     </div>
                     <List className={classes.pageListConstraints}>
-                        {localStorage["isPleroma"] == "false" && (
+                        {this.shouldRenderInstanceContact() ? (
                             <ListItem>
                                 <ListItemAvatar>
                                     <LinkableAvatar
@@ -352,7 +357,7 @@ class AboutPage extends Component<any, IAboutPageState> {
                                     </Tooltip>
                                 </ListItemSecondaryAction>
                             </ListItem>
-                        )}
+                        ) : null}
                         <ListItem>
                             <ListItemAvatar>
                                 <Avatar>
@@ -470,8 +475,8 @@ class AboutPage extends Component<any, IAboutPageState> {
                         developers. All rights reserved.
                     </Typography>
                     <Typography variant="caption" paragraph>
-                        {this.state ? this.state.brandName : "Hyperspace"} is
-                        made possible by the{" "}
+                        {this.state ? this.state.brandName : "Hyperspace"}{" "}
+                        Desktop is made possible by the{" "}
                         <Link
                             href={"https://material-ui.com"}
                             target="_blank"

src/utilities/accounts.tsx

@@ -25,12 +25,6 @@ export function refreshUserAccountData() {
         .catch((err: Error) => {
             console.error(err.message);
         });
-    client.get("/instance").then((resp: any) => {
-        localStorage.setItem(
-            "isPleroma",
-            resp.data.version.match(/Pleroma/) ? "true" : "false"
-        );
-    });
 }
 
 /**