From e365a3e8925c1ee8bf5b4a14ad48cf7161343b5b Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 25 Jun 2018 08:06:38 -0400
Subject: [PATCH] use new get web vault url method

---
 jslib                                    |  2 +-
 src/popup/settings/settings.component.ts | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/jslib b/jslib
index e5db01083cc..ca3b1c739c6 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit e5db01083cc13df3696bb30562a83d729280ac03
+Subproject commit ca3b1c739c6a7ef503845a1485cc76643276a259
diff --git a/src/popup/settings/settings.component.ts b/src/popup/settings/settings.component.ts
index e651aba023a..b71661379b5 100644
--- a/src/popup/settings/settings.component.ts
+++ b/src/popup/settings/settings.component.ts
@@ -13,12 +13,12 @@ import { DeviceType } from 'jslib/enums/deviceType';
 
 import { ConstantsService } from 'jslib/services/constants.service';
 
+import { EnvironmentService } from 'jslib/abstractions/environment.service';
 import { I18nService } from 'jslib/abstractions/i18n.service';
 import { LockService } from 'jslib/abstractions/lock.service';
 import { MessagingService } from 'jslib/abstractions/messaging.service';
 import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
 import { StorageService } from 'jslib/abstractions/storage.service';
-import { EnvironmentService } from 'jslib/abstractions/environment.service';
 
 const RateUrls = {
     [DeviceType.Chrome]:
@@ -42,7 +42,6 @@ const RateUrls = {
 export class SettingsComponent implements OnInit {
     lockOptions: any[];
     lockOption: number = null;
-    
 
     constructor(private platformUtilsService: PlatformUtilsService, private i18nService: I18nService,
         private analytics: Angulartics2, private lockService: LockService,
@@ -51,7 +50,6 @@ export class SettingsComponent implements OnInit {
     }
 
     async ngOnInit() {
-        
         const showOnLocked = !this.platformUtilsService.isFirefox() && !this.platformUtilsService.isEdge()
             && !this.platformUtilsService.isSafari();
 
@@ -134,8 +132,11 @@ export class SettingsComponent implements OnInit {
 
     async webVault() {
         this.analytics.eventTrack.next({ action: 'Clicked Web Vault' });
-        let webVaultUrl = this.environmentService.webVaultUrl != undefined ? this.environmentService.webVaultUrl : 'https://vault.bitwarden.com';
-        BrowserApi.createNewTab(webVaultUrl);
+        let url = this.environmentService.getWebVaultUrl();
+        if (url == null) {
+            url = 'https://vault.bitwarden.com';
+        }
+        BrowserApi.createNewTab(url);
     }
 
     import() {