From c44c8ba654ec4716691a4fb2dc1e9765dfa3f349 Mon Sep 17 00:00:00 2001
From: Kerry <kerrya@element.io>
Date: Wed, 13 Jul 2022 08:50:38 +0200
Subject: [PATCH] Live location share - labels update: "stop sharing" -> "stop"
 (PSG-618) (#9048)

---
 src/components/views/beacon/RoomLiveShareWarning.tsx      | 4 ++--
 src/i18n/strings/en_EN.json                               | 3 +--
 .../__snapshots__/RoomLiveShareWarning-test.tsx.snap      | 8 ++++----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/components/views/beacon/RoomLiveShareWarning.tsx b/src/components/views/beacon/RoomLiveShareWarning.tsx
index dec2b5c042..f5b5c1a720 100644
--- a/src/components/views/beacon/RoomLiveShareWarning.tsx
+++ b/src/components/views/beacon/RoomLiveShareWarning.tsx
@@ -109,11 +109,11 @@ const RoomLiveShareWarningInner: React.FC<RoomLiveShareWarningInnerProps> = ({ l
             element='button'
             disabled={stoppingInProgress}
         >
-            { hasError ? _t('Retry') : _t('Stop sharing') }
+            { hasError ? _t('Retry') : _t('Stop') }
         </AccessibleButton>
         { hasLocationPublishError && <AccessibleButton
             data-test-id='room-live-share-wire-error-close-button'
-            title={_t('Stop sharing and close')}
+            title={_t('Stop and close')}
             element='button'
             className='mx_RoomLiveShareWarning_closeButton'
             onClick={stopPropagationWrapper(onStopSharing)}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 6803a57b4f..2d5b4d52b9 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -2977,8 +2977,7 @@
     "Live location enabled": "Live location enabled",
     "An error occurred whilst sharing your live location, please try again": "An error occurred whilst sharing your live location, please try again",
     "An error occurred while stopping your live location, please try again": "An error occurred while stopping your live location, please try again",
-    "Stop sharing": "Stop sharing",
-    "Stop sharing and close": "Stop sharing and close",
+    "Stop and close": "Stop and close",
     "Avatar": "Avatar",
     "This room is public": "This room is public",
     "Away": "Away",
diff --git a/test/components/views/beacon/__snapshots__/RoomLiveShareWarning-test.tsx.snap b/test/components/views/beacon/__snapshots__/RoomLiveShareWarning-test.tsx.snap
index 843f0f963e..a840493f5c 100644
--- a/test/components/views/beacon/__snapshots__/RoomLiveShareWarning-test.tsx.snap
+++ b/test/components/views/beacon/__snapshots__/RoomLiveShareWarning-test.tsx.snap
@@ -1,8 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<RoomLiveShareWarning /> when user has live beacons and geolocation is available renders correctly with one live beacon in room 1`] = `"<div class=\\"mx_RoomLiveShareWarning\\"><div class=\\"mx_StyledLiveBeaconIcon mx_RoomLiveShareWarning_icon\\"></div><span class=\\"mx_RoomLiveShareWarning_label\\">You are sharing your live location</span><span data-test-id=\\"room-live-share-expiry\\" class=\\"mx_LiveTimeRemaining\\">1h left</span><button data-test-id=\\"room-live-share-primary-button\\" role=\\"button\\" tabindex=\\"0\\" class=\\"mx_AccessibleButton mx_RoomLiveShareWarning_stopButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger\\">Stop sharing</button></div>"`;
+exports[`<RoomLiveShareWarning /> when user has live beacons and geolocation is available renders correctly with one live beacon in room 1`] = `"<div class=\\"mx_RoomLiveShareWarning\\"><div class=\\"mx_StyledLiveBeaconIcon mx_RoomLiveShareWarning_icon\\"></div><span class=\\"mx_RoomLiveShareWarning_label\\">You are sharing your live location</span><span data-test-id=\\"room-live-share-expiry\\" class=\\"mx_LiveTimeRemaining\\">1h left</span><button data-test-id=\\"room-live-share-primary-button\\" role=\\"button\\" tabindex=\\"0\\" class=\\"mx_AccessibleButton mx_RoomLiveShareWarning_stopButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger\\">Stop</button></div>"`;
 
-exports[`<RoomLiveShareWarning /> when user has live beacons and geolocation is available renders correctly with two live beacons in room 1`] = `"<div class=\\"mx_RoomLiveShareWarning\\"><div class=\\"mx_StyledLiveBeaconIcon mx_RoomLiveShareWarning_icon\\"></div><span class=\\"mx_RoomLiveShareWarning_label\\">You are sharing your live location</span><span data-test-id=\\"room-live-share-expiry\\" class=\\"mx_LiveTimeRemaining\\">12h left</span><button data-test-id=\\"room-live-share-primary-button\\" role=\\"button\\" tabindex=\\"0\\" class=\\"mx_AccessibleButton mx_RoomLiveShareWarning_stopButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger\\">Stop sharing</button></div>"`;
+exports[`<RoomLiveShareWarning /> when user has live beacons and geolocation is available renders correctly with two live beacons in room 1`] = `"<div class=\\"mx_RoomLiveShareWarning\\"><div class=\\"mx_StyledLiveBeaconIcon mx_RoomLiveShareWarning_icon\\"></div><span class=\\"mx_RoomLiveShareWarning_label\\">You are sharing your live location</span><span data-test-id=\\"room-live-share-expiry\\" class=\\"mx_LiveTimeRemaining\\">12h left</span><button data-test-id=\\"room-live-share-primary-button\\" role=\\"button\\" tabindex=\\"0\\" class=\\"mx_AccessibleButton mx_RoomLiveShareWarning_stopButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger\\">Stop</button></div>"`;
 
 exports[`<RoomLiveShareWarning /> when user has live beacons and geolocation is available stopping beacons displays error when stop sharing fails 1`] = `"<div class=\\"mx_RoomLiveShareWarning\\"><div class=\\"mx_StyledLiveBeaconIcon mx_RoomLiveShareWarning_icon mx_StyledLiveBeaconIcon_error\\"></div><span class=\\"mx_RoomLiveShareWarning_label\\">An error occurred while stopping your live location, please try again</span><button data-test-id=\\"room-live-share-primary-button\\" role=\\"button\\" tabindex=\\"0\\" class=\\"mx_AccessibleButton mx_RoomLiveShareWarning_stopButton mx_AccessibleButton_hasKind mx_AccessibleButton_kind_danger\\">Retry</button></div>"`;
 
@@ -64,7 +64,7 @@ exports[`<RoomLiveShareWarning /> when user has live beacons and geolocation is
         onClick={[Function]}
         role="button"
         tabIndex={0}
-        title="Stop sharing and close"
+        title="Stop and close"
       >
         <button
           className="mx_AccessibleButton mx_RoomLiveShareWarning_closeButton"
@@ -74,7 +74,7 @@ exports[`<RoomLiveShareWarning /> when user has live beacons and geolocation is
           onKeyUp={[Function]}
           role="button"
           tabIndex={0}
-          title="Stop sharing and close"
+          title="Stop and close"
         >
           <div
             className="mx_RoomLiveShareWarning_closeButtonIcon"