From fc9fd5a5149bbeef92ded7968d4c3acdf4a44f86 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Mon, 17 Feb 2020 13:56:05 +1100
Subject: [PATCH] remove filter request button from linking device

we match the android way: when a request you can directly accept or
cancel the whole link process.
---
 ts/components/DevicePairingDialog.tsx | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/ts/components/DevicePairingDialog.tsx b/ts/components/DevicePairingDialog.tsx
index 9af2f2ce5..4fc0b3ed3 100644
--- a/ts/components/DevicePairingDialog.tsx
+++ b/ts/components/DevicePairingDialog.tsx
@@ -117,12 +117,13 @@ export class DevicePairingDialog extends React.Component<Props, State> {
           <div className="text-subtle">{secretWords}</div>
           <div className="session-modal__button-group">
             <SessionButton
-              text={window.i18n('skip')}
+              text={window.i18n('cancel')}
               onClick={this.skipDevice}
             />
             <SessionButton
               text={window.i18n('allowPairing')}
               onClick={this.allowDevice}
+              buttonColor={SessionButtonColor.Green}
             />
           </div>
         </div>
@@ -158,14 +159,7 @@ export class DevicePairingDialog extends React.Component<Props, State> {
                 text={window.i18n('cancel')}
                 onClick={this.closeDialog}
               />
-            ) : (
-              <div className="session-modal__button-group">
-                <SessionButton
-                  text={window.i18n('filterReceivedRequests')}
-                  onClick={this.stopReceivingRequests}
-                />
-              </div>
-            )}
+            ) : null}
           </div>
         </div>
       </SessionModal>
@@ -270,6 +264,7 @@ export class DevicePairingDialog extends React.Component<Props, State> {
     });
     if (!this.state.currentPubKey) {
       this.nextPubKey();
+      this.stopReceivingRequests();
     }
   }
 
@@ -307,14 +302,7 @@ export class DevicePairingDialog extends React.Component<Props, State> {
       this.state.currentPubKey
     );
 
-    const hasNext = this.state.pubKeyRequests.length > 0;
-    this.nextPubKey();
-    if (!hasNext) {
-      this.startReceivingRequests();
-    }
-    this.setState({
-      currentView: hasNext ? 'filterRequestView' : 'qrcodeView',
-    });
+    this.closeDialog();
   }
 
   private nextPubKey() {