Merge branch 'master' into subscribe-notify

2018-03-07 20:39:57 -08:00 · 2018-03-07 20:39:57 -08:00 · ac0980f75d
parent 174285aea8 77ae75a655
commit ac0980f75d
17 changed files with 2056 additions and 1051 deletions
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -4,7 +4,7 @@
    "airbnb",
    "plugin:import/electron",
    "plugin:flowtype/recommended",
-    "plugin:prettier/recommended"
+    "prettier"
  ],
  "settings": {
    "import/resolver": {
@ -28,11 +28,6 @@
  "rules": {
    "import/no-commonjs": "warn",
    "import/no-amd": "warn",
-    "prettier/prettier": ["error", {
-      "trailingComma": "es5",
-      "printWidth": 100,
-      "singleQuote": true
-    }],
    "func-names": ["warn", "as-needed"]
  }
 }
--- a/.flowconfig
+++ b/.flowconfig
@ -1,10 +1,9 @@
 [ignore]
-.*/node_modules/**

 [include]

 [libs]
-flow-typed
+./flow-typed

 [lints]

--- a/.gitignore
+++ b/.gitignore
@ -1,6 +1,7 @@
 /node_modules
 /dist
 /build/daemon.ver
+/build/daemon.zip
 /build/venv
 *.pyc
 /static/daemon/lbrynet*
--- a/.travis.yml
+++ b/.travis.yml
@ -1,28 +1,45 @@
-env:
-  global:
-  - TRANSIFEX_USER: api
-  - secure: u6gwnZlPGJLnvpoPPCpUZ+jBPajQuIW1+aq6UGW57z54AUjTAECxaYpqcGTGtDBjYark/yeiso887wP/EmJva7hMHeNMf6uLqwzP3YFsIv/Iv+9c1f4MXbJNgOrEKN834o/BdkD4ifi9CCiH9uPPVYGPx1bvfaxGpcHmQXdW4F4S0uj+jePB257mt+afGiNlz9wET6kWJKNNZf/4BNmefldVNq7h6oTSLsyO1TBhDcvSjatpKIwmXUNQfSUTFWvrtpWUB/m/IzitGuUtrt82vU2fPl7tuH6BHNrNp58MINjFzXXJLC+mMybb2UBDIAuc3+k7vj4J0U2rkcTloxDNCKNmYa1jBogOKBRgGp98Ct7E0V2vuLGAPniUbvBcCGK1wwed7uwDjsz3YNCGxUEcyyWc3OVDgN/up4+gXHxkh9FTpZy8Q3rSZx4Lwj700impBUQIVh/5p7Vgv+bSUdOeVRAMlcP9yT83jX50w9LkJMfICFPNv1tOZ3/SOnnB+JdW/ahpplFI4Z68/fBLttZTeaNcU4f28oJvPer8Wll+Elx5kxwLqLbwVUFNlxTxY1LYnPB7SPjGxrFNy3mVTRq5Pxp1hMiTZF4TlapkfHgR+gEzk2wpcJGmub70tW2baZaJF0jDBWIh7GXV+EGve53BKDhpX2Z6jTK0gkhrSUW1MT8=
-  - secure: h1r9Qzv2xHRQl7nDHcscB4qDv7KlF/ncgHko1YuoY4oLZipBV8mzQXDmn3nlMKwaKOe1/Tty/bjoZexkWict4cwKBzU7/1HtJeMa6nxRICuS6DiVhLUNGZEddK6jQLxeEZFxkFPSCZyjybPWtasF8f8jd0lqqLIL4/FcIVV56aRCKAsUwCbedxi8Vnc19l74xjaQIK82xBFYOQPK078OBovk9DDOnicTjMulUo3/pKEZD1njSdcEhfSRv+MFE+31B/a6lpoLo7twPlyzLMfpo30NlEzIN0TeMAk44e4PV6DYg0wntC2GJ21p4BqMnDGocwnZwm7gpjflzUZdW6hF0esGLcqOdbyJLUb3rNX9AzQmn0p9KwDC3S80peZFxSiuLJGL8eivceVDUK/jwWinu3OHDJ/eO5iMDm9odm2ALemPtrDTSlRNT8HzNCY9PQTU9Dhdm4Q/dGDsRPWibFJSJ/qGKhVgadk2CUEAPua0hB1zZ556PkTGx4R1JDscgFDAkgemzgKl4Z/4qK3xGDoEtz1HmBlvQtn+B/PuhA2essADj0iTDiItxb7AYTA7EzsHEcRMmrbYarZ3Eh2onWy2GOpAGRN5Xl9cBIDbibcSC6BLI1m2PcLABpP7DhUX4bJbsVNSiGesHEU7o9Dgn8Ig09eHW/8F9i0VVoGUZXxKMJ8=
-
-os: linux
-dist: xenial
-
-branches:
-  only:
-  - "/^v\\d+\\.\\d+\\.\\d+$/"
-
-install:
- rvm install 2.3.1
-
+matrix:
+  include:
+    - os: osx
+      osx_image: xcode9.2
+      language: node_js
+      node_js: "9"
+      env:
+        - ELECTRON_CACHE=$HOME/.cache/electron
+        - ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder
+    - os: linux
+      services: docker
+      language: generic
+before_cache:
+  - rm -rf $HOME/.cache/electron-builder/wine
+cache:
+  directories:
+  - node_modules
+  - $HOME/.cache/electron
+  - $HOME/.cache/electron-builder
+before_install:
+  - |
+    if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+      mkdir -p /tmp/git-lfs && curl -L https://github.com/github/git-lfs/releases/download/v2.3.1/git-lfs-$([ "$TRAVIS_OS_NAME" == "linux" ] && echo "linux" || echo "darwin")-amd64-2.3.1.tar.gz | tar -xz -C /tmp/git-lfs --strip-components 1
+      export PATH="/tmp/git-lfs:$PATH"
+    fi
+before_script:
+  - git lfs pull
 script:
- rvm use 2.3.1 && gem install danger --version '~> 4.0' && danger
- FULL_BUILD=true ./build.sh
-
-sudo: required
-after_success:
- pip install virtualenv
- virtualenv ~/env
- source ~/env/bin/activate
- pip install transifex-client
- sudo echo $'[https://www.transifex.com]\nhostname = https://www.transifex.com\nusername= '"$TRANSIFEX_USER"$'\npassword = '"$TRANSIFEX_PASSWORD"$'\ntoken = '"$TRANSIFEX_API_TOKEN"$'\n' > ~/.transifexrc
- tx push -s
+  - |
+    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+      docker run --rm \
+        --env-file <(env | grep -iE 'DEBUG|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_') \
+        -v ${PWD}:/project \
+        -v ~/.cache/electron:/root/.cache/electron \
+        -v ~/.cache/electron-builder:/root/.cache/electron-builder \
+        electronuserland/builder:wine \
+        /bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn build --linux --win"
+    else
+      yarn build
+    fi
+branches:
+  except:
+    - "/^v\\d+\\.\\d+\\.\\d+$/"
+addons:
+  artifacts: true
--- a/build/build.sh
+++ b/build/build.sh
@ -43,32 +43,6 @@ fi

 yarn install

-####################
-#  daemon and cli  #
-####################
-echo -e "\033[0;32mGrabbing Daemon and CLI\x1b[m"
-if $OSX; then
-  OSNAME="macos"
-else
-  OSNAME="linux"
-fi
-DAEMON_VER=$(node -e "console.log(require(\"$ROOT/package.json\").lbrySettings.lbrynetDaemonVersion)")
-DAEMON_URL_TEMPLATE=$(node -e "console.log(require(\"$ROOT/package.json\").lbrySettings.lbrynetDaemonUrlTemplate)")
-DAEMON_URL=$(echo ${DAEMON_URL_TEMPLATE//DAEMONVER/$DAEMON_VER} | sed "s/OSNAME/$OSNAME/g")
-DAEMON_VER_PATH="$BUILD_DIR/daemon.ver"
-echo "$DAEMON_VER_PATH"
-if [[ ! -f $DAEMON_VER_PATH || ! -f $ROOT/static/daemon/lbrynet-daemon || "$(< "$DAEMON_VER_PATH")" != "$DAEMON_VER" ]]; then
-    curl -sL -o "$BUILD_DIR/daemon.zip" "$DAEMON_URL"
-    unzip "$BUILD_DIR/daemon.zip" -d "$ROOT/static/daemon/"
-    rm "$BUILD_DIR/daemon.zip"
-    echo "$DAEMON_VER" > "$DAEMON_VER_PATH"
-else
-    echo -e "\033[4;31mAlready have daemon version $DAEMON_VER, skipping download\x1b[m"
-fi
-
-
-
-
 ###################
 #  Build the app  #
 ###################
--- a/build/downloadDaemon.js
+++ b/build/downloadDaemon.js
@ -0,0 +1,47 @@
+/* eslint-disable no-console,import/no-commonjs */
+const path = require('path');
+const fs = require('fs');
+const packageJSON = require('../package.json');
+// eslint-disable-next-line import/no-extraneous-dependencies
+const axios = require('axios');
+// eslint-disable-next-line import/no-extraneous-dependencies
+const decompress = require('decompress');
+const os = require('os');
+
+const daemonURLTemplate = packageJSON.lbrySettings.lbrynetDaemonUrlTemplate;
+const daemonVersion = packageJSON.lbrySettings.lbrynetDaemonVersion;
+let currentPlatform = os.platform();
+if (currentPlatform === 'darwin') currentPlatform = 'macos';
+if (currentPlatform === 'win32') currentPlatform = 'windows';
+
+const daemonURL = daemonURLTemplate
+  .replace(/DAEMONVER/g, daemonVersion)
+  .replace(/OSNAME/g, currentPlatform);
+const tmpZipPath = 'build/daemon.zip';
+
+console.log('\x1b[34minfo\x1b[0m Downloading daemon...');
+axios
+  .request({
+    responseType: 'arraybuffer',
+    url: daemonURL,
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/zip',
+    },
+  })
+  .then(result => {
+    fs.writeFileSync(tmpZipPath, result.data);
+    return true;
+  })
+  .then(() => {
+    decompress(tmpZipPath, 'static/daemon', {
+      filter: file =>
+        path.basename(file.path).replace(path.extname(file.path), '') === 'lbrynet-daemon',
+    });
+  })
+  .then(() => {
+    console.log('\x1b[32msuccess\x1b[0m Daemon downloaded!');
+  })
+  .catch(error => {
+    console.error(`\x1b[31merror\x1b[0m Daemon download failed due to: \x1b[35m${error}\x1b[0m`);
+  });
--- a/electron-builder.json
+++ b/electron-builder.json
@ -1,11 +1,13 @@
 {
  "appId": "io.lbry.LBRY",
-  "publish": {
+  "productName": "LBRY",
+  "publish": [{
    "provider": "s3",
    "bucket": "releases.lbry.io",
    "path": "app/latest"
-  },
+  }, "github"],
  "mac": {
+    "target": "dmg",
    "category": "public.app-category.entertainment"
  },
  "dmg": {
@ -28,36 +30,24 @@
      "width": 500,
      "height": 300
    },
-    "background": "build/background.png"
+    "background": "./build/background.png"
  },
  "protocols": [
    {
-      "name": "lbry",
+      "name": "LBRY URI",
      "schemes": ["lbry"],
      "role": "Viewer"
    }
  ],
  "linux": {
-    "target": "deb",
-    "category": "Video;AudioVideo;",
+    "target": "AppImage",
+    "category": "AudioVideo;Video",
    "desktop": {
-      "MimeType": "x-scheme-handler/lbry",
-      "Exec": "/opt/LBRY/lbry %U"
+      "MimeType": "x-scheme-handler/lbry;"
    }
  },
