From 15714f35ef7884cd14041b097f7bb190ebc0d9d6 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Wed, 17 Aug 2022 15:06:17 -0700
Subject: [PATCH] Rename remote config flag

---
 package.json                    | 2 +-
 ts/RemoteConfig.ts              | 2 +-
 ts/services/storageRecordOps.ts | 4 ++--
 yarn.lock                       | 8 ++++----
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index c4f2f1a097e4..d93d48d26df7 100644
--- a/package.json
+++ b/package.json
@@ -191,7 +191,7 @@
     "@babel/preset-typescript": "7.17.12",
     "@electron/fuses": "1.5.0",
     "@mixer/parallel-prettier": "2.0.1",
-    "@signalapp/mock-server": "2.7.0",
+    "@signalapp/mock-server": "2.8.0",
     "@storybook/addon-a11y": "6.5.6",
     "@storybook/addon-actions": "6.5.6",
     "@storybook/addon-controls": "6.5.6",
diff --git a/ts/RemoteConfig.ts b/ts/RemoteConfig.ts
index 2bb3fa57a1fc..e911550105ef 100644
--- a/ts/RemoteConfig.ts
+++ b/ts/RemoteConfig.ts
@@ -16,7 +16,7 @@ export type ConfigKeyType =
   | 'desktop.mediaQuality.levels'
   | 'desktop.messageCleanup'
   | 'desktop.messageRequests'
-  | 'desktop.pnp.storageService'
+  | 'desktop.pnp'
   | 'desktop.retryReceiptLifespan'
   | 'desktop.retryRespondMaxAge'
   | 'desktop.senderKey.retry'
diff --git a/ts/services/storageRecordOps.ts b/ts/services/storageRecordOps.ts
index 17fd46955844..36b60b260fda 100644
--- a/ts/services/storageRecordOps.ts
+++ b/ts/services/storageRecordOps.ts
@@ -139,7 +139,7 @@ export async function toContactRecord(
     contactRecord.serviceE164 = e164;
   }
   const pni = conversation.get('pni');
-  if (pni && RemoteConfig.isEnabled('desktop.pnp.storageService')) {
+  if (pni && RemoteConfig.isEnabled('desktop.pnp')) {
     contactRecord.pni = pni;
   }
   const profileKey = conversation.get('profileKey');
@@ -852,7 +852,7 @@ export async function mergeContactRecord(
       : undefined,
   };
 
-  const isPniSupported = RemoteConfig.isEnabled('desktop.pnp.storageService');
+  const isPniSupported = RemoteConfig.isEnabled('desktop.pnp');
 
   const e164 = dropNull(contactRecord.serviceE164);
   const uuid = dropNull(contactRecord.serviceUuid);
diff --git a/yarn.lock b/yarn.lock
index 8f08c4c15fde..f2c4e1fb7678 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1753,10 +1753,10 @@
     node-gyp-build "^4.2.3"
     uuid "^8.3.0"
 
-"@signalapp/mock-server@2.7.0":
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/@signalapp/mock-server/-/mock-server-2.7.0.tgz#92c6538c44eb6001f7fb5b85cb1c41ad1d4a64bc"
-  integrity sha512-Adf+EOs/YesNQ4ZsxVxAdhFjtVd4f246RwADMD6A50X4hrp78eW2WkFpZ7fWDMy3ZIRiNa87aZXRbWEzFEzIzA==
+"@signalapp/mock-server@2.8.0":
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/@signalapp/mock-server/-/mock-server-2.8.0.tgz#c3228d9bf2ab5d40f51a6eeb77ddea786898cdf4"
+  integrity sha512-IVAA3Qm/Tc61WEyk+45J4M08lY2vYly3rRAA+LhWIhE3Uo/4T40vQ3EswAtlGY7KiWG2N1C7B1i9VSCkPCENyQ==
   dependencies:
     "@signalapp/libsignal-client" "^0.19.2"
     debug "^4.3.2"