From 2e20978cee4a303749b0029d3ce549c8f2195ed8 Mon Sep 17 00:00:00 2001 From: Addison Beck Date: Thu, 25 Feb 2021 17:25:53 -0500 Subject: [PATCH] updated send access component (#852) * updated send access component * updated jslib * bump jslib version (#851) * code review fixes * updated send access component * updated jslib * code review fixes Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com> --- jslib | 2 +- src/app/send/access.component.html | 16 ++++++++++++++-- src/app/send/access.component.ts | 14 ++++++++++++++ src/locales/en/messages.json | 20 ++++++++++++++++++++ 4 files changed, 49 insertions(+), 3 deletions(-) diff --git a/jslib b/jslib index 00122ab1..ff934341 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 00122ab166f67622e9ba799c656c8b6dfece64fc +Subproject commit ff9343412e886cf4bcb2cabf2cce003024917ce8 diff --git a/src/app/send/access.component.html b/src/app/send/access.component.html index bda2fefc..a022fc09 100644 --- a/src/app/send/access.component.html +++ b/src/app/send/access.component.html @@ -1,7 +1,12 @@
-
-
+
+

Bitwarden Send

+
+
+

A Bitwarden user {{creatorIdentifier}} shared the following with you.

+
+
{{'downloadFile' | i18n}} ({{send.file.sizeName}}) +

Expires: {{expirationDate | date: 'medium'}}

+
+

{{'sendAccessTaglineProductDesc' | i18n}}
+ {{'sendAccessTaglineLearnMore' | i18n}} Bitwarden Send {{'sendAccessTaglineOr' | i18n}} {{'sendAccessTaglineSignUp' | i18n}} {{'sendAccessTaglineTryToday' | i18n}} +

+
+ diff --git a/src/app/send/access.component.ts b/src/app/send/access.component.ts index 38087957..e0a48b86 100644 --- a/src/app/send/access.component.ts +++ b/src/app/send/access.component.ts @@ -56,6 +56,20 @@ export class AccessComponent implements OnInit { return this.showText ? this.send.text.text : this.send.text.maskedText; } + get expirationDate() { + if (this.send == null || this.send.expirationDate == null) { + return null; + } + return this.send.expirationDate; + } + + get creatorIdentifier() { + if (this.send == null || this.send.creatorIdentifier == null) { + return null; + } + return this.send.creatorIdentifier; + } + ngOnInit() { this.route.params.subscribe(async params => { this.id = params.sendId; diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json index a677dbbe..cbb8348d 100644 --- a/src/locales/en/messages.json +++ b/src/locales/en/messages.json @@ -3688,5 +3688,25 @@ "send": { "message": "Send", "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." + }, + "sendAccessTaglineProductDesc": { + "message": "Bitwarden Send transmits sensitive, temporary information to others easily and securely.", + "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated." + }, + "sendAccessTaglineLearnMore": { + "message": "Learn more about", + "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read '**Learn more about** Bitwarden Send or sign up to try it today.'" + }, + "sendAccessTaglineOr": { + "message": "or", + "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more about Bitwarden Send **or** sign up to try it today.'" + }, + "sendAccessTaglineSignUp": { + "message": "sign up", + "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more about Bitwarden Send or **sign up** to try it today.'" + }, + "sendAccessTaglineTryToday": { + "message": "to try it today.", + "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more about Bitwarden Send or sign up to **try it today.**'" } }