Merge pull request #1938 from oxen-io/clearnet

Session v1.7.3
oxen-io · Sep 22, 2021 · 6593011 · 6593011
2 parents 6286ac8 + 6de594b
commit 6593011
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 7 deletions.
diff --git a/_locales/en/messages.json b/_locales/en/messages.json
@@ -441,5 +441,7 @@
   "deletionTypeTitle": "Deletion Type",
   "deleteJustForMe": "Delete just for me",
   "messageDeletedPlaceholder": "This message has been deleted",
-  "messageDeleted": "Message deleted"
+  "messageDeleted": "Message deleted",
+  "surveyTitle": "Take our Session Survey",
+  "goToOurSurvey": "Go to our survey"
 }
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "session-desktop",
   "productName": "Session",
   "description": "Private messaging from your desktop",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "license": "GPL-3.0",
   "author": {
     "name": "Loki Project",

diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
@@ -1094,7 +1094,8 @@ input {
   display: flex;
   flex-direction: column;
   margin: $session-margin-sm;
-  align-items: flex-start;
+  align-items: center;
+  min-width: 10vw;
   position: relative;
 
   .onion__node {
@@ -1121,6 +1122,7 @@ input {
   }
   .onion__node__country {
     margin: $session-margin-sm;
+    min-width: 150px;
   }
 
   .onion__growing-icon {

diff --git a/ts/components/dialog/OnionStatusPathDialog.tsx b/ts/components/dialog/OnionStatusPathDialog.tsx
@@ -19,13 +19,34 @@ import { Flex } from '../basic/Flex';
 import { SessionIcon, SessionIconButton } from '../session/icon';
 import { SessionSpinner } from '../session/SessionSpinner';
 import { SessionWrapperModal } from '../session/SessionWrapperModal';
+// tslint:disable-next-line: no-submodule-imports
+import useHover from 'react-use/lib/useHover';
 
 export type StatusLightType = {
   glowStartDelay: number;
   glowDuration: number;
   color?: string;
 };
 
+const OnionCountryDisplay = ({
+  index,
+  labelText,
+  snodeIp,
+}: {
+  snodeIp?: string;
+  labelText: string;
+  index: number;
+}) => {
+  const element = (hovered: boolean) => (
+    <div className="onion__node__country" key={`country-${index}`}>
+      {hovered && snodeIp ? snodeIp : labelText}
+    </div>
+  );
+  const [hoverable] = useHover(element);
+
+  return hoverable;
+};
+
 const OnionPathModalInner = () => {
   const onionPath = useSelector(getFirstOnionPath);
   const isOnline = useSelector(getIsOnline);
@@ -69,14 +90,12 @@ const OnionPathModalInner = () => {
             {nodes.map((snode: Snode | any, index: number) => {
               let labelText = snode.label
                 ? snode.label
-                : countryLookup.byIso(ip2country(snode.ip))?.country;
+                : `${countryLookup.byIso(ip2country(snode.ip))?.country}`;
               if (!labelText) {
                 labelText = window.i18n('unknownCountry');
               }
               return labelText ? (
-                <div className="onion__node__country" key={`country-${index}`}>
-                  {labelText}
-                </div>
+                <OnionCountryDisplay index={index} labelText={labelText} snodeIp={snode.ip} />
               ) : null;
             })}
           </Flex>

diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx
@@ -463,6 +463,23 @@ class SettingsViewInner extends React.Component<SettingsViewProps, State> {
           info: (value: number) => `${value}%`,
         },
       },
+      {
+        id: 'session-survey',
+        title: window.i18n('surveyTitle'),
+        description: undefined,
+        hidden: false,
+        type: SessionSettingType.Button,
+        category: SessionSettingCategory.Appearance,
+        setFn: undefined,
+        comparisonValue: undefined,
+        onClick: () => {
+          void shell.openExternal('https://getsession.org/survey');
+        },
+        content: {
+          buttonText: window.i18n('goToOurSurvey'),
+          buttonColor: SessionButtonColor.Primary,
+        },
+      },
       {
         id: 'help-translation',
         title: window.i18n('translation'),