-  "deb": {
-    "depends": [
-      "gconf2",
-      "gconf-service",
-      "libnotify4",
-      "libappindicator1",
-      "libxtst6",
-      "libnss3",
-      "libsecret-1-0"
-    ]
-  },
  "nsis": {
    "perMachine": true
  },
-  "artifactName": "${productName}_${version}_${arch}.${ext}"
+  "artifactName": "${productName}_${version}.${ext}"
 }
--- a/package.json
+++ b/package.json
@ -1,5 +1,5 @@
 {
-  "name": "LBRY",
+  "name": "lbry-app",
  "version": "0.20.0",
  "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
  "homepage": "https://lbry.io/",
@ -21,7 +21,8 @@
    "compile": "electron-webpack && yarn extract-langs",
    "build": "yarn compile && electron-builder build",
    "build:dir": "yarn build -- --dir -c.compression=store -c.mac.identity=null",
-    "postinstall": "electron-builder install-app-deps",
+    "release": "yarn compile && electron-builder build",
+    "postinstall": "electron-builder install-app-deps && node build/downloadDaemon.js",
    "lint": "eslint 'src/**/*.{js,jsx}' --fix",
    "format": "prettier 'src/**/*.{js,jsx,scss,json}' --write"
  },
@ -33,16 +34,17 @@
    "classnames": "^2.2.5",
    "country-data": "^0.0.31",
    "electron-dl": "^1.6.0",
