From 4585a27dcc45e5d1bb25a01eda41fd33c077e9d9 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 23 Oct 2024 16:01:49 +0100
Subject: [PATCH 1/2] Fix other devices not being decorated as such

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/settings/devices/DeviceDetails.tsx     | 6 +++++-
 .../__snapshots__/CurrentDeviceSection-test.tsx.snap        | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/devices/DeviceDetails.tsx b/src/components/views/settings/devices/DeviceDetails.tsx
index dda0089d8b0..1a418f5dd52 100644
--- a/src/components/views/settings/devices/DeviceDetails.tsx
+++ b/src/components/views/settings/devices/DeviceDetails.tsx
@@ -111,7 +111,11 @@ const DeviceDetails: React.FC<Props> = ({
         <div className={classNames("mx_DeviceDetails", className)} data-testid={`device-detail-${device.device_id}`}>
             <section className="mx_DeviceDetails_section">
                 <DeviceDetailHeading device={device} saveDeviceName={saveDeviceName} />
-                <DeviceVerificationStatusCard device={device} onVerifyDevice={onVerifyDevice} isCurrentDevice />
+                <DeviceVerificationStatusCard
+                    device={device}
+                    onVerifyDevice={onVerifyDevice}
+                    isCurrentDevice={isCurrentDevice}
+                />
             </section>
             <section className="mx_DeviceDetails_section">
                 <p className="mx_DeviceDetails_sectionHeading">{_t("settings|sessions|details_heading")}</p>
diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap
index 1d9fd387e7e..5e7b8c2ae8d 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/CurrentDeviceSection-test.tsx.snap
@@ -49,7 +49,7 @@ HTMLCollection [
           <p
             class="mx_DeviceSecurityCard_description"
           >
-            Verify your current session for enhanced secure messaging.
+            Verify or sign out from this session for best security and reliability.
             <div
               class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
               role="button"

From e5343c23f90c1506dade7a96fdf68eb7def51f74 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 23 Oct 2024 16:48:07 +0100
Subject: [PATCH 2/2] Update snapshots

---
 .../devices/__snapshots__/DeviceDetails-test.tsx.snap       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceDetails-test.tsx.snap b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceDetails-test.tsx.snap
index f39be8aaeb2..ff25c3a2c82 100644
--- a/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceDetails-test.tsx.snap
+++ b/test/unit-tests/components/views/settings/devices/__snapshots__/DeviceDetails-test.tsx.snap
@@ -49,7 +49,7 @@ exports[`<DeviceDetails /> renders a verified device 1`] = `
           <p
             class="mx_DeviceSecurityCard_description"
           >
-            Your current session is ready for secure messaging.
+            This session is ready for secure messaging.
             <div
               class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
               role="button"
@@ -158,7 +158,7 @@ exports[`<DeviceDetails /> renders device with metadata 1`] = `
           <p
             class="mx_DeviceSecurityCard_description"
           >
-            Verify your current session for enhanced secure messaging.
+            Verify or sign out from this session for best security and reliability.
             <div
               class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
               role="button"
@@ -367,7 +367,7 @@ exports[`<DeviceDetails /> renders device without metadata 1`] = `
           <p
             class="mx_DeviceSecurityCard_description"
           >
-            Verify your current session for enhanced secure messaging.
+            Verify or sign out from this session for best security and reliability.
             <div
               class="mx_AccessibleButton mx_LearnMore_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_link_inline"
               role="button"