From e50a29ffa5df4d7e65177e444f46d03c56f2f8d1 Mon Sep 17 00:00:00 2001
From: sachaaaaa <sacha@loki.network>
Date: Mon, 2 Sep 2019 16:33:19 +1000
Subject: [PATCH] Show 3 last mnemonic representation of public key instead of
 public key during pairing

---
 background.html                          | 6 +++---
 js/views/device_pairing_dialog_view.js   | 7 ++++++-
 js/views/standalone_registration_view.js | 7 ++++++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/background.html b/background.html
index a7a201643..909e38813 100644
--- a/background.html
+++ b/background.html
@@ -258,8 +258,8 @@
       <!-- Request Received -->
       <div class="requestReceivedView" style="display: none;">
         <h4>{{ requestReceivedTitle }}</h4>
-        Please verify that the pubkey shown here is your secondary device pubkey!
-        <p class="secondaryPubKey"></p>
+        Please verify that the secret words shown below matches the ones on your other device!
+        <p class="secretWords"></p>
         <div class='buttons'>
           <button class="skip">{{ skipText }}</button>
           <button id="allowPairing">{{ allowPairingText }}</button>
@@ -270,7 +270,7 @@
       <div class="requestAcceptedView" style="display: none;">
         <h4>{{ requestAcceptedTitle }}</h4>
         Sending pairing authorisation to:
-        <p class="secondaryPubKey"></p>
+        <p class="secretWords"></p>
         <p class="transmissionStatus">Please be patient...</p>
         <div class='buttons'>
           <button class="ok" style="display: none;">{{ okText }}</button>
diff --git a/js/views/device_pairing_dialog_view.js b/js/views/device_pairing_dialog_view.js
index 2e18ab1f4..68e1b426d 100644
--- a/js/views/device_pairing_dialog_view.js
+++ b/js/views/device_pairing_dialog_view.js
@@ -12,6 +12,7 @@
     initialize() {
       this.pubKeyRequests = [];
       this.pubKey = null;
+      this.secretWords = null;
       this.accepted = false;
       this.view = '';
       this.render();
@@ -64,6 +65,10 @@
     nextPubKey() {
       // FIFO: pop at the back of the array using pop()
       this.pubKey = this.pubKeyRequests.pop();
+      this.secretWords = window.mnemonic.mn_encode(this.pubKey.slice(2), 'english')
+        .split(' ')
+        .slice(-3)
+        .join(' ');
     },
     showView() {
       const waitingForRequestView = this.$('.waitingForRequestView');
@@ -74,7 +79,7 @@
         waitingForRequestView.hide();
         requestAcceptedView.show();
       } else if (this.pubKey) {
-        this.$('.secondaryPubKey').text(this.pubKey);
+        this.$('.secretWords').text(this.secretWords);
         requestReceivedView.show();
         waitingForRequestView.hide();
         requestAcceptedView.hide();
diff --git a/js/views/standalone_registration_view.js b/js/views/standalone_registration_view.js
index cbf91f068..cc9489a2c 100644
--- a/js/views/standalone_registration_view.js
+++ b/js/views/standalone_registration_view.js
@@ -208,8 +208,13 @@
         countDownCallBack();
         this.pairingInterval = setInterval(countDownCallBack, 1000);
         const pubkey = textsecure.storage.user.getNumber();
+        const words = window.mnemonic.mn_encode(pubkey.slice(2), 'english')
+          .split(' ')
+          .slice(-3)
+          .join(' ');
+
         this.$('.standalone-secondary-device #pubkey').text(
-          `Here is your pubkey:\n${pubkey}`
+          `Here is your secret:\n${words}`
         );
       } catch (e) {
         onError(e);