Merge pull request #3929 from brave/feature/payments-menu-item

Add Payments to Bravery system menu
brave · Sep 12, 2016 · 0934f9b · 0934f9b
2 parents 8bf0b0c + 3c760e3
commit 0934f9b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/app/browser/menu.js b/app/browser/menu.js
@@ -527,7 +527,8 @@ const createMenu = () => {
       label: locale.translation('bravery'),
       submenu: [
         CommonMenu.braveryGlobalMenuItem(),
-        CommonMenu.braverySiteMenuItem()
+        CommonMenu.braverySiteMenuItem(),
+        CommonMenu.braveryPaymentsMenuItem()
       ]
     },
     { label: locale.translation('window'), submenu: createWindowSubmenu(), role: 'window' },

diff --git a/app/common/commonMenu.js b/app/common/commonMenu.js
@@ -349,3 +349,22 @@ module.exports.braveryGlobalMenuItem = () => {
     }
   }
 }
+
+module.exports.braveryPaymentsMenuItem = () => {
+  const label =
+    getSetting(settings.PAYMENTS_ENABLED)
+      ? locale.translation('braveryPayments')
+      : locale.translation('braveryStartUsingPayments')
+  return {
+    label: label,
+    click: (item, focusedWindow) => {
+      if (BrowserWindow.getAllWindows().length === 0) {
+        appActions.newWindow(Immutable.fromJS({
+          location: 'about:preferences#payments'
+        }))
+      } else {
+        module.exports.sendToFocusedWindow(focusedWindow, [messages.SHORTCUT_NEW_FRAME, 'about:preferences#payments', { singleFrame: true }])
+      }
+    }
+  }
+}
diff --git a/app/extensions/brave/locales/en-US/menu.properties b/app/extensions/brave/locales/en-US/menu.properties
@@ -84,6 +84,8 @@ bookmarksToolbar=Bookmarks Toolbar
 bravery=Bravery
 braverySite=Bravery site settings...
 braveryGlobal=Bravery global settings...
+braveryPayments=Brave payments...
+braveryStartUsingPayments=Start using Brave payments...
 addBookmark=Add Bookmark...
 addFolder=Add Folder...
 unmuteTabs=Unmute Tabs

diff --git a/app/locale.js b/app/locale.js
@@ -148,6 +148,8 @@ var rendererIdentifiers = function () {
     'bravery',
     'braverySite',
     'braveryGlobal',
+    'braveryPayments',
+    'braveryStartUsingPayments',
     'blockPopups',
     'learnSpelling',
     'ignoreSpelling',

diff --git a/js/contextMenus.js b/js/contextMenus.js
@@ -629,7 +629,8 @@ function hamburgerTemplateInit (location, e) {
       label: locale.translation('bravery'),
       submenu: [
         CommonMenu.braveryGlobalMenuItem(),
-        CommonMenu.braverySiteMenuItem()
+        CommonMenu.braverySiteMenuItem(),
+        CommonMenu.braveryPaymentsMenuItem()
       ]
     },
     CommonMenu.downloadsMenuItem(),