+    "electron-is-dev": "^0.3.0",
    "electron-log": "^2.2.12",
-    "electron-publisher-s3": "^19.47.0",
-    "electron-updater": "^2.18.2",
+    "electron-publisher-s3": "^20.2.0",
+    "electron-updater": "^2.21.0",
    "find-process": "^1.1.0",
    "formik": "^0.10.4",
    "from2": "^2.3.0",
    "install": "^0.10.2",
    "jayson": "^2.0.2",
    "jshashes": "^1.0.7",
-    "keytar-prebuild": "^4.0.4",
+    "keytar-prebuild": "^4.1.1",
    "localforage": "^1.5.0",
    "mixpanel-browser": "^2.17.1",
    "moment": "^2.20.1",
@ -72,43 +74,41 @@
    "y18n": "^4.0.0"
  },
  "devDependencies": {
-    "babel-eslint": "^8.0.3",
-    "babel-plugin-module-resolver": "^3.0.0",
-    "babel-plugin-react-require": "^3.0.0",
+    "axios": "^0.18.0",
+    "babel-eslint": "^8.2.2",
+    "babel-plugin-module-resolver": "^3.1.0",
    "babel-polyfill": "^6.20.0",
    "babel-preset-env": "^1.6.1",
    "babel-preset-react": "^6.24.1",
    "babel-preset-stage-2": "^6.18.0",
+    "decompress": "^4.2.0",
    "devtron": "^1.4.0",
-    "electron": "^1.7.11",
-    "electron-builder": "^19.55.2",
-    "electron-devtools-installer": "^2.2.1",
-    "electron-webpack": "^1.11.0",
-    "eslint": "^4.13.1",
+    "electron": "^1.8.3",
+    "electron-builder": "^20.3.1",
+    "electron-devtools-installer": "^2.2.3",
+    "electron-webpack": "^1.13.0",
+    "eslint": "^4.18.2",
    "eslint-config-airbnb": "^16.1.0",
    "eslint-config-prettier": "^2.9.0",
-    "eslint-import-resolver-webpack": "^0.8.3",
-    "eslint-plugin-flowtype": "^2.40.1",
-    "eslint-plugin-import": "^2.8.0",
+    "eslint-import-resolver-webpack": "^0.8.4",
+    "eslint-plugin-flowtype": "^2.46.1",
+    "eslint-plugin-import": "^2.9.0",
    "eslint-plugin-jsx-a11y": "^6.0.3",
-    "eslint-plugin-prettier": "^2.4.0",
-    "eslint-plugin-react": "^7.5.1",
-    "flow-babel-webpack-plugin": "^1.1.0",
-    "flow-bin": "^0.61.0",
-    "flow-typed": "^2.2.3",
+    "eslint-plugin-prettier": "^2.6.0",
+    "eslint-plugin-react": "^7.7.0",
+    "flow-babel-webpack-plugin": "^1.1.1",
+    "flow-bin": "^0.66.0",
+    "flow-typed": "^2.3.0",
    "husky": "^0.14.3",
    "i18n-extract": "^0.5.1",
    "json-loader": "^0.5.4",
-    "lint-staged": "^6.0.0",
+    "lint-staged": "^7.0.0",
    "node-loader": "^0.6.0",
    "node-sass": "^4.7.2",
-    "prettier": "^1.4.2",
-    "sass-loader": "^6.0.6",
+    "prettier": "^1.11.1",
+    "sass-loader": "^6.0.7",
    "webpack": "^3.10.0",
-    "webpack-build-notifier": "^0.1.18"
-  },
-  "resolutions": {
-    "webpack/webpack-sources": "1.0.1"
+    "webpack-build-notifier": "^0.1.23"
  },
  "engines": {
    "node": ">=6",
--- a/src/main/createWindow.js
+++ b/src/main/createWindow.js
@ -1,4 +1,5 @@
 import { app, BrowserWindow, dialog } from 'electron';
+import isDev from 'electron-is-dev';
 import setupBarMenu from './menu/setupBarMenu';
 import setupContextMenu from './menu/setupContextMenu';

@ -12,20 +13,18 @@ export default appState => {
  };

  // Disable renderer process's webSecurity on development to enable CORS.
-  windowConfiguration =
-    process.env.NODE_ENV === 'development'
-      ? {
-          ...windowConfiguration,
-          webPreferences: {
-            webSecurity: false,
-          },
-        }
-      : windowConfiguration;
+  windowConfiguration = isDev
+    ? {
+        ...windowConfiguration,
+        webPreferences: {
+          webSecurity: false,
+        },
+      }
+    : windowConfiguration;

-  const rendererURL =
-    process.env.NODE_ENV === 'development'
-      ? `http://localhost:${process.env.ELECTRON_WEBPACK_WDS_PORT}`
-      : `file://${__dirname}/index.html`;
+  const rendererURL = isDev
+    ? `http://localhost:${process.env.ELECTRON_WEBPACK_WDS_PORT}`
+    : `file://${__dirname}/index.html`;

  let window = new BrowserWindow(windowConfiguration);

@ -84,7 +83,7 @@ export default appState => {
  window.webContents.on('did-finish-load', () => {
    window.webContents.send('open-uri-requested', deepLinkingURI, true);
    window.webContents.session.setUserAgent(`LBRY/${app.getVersion()}`);
-    if (process.env.NODE_ENV === 'development') {
+    if (isDev) {
      window.webContents.openDevTools();
    }
  });
--- a/src/main/index.js
+++ b/src/main/index.js
@ -7,6 +7,7 @@ import url from 'url';
 import https from 'https';
 import { shell, app, ipcMain, dialog } from 'electron';
 import { autoUpdater } from 'electron-updater';
+import isDev from 'electron-is-dev';
 import Daemon from './Daemon';
 import createTray from './createTray';
 import createWindow from './createWindow';
@ -72,7 +73,7 @@ app.on('ready', async () => {
    });
    daemon.launch();
  }
-  if (process.env.NODE_ENV === 'development') {
+  if (isDev) {
    await installExtensions();
  }
  rendererWindow = createWindow(appState);
--- a/src/main/menu/setupContextMenu.js
+++ b/src/main/menu/setupContextMenu.js
@ -1,5 +1,6 @@
 // @flow
 import { Menu, BrowserWindow } from 'electron';
+import isDev from 'electron-is-dev';

 export default (rendererWindow: BrowserWindow) => {
  rendererWindow.webContents.on('context-menu', (e, params) => {
@ -17,7 +18,7 @@ export default (rendererWindow: BrowserWindow) => {
      },
    ];

-    if (process.env.NODE_ENV === 'development') {
+    if (isDev) {
      template.push(...developmentTemplateAddition);
    }

--- a/src/renderer/app.js
+++ b/src/renderer/app.js
@ -2,6 +2,7 @@ import store from 'store';
 import { remote } from 'electron';
 import Path from 'path';
 import y18n from 'y18n';
+import isDev from 'electron-is-dev';

 const env = process.env.NODE_ENV || 'production';
 const i18n = y18n({
@ -22,7 +23,7 @@ const app = {
 };

 // Workaround for https://github.com/electron-userland/electron-webpack/issues/52
-if (env !== 'development') {
+if (!isDev) {
  window.staticResourcesPath = Path.join(remote.app.getAppPath(), '../static').replace(
    /\\/g,
    '\\\\'
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@ -14,9 +14,8 @@ import {
  doShowSnackBar,
  doAutoUpdate,
 } from 'redux/actions/app';
-import { doUpdateIsNightAsync } from 'redux/actions/settings';
 import { doNavigate } from 'redux/actions/navigation';
-import { doDownloadLanguages } from 'redux/actions/settings';
+import { doDownloadLanguages, doUpdateIsNightAsync } from 'redux/actions/settings';
 import { doUserEmailVerify } from 'redux/actions/user';
 import 'scss/all.scss';
 import store from 'store';
@ -27,11 +26,6 @@ const { autoUpdater } = remote.require('electron-updater');

 autoUpdater.logger = remote.require('electron-log');

-window.addEventListener('contextmenu', event => {
-  contextMenu(remote.getCurrentWindow(), event.x, event.y, app.env === 'development');
-  event.preventDefault();
-});
-
 ipcRenderer.on('open-uri-requested', (event, uri, newSession) => {
  if (uri && uri.startsWith('lbry://')) {
    if (uri.startsWith('lbry://?verify=')) {
@ -106,18 +100,17 @@ const init = () => {
    app.store.dispatch(doAutoUpdate());
  });

-  if (['win32', 'darwin'].includes(process.platform)) {
-    autoUpdater.on('update-available', () => {
-      console.log('Update available');
-    });
-    autoUpdater.on('update-not-available', () => {
-      console.log('Update not available');
-    });
-    autoUpdater.on('update-downloaded', () => {
-      console.log('Update downloaded');
-      app.store.dispatch(doAutoUpdate());
-    });
-  }
+  autoUpdater.on('update-available', () => {
+    console.log('Update available');
+  });
+  autoUpdater.on('update-not-available', () => {
+    console.log('Update not available');
+  });
+  autoUpdater.on('update-downloaded', () => {
+    console.log('Update downloaded');
+    app.store.dispatch(doAutoUpdate());
+  });
+
  app.store.dispatch(doUpdateIsNightAsync());
  app.store.dispatch(doDownloadLanguages());

--- a/src/renderer/redux/actions/app.js
+++ b/src/renderer/redux/actions/app.js
@ -1,9 +1,9 @@
-/* eslint-disable import/no-commonjs */
+import isDev from 'electron-is-dev';
+import Lbry from 'lbry';
+import path from 'path';
 import * as ACTIONS from 'constants/action_types';
 import * as MODALS from 'constants/modal_types';
 import { ipcRenderer, remote } from 'electron';
-import Lbry from 'lbry';
-import Path from 'path';
 import { doFetchRewardedContent } from 'redux/actions/content';
 import { doFetchFileInfosAndPublishedClaims } from 'redux/actions/file_info';
 import { doAuthNavigate } from 'redux/actions/navigation';
@ -16,18 +16,17 @@ import { doCheckSubscriptions } from 'redux/actions/subscriptions';
 import {
  selectCurrentModal,
  selectIsUpgradeSkipped,
-  selectRemoteVersion,
  selectUpdateUrl,
  selectUpgradeDownloadItem,
  selectUpgradeDownloadPath,
  selectUpgradeFilename,
  selectAutoUpdateDeclined,
 } from 'redux/selectors/app';
+import { lbrySettings as config } from 'package.json';

 const { autoUpdater } = remote.require('electron-updater');
 const { download } = remote.require('electron-dl');
 const Fs = remote.require('fs');
-const { lbrySettings: config } = require('package.json');

 const CHECK_UPGRADE_INTERVAL = 10 * 60 * 1000;

@ -85,25 +84,19 @@ export function doDownloadUpgradeRequested() {

    const autoUpdateDeclined = selectAutoUpdateDeclined(state);

-    if (['win32', 'darwin'].includes(process.platform)) {
-      // electron-updater behavior
-      if (autoUpdateDeclined) {
-        // The user declined an update before, so show the "confirm" dialog
-        dispatch({
-          type: ACTIONS.OPEN_MODAL,
-          data: { modal: MODALS.AUTO_UPDATE_CONFIRM },
-        });
-      } else {
-        // The user was never shown the original update dialog (e.g. because they were
-        // watching a video). So show the inital "update downloaded" dialog.
-        dispatch({
-          type: ACTIONS.OPEN_MODAL,
-          data: { modal: MODALS.AUTO_UPDATE_DOWNLOADED },
-        });
-      }
+    if (autoUpdateDeclined) {
+      // The user declined an update before, so show the "confirm" dialog
+      dispatch({
+        type: ACTIONS.OPEN_MODAL,
+        data: { modal: MODALS.AUTO_UPDATE_CONFIRM },
+      });
    } else {
-      // Old behavior for Linux
-      dispatch(doDownloadUpgrade());
+      // The user was never shown the original update dialog (e.g. because they were
+      // watching a video). So show the initial "update downloaded" dialog.
+      dispatch({
+        type: ACTIONS.OPEN_MODAL,
+        data: { modal: MODALS.AUTO_UPDATE_DOWNLOADED },
+      });
    }
  };
 }
@ -112,7 +105,7 @@ export function doDownloadUpgrade() {
  return (dispatch, getState) => {
    const state = getState();
    // Make a new directory within temp directory so the filename is guaranteed to be available
-    const dir = Fs.mkdtempSync(remote.app.getPath('temp') + Path.sep);
+    const dir = Fs.mkdtempSync(remote.app.getPath('temp') + path.sep);
    const upgradeFilename = selectUpgradeFilename(state);

    const options = {
@ -130,7 +123,7 @@ export function doDownloadUpgrade() {
        type: ACTIONS.UPGRADE_DOWNLOAD_COMPLETED,
        data: {
          downloadItem,
-          path: Path.join(dir, upgradeFilename),
+          path: path.join(dir, upgradeFilename),
        },
      });
    });
@ -148,8 +141,7 @@ export function doDownloadUpgrade() {
 }

 export function doAutoUpdate() {
-  return function(dispatch, getState) {
-    const state = getState();
+  return dispatch => {
    dispatch({
      type: ACTIONS.AUTO_UPDATE_DOWNLOADED,
    });
@ -162,8 +154,7 @@ export function doAutoUpdate() {
 }

 export function doAutoUpdateDeclined() {
-  return function(dispatch, getState) {
-    const state = getState();
+  return dispatch => {
    dispatch({
      type: ACTIONS.AUTO_UPDATE_DECLINED,
    });
@ -184,6 +175,7 @@ export function doCancelUpgrade() {
      try {
        upgradeDownloadItem.cancel();
      } catch (err) {
+        // eslint-disable-next-line no-console
        console.error(err);
        // Do nothing
      }
@ -200,47 +192,11 @@ export function doCheckUpgradeAvailable() {
      type: ACTIONS.CHECK_UPGRADE_START,
    });

-    if (['win32', 'darwin'].includes(process.platform)) {
-      // On Windows and Mac, updates happen silently through
-      // electron-updater.
-      const autoUpdateDeclined = selectAutoUpdateDeclined(state);
+    const autoUpdateDeclined = selectAutoUpdateDeclined(state);

-      if (!autoUpdateDeclined) {
-        autoUpdater.checkForUpdates();
-      }
-      return;
+    if (!autoUpdateDeclined && !isDev) {
+      autoUpdater.checkForUpdates();
    }
-
-    const success = ({ remoteVersion, upgradeAvailable }) => {
-      dispatch({
-        type: ACTIONS.CHECK_UPGRADE_SUCCESS,
-        data: {
-          upgradeAvailable,
-          remoteVersion,
-        },
-      });
-
-      if (
-        upgradeAvailable &&
-        !selectCurrentModal(state) &&
-        (!selectIsUpgradeSkipped(state) || remoteVersion !== selectRemoteVersion(state))
-      ) {
-        dispatch({
-          type: ACTIONS.OPEN_MODAL,
-          data: {
-            modal: MODALS.UPGRADE,
-          },
-        });
-      }
-    };
-
-    const fail = () => {
-      dispatch({
-        type: ACTIONS.CHECK_UPGRADE_FAIL,
-      });
-    };
-
-    Lbry.getAppVersionInfo().then(success, fail);
  };
 }

--- a/src/renderer/redux/actions/settings.js
+++ b/src/renderer/redux/actions/settings.js
@ -56,16 +56,6 @@ export function doGetThemes() {
  };
 }

-export function doUpdateIsNightAsync() {
-  return dispatch => {
-    dispatch(doUpdateIsNight());
-    const updateIsNightInterval = setInterval(
-      () => dispatch(doUpdateIsNight()),
-      UPDATE_IS_NIGHT_INTERVAL
-    );
-  };
-}
-
 export function doUpdateIsNight() {
  const momentNow = moment();
  return {
@ -80,6 +70,16 @@ export function doUpdateIsNight() {
  };
 }

+export function doUpdateIsNightAsync() {
+  return dispatch => {
+    dispatch(doUpdateIsNight());
+    const updateIsNightInterval = setInterval(
+      () => dispatch(doUpdateIsNight()),
+      UPDATE_IS_NIGHT_INTERVAL
+    );
+  };
+}
+
 export function doDownloadLanguage(langFile) {
  return dispatch => {
    const destinationPath = `${app.i18n.directory}/${langFile}`;
--- a/webpack.renderer.additions.js
+++ b/webpack.renderer.additions.js
@ -1,5 +1,6 @@
 const path = require('path');
 const FlowFlowPlugin = require('./flowtype-plugin');
+const isDev = require('electron-is-dev');

 const ELECTRON_RENDERER_PROCESS_ROOT = path.resolve(__dirname, 'src/renderer/');

@ -23,7 +24,7 @@ module.exports = {
  },
 };

-if (process.env.NODE_ENV === 'development') {
+if (isDev) {
  module.exports.plugins = [
    new FlowFlowPlugin({
      warn: true,
--- a/yarn.lock
+++ b/yarn.lock