diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedLogs/util/FlightRecorderDataSetExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedLogs/util/FlightRecorderDataSetExtensions.kt
index 04acec50fb..939c9a038e 100644
--- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedLogs/util/FlightRecorderDataSetExtensions.kt
+++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedLogs/util/FlightRecorderDataSetExtensions.kt
@@ -12,7 +12,6 @@ import kotlinx.collections.immutable.toImmutableList
import java.time.Clock
import java.time.Instant
import java.time.temporal.ChronoUnit
-import kotlin.time.Duration.Companion.milliseconds
/**
* Converts a set of [FlightRecorderDataSet] to a [RecordedLogsState.ViewState].
@@ -74,9 +73,9 @@ private fun FlightRecorderDataSet.FlightRecorderData.expiresIn(clock: Clock): Te
// We expire tomorrow based on the day of year.
R.string.expires_tomorrow.asText()
} else {
- // Let them know how many days they have left.
- val millisRemaining = expirationTime.minusMillis(now.toEpochMilli()).toEpochMilli()
- R.string.expires_in_days.asText(millisRemaining.milliseconds.inWholeDays)
+ // Let them know the date it expires.
+ val expirationDate = expirationTime.toFormattedPattern(pattern = "M/d/yy", clock = clock)
+ R.string.expires_on.asText(expirationDate)
}
}
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cc821fc398..81592e5995 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -622,7 +622,7 @@ Scanning will happen automatically.
Expired
Expires at %s
Expires tomorrow
- Expires in %s days
+ Expires on %s
Stops logging on %1$s at %2$s
Maximum access count
If set, users will no longer be able to access this Send once the maximum access count is reached.
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedlogs/RecordedLogsScreenTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedlogs/RecordedLogsScreenTest.kt
index 19578d0dab..43d63a955b 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedlogs/RecordedLogsScreenTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedlogs/RecordedLogsScreenTest.kt
@@ -114,7 +114,7 @@ class RecordedLogsScreenTest : BaseComposeTest() {
id = "52",
title = "2025-04-12T03:15:00 – 2025-04-12T04:15:00".asText(),
subtextStart = "1.00 KB".asText(),
- subtextEnd = R.string.expires_in_days.asText("30"),
+ subtextEnd = R.string.expires_on.asText("4/12/25"),
isDeletedEnabled = true,
),
),
diff --git a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedlogs/util/FlightRecorderDataSetExtensionsTest.kt b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedlogs/util/FlightRecorderDataSetExtensionsTest.kt
index cbcbd36fc9..16ca80dcef 100644
--- a/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedlogs/util/FlightRecorderDataSetExtensionsTest.kt
+++ b/app/src/test/java/com/x8bit/bitwarden/ui/platform/feature/settings/flightrecorder/recordedlogs/util/FlightRecorderDataSetExtensionsTest.kt
@@ -117,7 +117,7 @@ class FlightRecorderDataSetExtensionsTest {
id = "52",
title = "2025-04-12T08:15:00 – 2025-04-12T09:15:00".asText(),
subtextStart = "1.00 KB".asText(),
- subtextEnd = R.string.expires_in_days.asText(30L),
+ subtextEnd = R.string.expires_on.asText("5/11/25"),
isDeletedEnabled = true,
),
RecordedLogsState.DisplayItem(