Merge remote-tracking branch 'upstream/clearnet' into webrtc-calls

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",

stylesheets/_session.scss

@@ -1099,7 +1099,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 {
@@ -1126,6 +1127,7 @@ input {
   }
   .onion__node__country {
     margin: $session-margin-sm;
+    min-width: 150px;
   }
 
   .onion__growing-icon {

ts/components/conversation/Linkify.tsx

@@ -17,7 +17,6 @@ interface Props {
 }
 
 const SUPPORTED_PROTOCOLS = /^(http|https):/i;
-const HAS_AT = /@/;
 
 export class Linkify extends React.Component<Props> {
   public static defaultProps: Partial<Props> = {
@@ -49,7 +48,8 @@ export class Linkify extends React.Component<Props> {
       }
 
       const { url, text: originalText } = match;
-      if (SUPPORTED_PROTOCOLS.test(url) && !isLinkSneaky(url) && !HAS_AT.test(url)) {
+      const isLink = SUPPORTED_PROTOCOLS.test(url) && !isLinkSneaky(url);
+      if (isLink) {
         results.push(
           <a key={count++} href={url} onClick={this.handleClick}>
             {originalText}

ts/components/dialog/OnionStatusPathDialog.tsx

@@ -18,6 +18,8 @@ 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;
@@ -25,6 +27,25 @@ export type StatusLightType = {
   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);
@@ -68,14 +89,12 @@ const OnionPathModalInner = () => {
             {nodes.map((snode: Snode | any, index: number) => {
               let labelText = snode.label
                 ? snode.label
-                : `${countryLookup.byIso(ip2country(snode.ip))?.country} [${snode.ip}]`;
+                : `${countryLookup.byIso(ip2country(snode.ip))?.country}`;
               if (!labelText) {
                 labelText = window.i18n('unknownCountry');
               }
               return labelText ? (
-                <div className="onion__node__country" key={`country-${index}`}>
+                <OnionCountryDisplay index={index} labelText={labelText} snodeIp={snode.ip} />
-                  {labelText}
-                </div>
               ) : null;
             })}
           </Flex>

ts/components/session/conversation/SessionMessagesList.tsx

@@ -19,6 +19,7 @@ export const SessionMessagesList = (props: {
   scrollToQuoteMessage: (options: QuoteClickOptions) => Promise<void>;
 }) => {
   const messagesProps = useSelector(getSortedMessagesTypesOfSelectedConversation);
+
   return (
     <>
       {messagesProps.map(messageProps => {

ts/session/snode_api/SNodeAPI.ts

@@ -616,6 +616,12 @@ export const forceNetworkDeletion = async (): Promise<Array<string> | null> => {
                           snodeToMakeRequestTo.pubkey_ed25519
                         )} due to error: ${reason}: ${statusCode}`
                       );
+                      // if we tried to make the delete on a snode not in our swarm, just trigger a pRetry error so the outer block here finds new snodes to make the request to.
+                      if (statusCode === 421) {
+                        throw new pRetry.AbortError(
+                          '421 error on network delete_all. Retrying with a new snode'
+                        );
+                      }
                     } else {
                       window?.log?.warn(
                         `Could not delete data from ${ed25519Str(

ts/session/snode_api/onions.ts

@@ -37,6 +37,8 @@ export interface SnodeResponse {
 }
 
 export const NEXT_NODE_NOT_FOUND_PREFIX = 'Next node not found: ';
+export const ERROR_421_HANDLED_RETRY_REQUEST =
+  '421 handled. Retry this request with a new targetNode';
 
 export const CLOCK_OUT_OF_SYNC_MESSAGE_ERROR =
   'Your clock is out of sync with the network. Check your clock.';
@@ -494,9 +496,6 @@ export async function processOnionResponse({
   }
 }
 
-export const ERROR_421_HANDLED_RETRY_REQUEST =
-  '421 handled. Retry this request with a new targetNode';
-
 export const snodeHttpsAgent = new https.Agent({
   rejectUnauthorized: false,
 });
@@ -543,7 +542,7 @@ async function handle421InvalidSwarm({
       // the snode gave us the new swarm. Save it for the next retry
       window?.log?.warn(
         'Wrong swarm, now looking at snodes',
-        parsedBody.snodes.map((s: any) => s.pubkey_ed25519)
+        parsedBody.snodes.map((s: any) => ed25519Str(s.pubkey_ed25519))
       );
 
       await updateSwarmFor(associatedWith, parsedBody.snodes);

ts/session/snode_api/swarmPolling.ts

@@ -287,6 +287,7 @@ export class SwarmPolling {
         {
           minTimeout: 100,
           retries: 1,
+
           onFailedAttempt: e => {
             window?.log?.warn(
               `retrieveNextMessages attempt #${e.attemptNumber} failed. ${e.retriesLeft} retries left... ${e.name}`