1 files changed, 90 insertions, 14 deletions

diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 91e7c981a..4547e84f9 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -10,8 +10,9 @@ import { CUSTOM_WEBSITE_ID } from '../features/webControls/constants';
 import { workspaceActions } from '../features/workspaces/actions';
 import { workspaceStore } from '../features/workspaces/index';
 
-
-const { app, Menu, dialog } = remote;
+const {
+  app, Menu, dialog, systemPreferences,
+} = remote;
 
 const menuItems = defineMessages({
   edit: {
@@ -50,6 +51,10 @@ const menuItems = defineMessages({
     id: 'menu.edit.selectAll',
     defaultMessage: '!!!Select All',
   },
+  findInPage: {
+    id: 'menu.edit.findInPage',
+    defaultMessage: '!!!Find in Page',
+  },
   speech: {
     id: 'menu.edit.speech',
     defaultMessage: '!!!Speech',
@@ -166,6 +171,14 @@ const menuItems = defineMessages({
     id: 'menu.help.debugInfoCopiedBody',
     defaultMessage: '!!!Your Debug Information has been copied to your clipboard.',
   },
+  touchId: {
+    id: 'locked.touchId',
+    defaultMessage: '!!!Unlock with Touch ID',
+  },
+  touchIdPrompt: {
+    id: 'locked.touchIdPrompt',
+    defaultMessage: '!!!unlock via Touch ID',
+  },
   tos: {
     id: 'menu.help.tos',
     defaultMessage: '!!!Terms of Service',
@@ -367,6 +380,27 @@ const _templateFactory = (intl, locked) => [
         type: 'separator',
       },
       {
+        label: intl.formatMessage(menuItems.findInPage),
+        accelerator: 'CmdOrCtrl+F',
+        click() {
+          // Check if there is a service active
+          if (!window.ferdi.stores.services.active) return;
+
+          // Focus webview so find in page popup gets focused
+          window.ferdi.stores.services.active.webview.focus();
+
+          const currentService = window.ferdi.stores.services.active.id;
+          window.ferdi.actions.service.sendIPCMessage({
+            serviceId: currentService,
+            channel: 'find-in-page',
+            args: {},
+          });
+        },
+      },
+      {
+        type: 'separator',
+      },
+      {
         label: intl.formatMessage(menuItems.back),
         accelerator: 'CmdOrCtrl+Left',
         click() {
@@ -575,6 +609,27 @@ const _titleBarTemplateFactory = (intl, locked) => [
         type: 'separator',
       },
       {
+        label: intl.formatMessage(menuItems.findInPage),
+        accelerator: 'CmdOrCtrl+F',
+        click() {
+          // Check if there is a service active
+          if (!window.ferdi.stores.services.active) return;
+
+          // Focus webview so find in page popup gets focused
+          window.ferdi.stores.services.active.webview.focus();
+
+          const currentService = window.ferdi.stores.services.active.id;
+          window.ferdi.actions.service.sendIPCMessage({
+            serviceId: currentService,
+            channel: 'find-in-page',
+            args: {},
+          });
+        },
+      },
+      {
+        type: 'separator',
+      },
+      {
         label: intl.formatMessage(menuItems.back),
         accelerator: 'CmdOrCtrl+Left',
         click() {
@@ -755,7 +810,7 @@ export default class FranzMenu {
       : _titleBarTemplateFactory(intl, this.stores.settings.app.locked);
     const { actions } = this;
 
-    if (this.stores.settings.app.locked) {
+    if (!this.stores.settings.app.locked) {
       tpl[1].submenu.push({
         type: 'separator',
       }, {
@@ -819,7 +874,7 @@ export default class FranzMenu {
               locked: true,
             },
           });
-        }
+        },
       });
 
       if (serviceTpl.length > 0) {
@@ -833,6 +888,27 @@ export default class FranzMenu {
       if (todosStore.isFeatureEnabled) {
         tpl[5].submenu = this.todosMenu();
       }
+    } else {
+      const touchIdEnabled = this.stores.settings.app.useTouchIdToUnlock && systemPreferences.canPromptTouchID();
+
+      tpl[0].submenu.unshift({
+        label: intl.formatMessage(menuItems.touchId),
+        accelerator: 'CmdOrCtrl+Shift+L',
+        visible: touchIdEnabled,
+        click() {
+          systemPreferences.promptTouchID(intl.formatMessage(menuItems.touchIdPrompt)).then(() => {
+            actions.settings.update({
+              type: 'app',
+              data: {
+                locked: false,
+              },
+            });
+          });
+        },
+      }, {
+        type: 'separator',
+        visible: touchIdEnabled,
+      });
     }
 
     tpl.unshift({
@@ -964,19 +1040,19 @@ export default class FranzMenu {
       }, about);
     }
 
-    if (serviceTpl.length > 0) {
-      tpl[3].submenu = serviceTpl;
-    }
+    if (!this.stores.settings.app.locked) {
+      if (serviceTpl.length > 0) {
+        tpl[3].submenu = serviceTpl;
+      }
 
-    if (workspaceStore.isFeatureEnabled) {
-      tpl[4].submenu = this.workspacesMenu();
-    }
+      if (workspaceStore.isFeatureEnabled) {
+        tpl[4].submenu = this.workspacesMenu();
+      }
 
-    if (todosStore.isFeatureEnabled) {
-      tpl[5].submenu = this.todosMenu();
-    }
+      if (todosStore.isFeatureEnabled) {
+        tpl[5].submenu = this.todosMenu();
+      }
 
-    if (!this.stores.settings.app.locked) {
       tpl[tpl.length - 1].submenu.push({
         type: 'separator',
       }, ...this.debugMenu());