Merge branch 'develop' into feat/deskto-settings-view

* develop: (141 commits)
  New Crowdin translations [ci skip] (#769)
  Mobile: Fix minor bugs (#771)
  Assign account index to accounts in state (#715)
  Mobile: Fix failing tests (#770)
  Desktop: Add two-factor authorisation to Password modal (#764)
  Localization improvements (#718)
  Mobile: Fix keyboard avoidance globally (#767)
  Mobile: Handle error if permissions are denied on SeedVault import (#719)
  New Crowdin translations [ci skip] (#667)
  Desktop: Delete yarn.lock (#768)
  Update Seed write down view `Done` locale to `Back` (#765)
  Mobile: Minor refactor
  Update src/mobile/android/gradlew.bat
  Mobile: Minor code cleanup
  Fix unresolved conflict
  Localise string
  Update src/mobile/src/ui/views/wallet/DeleteAccount.js
  Update src/mobile/src/ui/components/TransferConfirmationModal.js
  Preserve order of themes via indexes in ThemeCustomisation component (#763)
  [Security] Bump lodash from 4.17.4 to 4.17.10 (#723)
  ...

# Conflicts:
#	src/desktop/src/ui/views/account/Addresses.js
#	src/desktop/src/ui/views/settings/Advanced.js
#	src/desktop/src/ui/views/settings/account/Seed.js

package.json

@@ -46,15 +46,15 @@
     "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-react": "^7.7.0",
     "eslint-plugin-react-native": "^3.2.1",
-    "husky": "^1.1.3",
+    "husky": "^1.2.0",
     "lint-staged": "^4.2.3",
     "node-cmd": "^3.0.0",
     "os": "^0.1.1",
     "prettier": "^1.11.0",
     "shared-modules": "./src/shared/"
   },
   "dependencies": {
-    "snyk": "^1.96.0"
+    "snyk": "^1.116.2"
   },
   "snyk": true
 }

src/desktop/main.js

@@ -5,7 +5,7 @@ import path from 'path';
 import URL from 'url';
 import fs from 'fs';
 
-import initMenu from './native/Menu.js';
+import { initMenu, contextMenu } from './native/Menu.js';
 
 /**
  * Expose Garbage Collector flag for manual trigger after seed usage
@@ -210,40 +210,9 @@ function createWindow() {
      * Add right click context menu for input elements
      */
     windows.main.webContents.on('context-menu', (e, props) => {
-        const InputMenu = electron.Menu.buildFromTemplate([
-            {
-                label: 'Undo',
-                role: 'undo',
-            },
-            {
-                label: 'Redo',
-                role: 'redo',
-            },
-            {
-                type: 'separator',
-            },
-            {
-                label: 'Cut',
-                role: 'cut',
-            },
-            {
-                label: 'Copy',
-                role: 'copy',
-            },
-            {
-                label: 'Paste',
-                role: 'paste',
-            },
-            {
-                type: 'separator',
-            },
-            {
-                label: 'Select all',
-                role: 'selectall',
-            },
-        ]);
         const { isEditable } = props;
         if (isEditable) {
+            const InputMenu = contextMenu();
             InputMenu.popup(windows.main);
         }
     });

src/desktop/native/Menu.js

@@ -142,7 +142,7 @@ autoUpdater.on('download-progress', (progressObj) => {
  * @param {function} getWindow - Get Window instance helper
  * @returns {undefined}
  */
-const initMenu = (app, getWindowFunc) => {
+export const initMenu = (app, getWindowFunc) => {
     let mainMenu = null;
     getWindow = getWindowFunc;
 
@@ -404,4 +404,41 @@ const initMenu = (app, getWindowFunc) => {
     });
 };
 
-export default initMenu;
+/**
+ * Creates context menu
+ * @returns {Menu} Context menu
+ */
+export const contextMenu = () => {
+    return Menu.buildFromTemplate([
+        {
+            label: language.undo,
+            role: 'undo',
+        },
+        {
+            label: language.redo,
+            role: 'redo',
+        },
+        {
+            type: 'separator',
+        },
+        {
+            label: language.cut,
+            role: 'cut',
+        },
+        {
+            label: language.copy,
+            role: 'copy',
+        },
+        {
+            label: language.paste,
+            role: 'paste',
+        },
+        {
+            type: 'separator',
+        },
+        {
+            label: language.selectAll,
+            role: 'selectall',
+        },
+    ]);
+};

src/desktop/native/preload/Electron.js

@@ -47,7 +47,7 @@ let onboardingSeed = null;
 let onboardingGenerated = false;
 
 // Use a different keychain entry for development versions
-const KEYTAR_SERVICE = process.env.NODE_ENV === 'development' ? 'Trinity wallet (dev)' : 'Trinity wallet';
+const KEYTAR_SERVICE = remote.app.isPackaged ? 'Trinity wallet' : 'Trinity wallet (dev)';
 
 /**
  * Global Electron helper for native support