Desktop: Update Windows 7 branch to latest (#1352)

* Bump electron from 3.1.6 to 3.1.8 in /src/desktop (#1294) Bumps [electron](https://github.com/electron/electron) from 3.1.6 to 3.1.8. - [Release notes](https://github.com/electron/electron/releases) - [Commits](electron/electron@v3.1.6...v3.1.8) Signed-off-by: dependabot[bot] <support@dependabot.com> * feat: make sure we do not reconstruct and validate stored reattachments (#1293) * Mobile: Fix seed text input issues (#1291) * Mobile: Remove push to mask and fix Android letter duplication * Mobile: Remove unused textinput prop * Auto-retry with increased timeout for attachToTangle & getTransactionsToApprove APIs (#1285) * Mobile/iOS: Rebuild Entangled framework (#1280) Ref: rajivshah3/entangled@b246438 * Mobile/Android: Rebuild Entangled libs (#1281) Ref: iotaledger/entangled@771bb1e * Bump @babel/plugin-proposal-object-rest-spread in /src/desktop (#1305) Bumps [@babel/plugin-proposal-object-rest-spread](https://github.com/babel/babel) from 7.4.0 to 7.4.3. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](babel/babel@v7.4.0...v7.4.3) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump webpack-cli from 3.2.3 to 3.3.0 in /src/desktop (#1304) Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.2.3 to 3.3.0. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](webpack/webpack-cli@V.3.2.3...v.3.3.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump mini-css-extract-plugin from 0.5.0 to 0.6.0 in /src/desktop (#1295) Bumps [mini-css-extract-plugin](https://github.com/webpack-contrib/mini-css-extract-plugin) from 0.5.0 to 0.6.0. - [Release notes](https://github.com/webpack-contrib/mini-css-extract-plugin/releases) - [Changelog](https://github.com/webpack-contrib/mini-css-extract-plugin/blob/master/CHANGELOG.md) - [Commits](webpack-contrib/mini-css-extract-plugin@v0.5.0...v0.6.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump @babel/register from 7.0.0 to 7.4.0 in /src/desktop (#1297) Bumps [@babel/register](https://github.com/babel/babel) from 7.0.0 to 7.4.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](babel/babel@v7.0.0...v7.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Mobile: Use native dropdown component (#1275) * Shared: Remove 2FA from all versions (#1292) * Mobile: Remove 2FA * Shared: Remove 2FA strings and actions/reducers * Desktop: Remove 2fa * Desktop: Revert shrinkwrap changes * Desktop: Add initVault method * Update lockfiles * New Crowdin translations (#1277) * New translations translation.json (Polish) * New translations translation.json (Polish) * New translations translation.json (Croatian) * New translations translation.json (German) * New translations translation.json (Croatian) * New translations translation.json (Japanese) * New translations translation.json (Japanese) * New translations translation.json (Swedish) * New translations translation.json (Swedish) * Mobile: Fix navigation crash (#1308) * Shared: Rebuild icon font file (#1309) * Shared: Rebuild icon file * Mobile: Replace Android icon file * New Crowdin translations (#1307) * New translations translation.json (Bulgarian) * New translations translation.json (Spanish, Latin America) * New translations translation.json (Vietnamese) * New translations translation.json (Urdu (Pakistan)) * New translations translation.json (Thai) * New translations translation.json (Turkish) * New translations translation.json (Tamil) * New translations translation.json (Finnish) * New translations translation.json (Estonian) * New translations translation.json (Dutch) * New translations translation.json (Danish) * New translations translation.json (Czech) * New translations translation.json (Croatian) * New translations translation.json (Chinese Traditional) * New translations translation.json (Arabic) * New translations translation.json (Swedish) * New translations translation.json (Georgian) * New translations translation.json (Polish) * New translations translation.json (Korean) * New translations translation.json (German) * New translations translation.json (Chinese Simplified) * New translations translation.json (French) * New translations translation.json (German, Switzerland) * New translations translation.json (Spanish) * New translations translation.json (Norwegian) * New translations translation.json (Slovenian) * New translations translation.json (Slovak) * New translations translation.json (Serbian (Latin)) * New translations translation.json (Russian) * New translations translation.json (Romanian) * New translations translation.json (Portuguese, Brazilian) * New translations translation.json (Portuguese) * New translations translation.json (Persian) * New translations translation.json (Lithuanian) * New translations translation.json (Greek) * New translations translation.json (Latvian) * New translations translation.json (Kannada) * New translations translation.json (Japanese) * New translations translation.json (Italian) * New translations translation.json (Indonesian) * New translations translation.json (Hungarian) * New translations translation.json (Hindi) * New translations translation.json (Hebrew) * chore: disable redux-logger by default (#1310) * Mobile: Fix SeedVault export name (#1312) * Mobile: Fix unit info modal theming (#1311) * Bump snyk from 1.150.0 to 1.151.0 (#1320) * Bump i18next from 15.0.4 to 15.0.9 in /src/desktop (#1321) * Bump prettier from 1.11.0 to 1.16.4 (#1248) * Bump eslint-plugin-import from 2.16.0 to 2.17.1 (#1318) * Desktop: Show modal for Ledger udev errors (#1192) * Desktop: Show modal for Ledger udev errors * Desktop: Localize udev error strings * - Switch to link element for Ledger support url - Add back to Seed intro button to udeverror popup * Bump keytar from 4.4.0 to 4.4.1 in /src/desktop (#1316) Bumps [keytar](https://github.com/atom/node-keytar) from 4.4.0 to 4.4.1. - [Release notes](https://github.com/atom/node-keytar/releases) - [Commits](atom/node-keytar@v4.4.0...v4.4.1) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump webpack from 4.29.6 to 4.30.0 in /src/desktop (#1317) Bumps [webpack](https://github.com/webpack/webpack) from 4.29.6 to 4.30.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](webpack/webpack@v4.29.6...v4.30.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump react-router-dom from 4.3.1 to 5.0.0 in /src/desktop (#1319) Bumps [react-router-dom](https://github.com/ReactTraining/react-router) from 4.3.1 to 5.0.0. - [Release notes](https://github.com/ReactTraining/react-router/releases) - [Commits](remix-run/react-router@v4.3.1...v5.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Fix Linux icon path (#1322) * Shared: Fix realm schema migration (#1326) * New Crowdin translations (#1314) * New translations translation.json (German) * New translations translation.json (German) * New translations translation.json (German) * New translations translation.json (Portuguese, Brazilian) * New translations translation.json (Portuguese, Brazilian) * New translations translation.json (Polish) * New translations translation.json (Croatian) * New translations translation.json (Bulgarian) * New translations translation.json (Spanish, Latin America) * New translations translation.json (Vietnamese) * New translations translation.json (Urdu (Pakistan)) * New translations translation.json (Thai) * New translations translation.json (Turkish) * New translations translation.json (Tamil) * New translations translation.json (Finnish) * New translations translation.json (Estonian) * New translations translation.json (Dutch) * New translations translation.json (Danish) * New translations translation.json (Czech) * New translations translation.json (Croatian) * New translations translation.json (Chinese Traditional) * New translations translation.json (Arabic) * New translations translation.json (Swedish) * New translations translation.json (Georgian) * New translations translation.json (Polish) * New translations translation.json (Korean) * New translations translation.json (German) * New translations translation.json (Chinese Simplified) * New translations translation.json (French) * New translations translation.json (German, Switzerland) * New translations translation.json (Spanish) * New translations translation.json (Norwegian) * New translations translation.json (Slovenian) * New translations translation.json (Slovak) * New translations translation.json (Serbian (Latin)) * New translations translation.json (Russian) * New translations translation.json (Romanian) * New translations translation.json (Portuguese, Brazilian) * New translations translation.json (Portuguese) * New translations translation.json (Persian) * New translations translation.json (Lithuanian) * New translations translation.json (Greek) * New translations translation.json (Latvian) * New translations translation.json (Kannada) * New translations translation.json (Japanese) * New translations translation.json (Italian) * New translations translation.json (Indonesian) * New translations translation.json (Hungarian) * New translations translation.json (Hindi) * New translations translation.json (Hebrew) * New translations translation.json (Italian) * New translations translation.json (Japanese) * New translations translation.json (Polish) * Mobile: Upgrade react-native-keychain to 3.0.0 (#1180) * Mobile: Upgrade react-native-keychain to 3.0.0 * Mobile/iOS: Release foundTypeRefs when they are no longer being used Applies patch from oblador/react-native-keychain#188 * Mobile: Fix password fields crash (#1328) * Mobile: Bump build no to 54 (#1325) * Bump react-dom from 16.8.2 to 16.8.6 in /src/desktop (#1335) Bumps [react-dom](https://github.com/facebook/react/tree/HEAD/packages/react-dom) from 16.8.2 to 16.8.6. - [Release notes](https://github.com/facebook/react/releases) - [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/react/commits/v16.8.6/packages/react-dom) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump @babel/plugin-proposal-class-properties in /src/desktop (#1332) Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel) from 7.3.3 to 7.4.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](babel/babel@v7.3.3...v7.4.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump dart-sass from 1.17.2 to 1.18.0 in /src/desktop (#1331) Bumps [dart-sass](https://github.com/sass/dart-sass) from 1.17.2 to 1.18.0. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/master/CHANGELOG.md) - [Commits](sass/dart-sass@1.17.2...1.18.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump kdbxweb from 1.2.6 to 1.2.7 in /src/desktop (#1333) Bumps [kdbxweb](https://github.com/keeweb/kdbxweb) from 1.2.6 to 1.2.7. - [Release notes](https://github.com/keeweb/kdbxweb/releases) - [Changelog](https://github.com/keeweb/kdbxweb/blob/master/release-notes.md) - [Commits](keeweb/kdbxweb@1.2.6...1.2.7) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump eslint-plugin-import from 2.17.1 to 2.17.2 (#1337) * Desktop: Trigger notifications for new transactions only (#1323) * Desktop: Check for valid SeedVault file format (#1324) * Check for valid SeedVault file format on import * Fix string name formatting * Bump snyk from 1.151.0 to 1.151.1 (#1345) * Desktop: Update shrinkwrap (#1343) * Bump react-markdown from 4.0.6 to 4.0.8 in /src/desktop (#1347) Bumps [react-markdown](https://github.com/rexxars/react-markdown) from 4.0.6 to 4.0.8. - [Release notes](https://github.com/rexxars/react-markdown/releases) - [Changelog](https://github.com/rexxars/react-markdown/blob/master/CHANGELOG.md) - [Commits](https://github.com/rexxars/react-markdown/commits/v4.0.8) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump react from 16.8.3 to 16.8.6 in /src/desktop (#1346) Bumps [react](https://github.com/facebook/react/tree/HEAD/packages/react) from 16.8.3 to 16.8.6. - [Release notes](https://github.com/facebook/react/releases) - [Changelog](https://github.com/facebook/react/blob/master/CHANGELOG.md) - [Commits](https://github.com/facebook/react/commits/v16.8.6/packages/react) Signed-off-by: dependabot[bot] <support@dependabot.com> * Bump react-transition-group from 2.9.0 to 4.0.0 in /src/desktop (#1349) Bumps [react-transition-group](https://github.com/reactjs/react-transition-group) from 2.9.0 to 4.0.0. - [Release notes](https://github.com/reactjs/react-transition-group/releases) - [Changelog](https://github.com/reactjs/react-transition-group/blob/master/CHANGELOG.md) - [Commits](reactjs/react-transition-group@v2.9.0...v4.0.0) Signed-off-by: dependabot[bot] <support@dependabot.com> * Desktop: Update README.md (#1338) * Update README.md * Update README.md
iotaledger · Apr 23, 2019 · 90c131d · 90c131d
1 parent a2ff853
commit 90c131d
Show file tree

Hide file tree

Showing 124 changed files with 1,650 additions and 3,912 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -4,3 +4,5 @@ src/mobile/logo-spin/logo-spin-glow-blnk.hyperesources
 package.json
 src/shared/locales/*
 !src/shared/locales/en/translation.json
+src/desktop/dist/*
+npm-shrinkwrap.json
diff --git a/package.json b/package.json
@@ -41,16 +41,16 @@
     "eslint-config-airbnb": "^16.1.0",
     "eslint-config-prettier": "^4.1.0",
     "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-import": "^2.16.0",
+    "eslint-plugin-import": "^2.17.2",
     "eslint-plugin-jsx-a11y": "^6.2.1",
     "eslint-plugin-react": "^7.7.0",
     "eslint-plugin-react-native": "^3.2.1",
     "husky": "^1.3.1",
     "lint-staged": "^8.1.5",
-    "prettier": "^1.11.0"
+    "prettier": "^1.16.4"
   },
   "dependencies": {
-    "snyk": "^1.150.0"
+    "snyk": "^1.151.1"
   },
   "resolutions": {
     "request": ">=2.88.0",

diff --git a/src/desktop/README.md b/src/desktop/README.md
@@ -15,6 +15,8 @@ This is the repository for the IOTA Trinity Desktop Wallet. The application is b
 On **Windows** platforms you'll need to install build tools to succesfully compile native modules:
 
 ```
+# Windows Vista / 7 only 
+Install .NET Framework 4.5.1 (https://www.microsoft.com/en-us/download/details.aspx?id=40773)
 # Install Visual C++ Build Tools and Python 2.7
 npm install --global windows-build-tools
 # Install OpenSSL VC++ Static 64bit Library

diff --git a/src/desktop/main.js b/src/desktop/main.js
@@ -116,9 +116,7 @@ function createWindow() {
         show: false,
         frame: process.platform === 'linux',
         titleBarStyle: 'hidden',
-        icon: `${paths.assets}icon.${
-            process.platform === 'win32' ? 'ico' : process.platform === 'darwin' ? 'icns' : 'png'
-        }`,
+        icon: path.resolve(paths.assets, `icon.${process.platform === 'win32' ? 'ico' : process.platform === 'darwin' ? 'icns' : 'png'}`),
         webPreferences: {
             nodeIntegration: false,
             preload: path.resolve(paths.preload, devMode ? 'preloadDev.js' : 'preloadProd.js'),
@@ -226,8 +224,9 @@ function createWindow() {
                 'protect-eu.mimecast.com',
                 'privacy@iota.org',
             ];
+            const ledgerOnboarding = ['support.ledger.com'];
 
-            const externalWhitelist = [...privacyPolicyLinks, ...termsAndConditionsLinks];
+            const externalWhitelist = [...privacyPolicyLinks, ...termsAndConditionsLinks, ...ledgerOnboarding];
 
             try {
                 if (

diff --git a/src/desktop/native/Menu.js b/src/desktop/native/Menu.js
@@ -21,7 +21,6 @@ let language = {
     node: 'Node',
     currency: 'Currency',
     theme: 'Theme',
-    twoFA: 'Two-factor authentication',
     changePassword: 'Change password',
     advanced: 'Advanced settings',
     hide: 'Hide',
@@ -207,11 +206,6 @@ export const initMenu = (app, getWindowFunc) => {
                             {
                                 type: 'separator',
                             },
-                            {
-                                label: language.twoFA,
-                                enabled: state.authorised && state.enabled,
-                                click: () => navigate('settings/twoFa'),
-                            },
                             {
                                 label: language.changePassword,
                                 enabled: state.authorised && state.enabled,

diff --git a/src/desktop/native/kdbx.js b/src/desktop/native/kdbx.js
@@ -69,9 +69,30 @@ const importVault = async (buffer, password) => {
     return seeds;
 };
 
+/**
+ * Check for valid KDBX database format
+ * @param {buffer} Buffer - Encrypted binary KDBX database file content
+ * @returns {boolean}
+ */
+const checkFormat = (buffer) => {
+    const signature = buffer.byteLength < 8 ? null : new Uint32Array(buffer, 0, 2);
+
+    if (!signature || signature[0] !== kdbxweb.Consts.Signatures.FileMagic) {
+        return false;
+    }
+    if (signature[1] === kdbxweb.Consts.Signatures.Sig2Kdb) {
+        return false;
+    }
+    if (signature[1] !== kdbxweb.Consts.Signatures.Sig2Kdbx) {
+        return false;
+    }
+    return true;
+};
+
 const kdbx = {
     exportVault,
     importVault,
+    checkFormat,
 };
 
 export default kdbx;
diff --git a/src/desktop/native/preload/Electron.js b/src/desktop/native/preload/Electron.js
@@ -485,6 +485,15 @@ const Electron = {
         return seeds;
     },
 
+    /**
+     * Check if buffer is a valid SeedVault file
+     * @param {buffer} buffer - SeedVault file content
+     * @returns {boolean}
+     */
+    validateVault: (buffer) => {
+        return kdbx.checkFormat(buffer);
+    },
+
     /**
      * Create and show a native notification based on new transactions
      * @param {string} accountName - target account name
@@ -548,7 +557,6 @@ const Electron = {
             node: t('node'),
             currency: t('settings:currency'),
             theme: t('settings:theme'),
-            twoFA: t('settings:twoFA'),
             changePassword: t('settings:changePassword'),
             advanced: t('settings:advanced'),
             hide: t('settings:hide'),