From b28eaa1aae9adcc183d2326325b7f5f664c28af3 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Tue, 6 Apr 2021 06:26:04 +1000
Subject: [PATCH] Fix warning banner logic and open link in new tab (#909)

---
 src/app/send/access.component.html | 5 +++--
 src/app/send/access.component.ts   | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/send/access.component.html b/src/app/send/access.component.html
index 6e33504a747..84944a2b919 100644
--- a/src/app/send/access.component.html
+++ b/src/app/send/access.component.html
@@ -6,9 +6,10 @@
         <div class="col-12 text-center" *ngIf="creatorIdentifier != null">
             <p>{{'sendCreatorIdentifier' | i18n: creatorIdentifier }}</p>
         </div>
-        <div class="col-8" *ngIf="creatorIdentifier == null && !loading && !unavailable">
+        <div class="col-8" *ngIf="hideEmail">
             <app-callout type="warning" title="{{'warning' | i18n}}">
-                {{'viewSendHiddenEmailWarning' | i18n }} <a href="https://bitwarden.com/help/article/receive-send/">{{'learnMore' | i18n}}</a>.
+                {{'viewSendHiddenEmailWarning' | i18n }} 
+                <a href="https://bitwarden.com/help/article/receive-send/" target="_blank">{{'learnMore' | i18n}}</a>.
             </app-callout>
         </div>
     </div>
diff --git a/src/app/send/access.component.ts b/src/app/send/access.component.ts
index 5724aaa4237..d48c27e5884 100644
--- a/src/app/send/access.component.ts
+++ b/src/app/send/access.component.ts
@@ -39,6 +39,7 @@ export class AccessComponent implements OnInit {
     showText = false;
     unavailable = false;
     error = false;
+    hideEmail = false;
 
     private id: string;
     private key: string;
@@ -131,6 +132,7 @@ export class AccessComponent implements OnInit {
     async load() {
         this.unavailable = false;
         this.error = false;
+        this.hideEmail = false;
         const keyArray = Utils.fromUrlB64ToArray(this.key);
         this.accessRequest = new SendAccessRequest();
         if (this.password != null) {
@@ -162,5 +164,6 @@ export class AccessComponent implements OnInit {
             }
         }
         this.loading = false;
+        this.hideEmail = this.creatorIdentifier == null && !this.passwordRequired && !this.loading && !this.unavailable;
     }
 }