From a2c995b963a1554fb47a7118a24497284a282b32 Mon Sep 17 00:00:00 2001
From: ryanml <rlanese@asu.edu>
Date: Wed, 14 Aug 2019 13:51:26 -0700
Subject: [PATCH] Fixes brave/brave-browser#5666, crypto wallets link present
 in builds

---
 ui/webui/resources/BUILD.gn                   |  6 +----
 .../br_elements/br_toolbar/br_toolbar.html    | 26 +++++++++----------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn
index adcd6f8822e..775bcf97699 100644
--- a/ui/webui/resources/BUILD.gn
+++ b/ui/webui/resources/BUILD.gn
@@ -1,12 +1,8 @@
 import("//tools/grit/grit_rule.gni")
 import("//ui/webui/webui_features.gni")
-import("//brave/components/brave_wallet/browser/buildflags/buildflags.gni")
 
 grit("resources") {
-  defines = [
-    "optimize_webui=$optimize_webui",
-    "brave_wallet_enabled=$brave_wallet_enabled"
-  ]
+  defines = [ "optimize_webui=$optimize_webui" ]
   source = "brave_webui_resources.grd"
 
   # The .grd contains references to generated files.
diff --git a/ui/webui/resources/br_elements/br_toolbar/br_toolbar.html b/ui/webui/resources/br_elements/br_toolbar/br_toolbar.html
index 6827fab931f..703aeb84c46 100644
--- a/ui/webui/resources/br_elements/br_toolbar/br_toolbar.html
+++ b/ui/webui/resources/br_elements/br_toolbar/br_toolbar.html
@@ -163,20 +163,18 @@
             <span class="nav-item_text">[[downloadsTitle]]</span>
           </a>
         </li>
-        <if expr="brave_wallet_enabled">
-          <li class="nav-items_list-item" title="[[walletsTitle]]">
-            <a class="nav-item" href="chrome://wallet">
-              <span class="nav-item_icon">
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="20">
-                  <path d="M5.483 13.455a2.615 2.615 0 0 0 2.572 3.128c.91 0 1.728-.463 2.202-1.185a.71.71 0 0 1-.113-.113L9.063 13.94a6.14 6.14 0 0 1-3.58-.485zm-1.26-.789A5.983 5.983 0 0 1 2 8.011C2 4.691 4.711 2 8.055 2a6.058 6.058 0 0 1 5.579 3.669l3.06 1.463a.71.71 0 0 1 .386.48l.902 3.926a.705.705 0 0 1-.138.6l-2.529 3.147a.716.716 0 0 1-.558.267h-2.972A4.054 4.054 0 0 1 8.055 18c-2.238 0-4.052-1.801-4.052-4.023 0-.452.075-.893.22-1.31zm9.862-5.209c.017.183.026.368.026.554 0 2.444-1.469 4.547-3.578 5.487l.512.637h3.369l2.1-2.615-.75-3.26-1.679-.803zm-6.03 5.149c2.556 0 4.629-2.057 4.629-4.595 0-2.537-2.073-4.594-4.629-4.594-2.556 0-4.628 2.057-4.628 4.594 0 2.538 2.072 4.595 4.628 4.595zm-1.942-2.328a.706.706 0 0 1-.627-1.038l1.951-3.715a.711.711 0 0 1 1.26-.005l1.924 3.701a.716.716 0 0 1-.634 1.043l-3.874.014zm2.706-1.432L8.06 7.387l-.768 1.465 1.527-.006z" />
-                </svg>
-              </span>
-              <span class="nav-item_text">[[walletsTitle]]</span>
-            </a>
-          </li>
-        </if>
+        <li class="nav-items_list-item" title="[[walletsTitle]]">
+          <a class="nav-item" href="chrome://wallet">
+            <span class="nav-item_icon">
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="20">
+                <path d="M5.483 13.455a2.615 2.615 0 0 0 2.572 3.128c.91 0 1.728-.463 2.202-1.185a.71.71 0 0 1-.113-.113L9.063 13.94a6.14 6.14 0 0 1-3.58-.485zm-1.26-.789A5.983 5.983 0 0 1 2 8.011C2 4.691 4.711 2 8.055 2a6.058 6.058 0 0 1 5.579 3.669l3.06 1.463a.71.71 0 0 1 .386.48l.902 3.926a.705.705 0 0 1-.138.6l-2.529 3.147a.716.716 0 0 1-.558.267h-2.972A4.054 4.054 0 0 1 8.055 18c-2.238 0-4.052-1.801-4.052-4.023 0-.452.075-.893.22-1.31zm9.862-5.209c.017.183.026.368.026.554 0 2.444-1.469 4.547-3.578 5.487l.512.637h3.369l2.1-2.615-.75-3.26-1.679-.803zm-6.03 5.149c2.556 0 4.629-2.057 4.629-4.595 0-2.537-2.073-4.594-4.629-4.594-2.556 0-4.628 2.057-4.628 4.594 0 2.538 2.072 4.595 4.628 4.595zm-1.942-2.328a.706.706 0 0 1-.627-1.038l1.951-3.715a.711.711 0 0 1 1.26-.005l1.924 3.701a.716.716 0 0 1-.634 1.043l-3.874.014zm2.706-1.432L8.06 7.387l-.768 1.465 1.527-.006z" />
+              </svg>
+            </span>
+            <span class="nav-item_text">[[walletsTitle]]</span>
+          </a>
+        </li>
       </ul>
       <template id="searchIf" is="dom-if" if="[[!noSearch]]">
         <br-toolbar-search-field id="search"