diff --git a/apps/web/src/app/tools/send/send-access/send-view.component.html b/apps/web/src/app/tools/send/send-access/send-view.component.html index 3536499ddad..ca75f123c7e 100644 --- a/apps/web/src/app/tools/send/send-access/send-view.component.html +++ b/apps/web/src/app/tools/send/send-access/send-view.component.html @@ -9,12 +9,7 @@ @if (loading()) {
Expires: {{ expirationDate() | date: "medium" }}
+ @let formattedExpirationTime = expirationDate() | date: "shortTime"; + @let formattedExpirationDate = expirationDate() | date: "mediumDate"; ++ {{ "sendExpiresOn" | i18n: formattedExpirationTime : formattedExpirationDate }} +
} } diff --git a/apps/web/src/app/tools/send/send-access/send-view.component.ts b/apps/web/src/app/tools/send/send-access/send-view.component.ts index 923a749db92..2d9766ded6c 100644 --- a/apps/web/src/app/tools/send/send-access/send-view.component.ts +++ b/apps/web/src/app/tools/send/send-access/send-view.component.ts @@ -21,7 +21,11 @@ import { SendAccessResponse } from "@bitwarden/common/tools/send/models/response import { SendAccessView } from "@bitwarden/common/tools/send/models/view/send-access.view"; import { SendApiService } from "@bitwarden/common/tools/send/services/send-api.service.abstraction"; import { SendType } from "@bitwarden/common/tools/send/types/send-type"; -import { AnonLayoutWrapperDataService, ToastService } from "@bitwarden/components"; +import { + AnonLayoutWrapperDataService, + SpinnerComponent, + ToastService, +} from "@bitwarden/components"; import { KeyService } from "@bitwarden/key-management"; import { SharedModule } from "../../../shared"; @@ -32,7 +36,7 @@ import { SendAccessTextComponent } from "./send-access-text.component"; @Component({ selector: "app-send-view", templateUrl: "send-view.component.html", - imports: [SendAccessFileComponent, SendAccessTextComponent, SharedModule], + imports: [SendAccessFileComponent, SendAccessTextComponent, SharedModule, SpinnerComponent], changeDetection: ChangeDetectionStrategy.OnPush, }) export class SendViewComponent implements OnInit { diff --git a/apps/web/src/locales/en/messages.json b/apps/web/src/locales/en/messages.json index e43b266de4b..970244119f8 100644 --- a/apps/web/src/locales/en/messages.json +++ b/apps/web/src/locales/en/messages.json @@ -12948,5 +12948,19 @@ }, "paymentMethodUpdateError": { "message": "There was an error updating your payment method." + }, + "sendExpiresOn": { + "message": "This Send expires at $TIME$ on $DATE$", + "placeholders": { + "time": { + "content": "$1", + "example": "10:00 AM" + }, + "date": { + "content": "$2", + "example": "Jan 1, 1970" + } + }, + "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." } }