allow cancel linking

js/background.js

@@ -1373,15 +1373,20 @@
     Whisper.events.on('devicePairingRequestReceivedNoListener', async () => {
       // If linking limit has been reached, let master know.
       const ourKey = textsecure.storage.user.getNumber();
-      const ourPubKey =  window.libsession.Types.PubKey.cast(ourKey);
+      const ourPubKey = window.libsession.Types.PubKey.cast(ourKey);
-      const authorisations = await window.libsession.Protocols.MultiDeviceProtocol.fetchPairingAuthorisations(ourPubKey);
+      const authorisations = await window.libsession.Protocols.MultiDeviceProtocol.fetchPairingAuthorisations(
+        ourPubKey
+      );
 
       const title = authorisations.length
         ? window.i18n('devicePairingRequestReceivedLimitTitle')
         : window.i18n('devicePairingRequestReceivedNoListenerTitle');
 
       const description = authorisations.length
-        ? window.i18n('devicePairingRequestReceivedLimitDescription', window.CONSTANTS.MAX_LINKED_DEVICES)
+        ? window.i18n(
+            'devicePairingRequestReceivedLimitDescription',
+            window.CONSTANTS.MAX_LINKED_DEVICES
+          )
         : window.i18n('devicePairingRequestReceivedNoListenerDescription');
 
       const type = authorisations.length ? 'info' : 'warning';

stylesheets/_session_signin.scss

@@ -83,7 +83,7 @@
         background-color: $session-shade-6;
         padding: $session-margin-sm $session-margin-lg;
         border-radius: 8px;
-        margin-bottom: $session-margin-md;
+        margin-bottom: 0px;
 
         label {
           margin-bottom: 5px;

ts/components/session/RegistrationTabs.tsx

@@ -420,21 +420,29 @@ export class RegistrationTabs extends React.Component<{}, State> {
       return (
         <div className="registration-content-centered">
           <div className="session-signin-device-pairing-header">
-            {this.state.loading ? (
+            {!!this.state.secretWords ? (
               <p>{window.i18n('devicePairingHeaderReassure')}</p>
             ) : (
               <ol>
                 <li>
-                  <SessionHtmlRenderer html={window.i18n('devicePairingHeader_Step1')} />
+                  <SessionHtmlRenderer
+                    html={window.i18n('devicePairingHeader_Step1')}
+                  />
                 </li>
                 <li>
-                  <SessionHtmlRenderer html={window.i18n('devicePairingHeader_Step2')} />
+                  <SessionHtmlRenderer
+                    html={window.i18n('devicePairingHeader_Step2')}
+                  />
                 </li>
                 <li>
-                  <SessionHtmlRenderer html={window.i18n('devicePairingHeader_Step3')} />
+                  <SessionHtmlRenderer
+                    html={window.i18n('devicePairingHeader_Step3')}
+                  />
                 </li>
                 <li>
-                  <SessionHtmlRenderer html={window.i18n('devicePairingHeader_Step4')} />
+                  <SessionHtmlRenderer
+                    html={window.i18n('devicePairingHeader_Step4')}
+                  />
                 </li>
               </ol>
             )}
@@ -446,7 +454,6 @@ export class RegistrationTabs extends React.Component<{}, State> {
               <div className="subtle">{this.state.secretWords}</div>
             </div>
           )}
-          
           <SessionSpinner loading={!!this.state.secretWords} />
         </div>
       );
@@ -560,10 +567,14 @@ export class RegistrationTabs extends React.Component<{}, State> {
       return (
         <div>
           {this.renderContinueYourSessionButton()}
-          <h4>{or}</h4>
+          {!this.state.secretWords && (
-          {this.renderRestoreUsingSeedButton(
+            <>
-            SessionButtonType.BrandOutline,
+              <h4>{or}</h4>
-            SessionButtonColor.White
+              {this.renderRestoreUsingSeedButton(
+                SessionButtonType.BrandOutline,
+                SessionButtonColor.White
+              )}
+            </>
           )}
         </div>
       );
@@ -602,14 +613,11 @@ export class RegistrationTabs extends React.Component<{}, State> {
       passwordFieldsMatch,
       displayNameError,
       mnemonicError,
-      primaryDevicePubKey,
       displayName,
       mnemonicSeed,
       password,
     } = this.state;
 
-    const shouldRenderCancel = this.state.signInMode === SignInMode.LinkingDevice && this.state.loading && !!this.state.secretWords;
-
     let enableContinue = true;
     let text = window.i18n('continueYourSession');
     const displayNameOK = !displayNameError && !!displayName; // Display name required
@@ -620,23 +628,32 @@ export class RegistrationTabs extends React.Component<{}, State> {
       enableContinue = displayNameOK && mnemonicOK && passwordsOK;
     } else if (signInMode === SignInMode.LinkingDevice) {
       enableContinue = true;
-      text = window.i18n(shouldRenderCancel ? 'cancel' : 'linkDevice');
+      text = window.i18n('linkDevice');
     } else if (signUpMode === SignUpMode.EnterDetails) {
       enableContinue = displayNameOK && passwordsOK;
     }
 
+    const shouldRenderCancel =
+      this.state.signInMode === SignInMode.LinkingDevice &&
+      !!this.state.secretWords;
+
+    text = shouldRenderCancel ? window.i18n('cancel') : text;
+    const buttonColor = shouldRenderCancel
+      ? SessionButtonColor.White
+      : SessionButtonColor.Green;
+    const buttonType = shouldRenderCancel
+      ? SessionButtonType.BrandOutline
+      : SessionButtonType.Brand;
     const onClick = () => {
       shouldRenderCancel
         ? this.cancelSecondaryDevice()
         : this.handleContinueYourSessionClick();
     };
 
-    const buttonColor = shouldRenderCancel ? SessionButtonColor.White : SessionButtonColor.Green;
-
     return (
       <SessionButton
         onClick={onClick}
-        buttonType={SessionButtonType.Brand}
+        buttonType={buttonType}
         buttonColor={buttonColor}
         text={text}
         disabled={!enableContinue}
@@ -932,7 +949,7 @@ export class RegistrationTabs extends React.Component<{}, State> {
       await this.accountManager.requestPairing(primaryPubKey);
       const pubkey = window.textsecure.storage.user.getNumber();
       const secretWords = window.mnemonic.pubkey_to_secret_words(pubkey);
-      this.setState({secretWords});
+      this.setState({ secretWords });
     } catch (e) {
       window.console.log(e);
       await this.resetRegistration();

ts/state/selectors/conversations.ts

@@ -120,6 +120,15 @@ export const _getLeftPaneLists = (
       };
     }
 
+    // Remove all invalid conversations and conversatons of devices associated with cancelled attempted links
+    if (!conversation.timestamp) {
+      continue;
+    }
+
+    if (!conversation.activeAt) {
+      continue;
+    }
+
     if (conversation.activeAt !== undefined) {
       allContacts.push(conversation);
     }
@@ -128,10 +137,6 @@ export const _getLeftPaneLists = (
       unreadCount += conversation.unreadCount;
     }
 
-    if (!conversation.activeAt) {
-      continue;
-    }
-
     if (conversation.isArchived) {
       archivedConversations.push(conversation);
     } else {