From 3f52b9df93aaae850503660972ecfea1ef31ec2e Mon Sep 17 00:00:00 2001 From: sachaaaaa Date: Wed, 6 Nov 2019 14:54:23 +1100 Subject: [PATCH] Make unpairing a toggle-able feature (enable with window.lokiFeatureFlags.multiDeviceUnpairing = true) --- js/views/device_pairing_dialog_view.js | 15 +++++++++------ preload.js | 4 ++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/js/views/device_pairing_dialog_view.js b/js/views/device_pairing_dialog_view.js index fb7d4389e..7dda6c3c0 100644 --- a/js/views/device_pairing_dialog_view.js +++ b/js/views/device_pairing_dialog_view.js @@ -161,12 +161,15 @@ if (pubKeys && pubKeys.length > 0) { pubKeys.forEach(x => { const name = this.getPubkeyName(x); - const li = $('
  • ').html(`${name} - `); - const link = $('') - .text('Unpair') - .attr('href', '#'); - link.on('click', () => this.requestUnpairDevice(x)); - li.append(link); + const li = $('
  • ').html(name); + if (window.lokiFeatureFlags.multiDeviceUnpairing) { + const link = $('') + .text('Unpair') + .attr('href', '#'); + link.on('click', () => this.requestUnpairDevice(x)); + li.append(' - '); + li.append(link); + } this.$('#pairedPubKeys').append(li); }); } else { diff --git a/preload.js b/preload.js index 9df58dadd..da596015f 100644 --- a/preload.js +++ b/preload.js @@ -456,3 +456,7 @@ if (config.environment === 'test') { window.shortenPubkey = pubkey => `(...${pubkey.substring(pubkey.length - 6)})`; window.pubkeyPattern = /@[a-fA-F0-9]{64,66}\b/g; + +window.lokiFeatureFlags = { + multiDeviceUnpairing: false, +};