.editorconfig

@@ -7,6 +7,7 @@ indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
+insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false

.eslintrc.js

@@ -1,10 +0,0 @@
-module.exports = {
-  extends: ["./node_modules/@balena/lint/config/.eslintrc.js"],
-  root: true,
-  ignorePatterns: ["node_modules/"],
-  rules: {
-    "@typescript-eslint/no-floating-promises": "off",
-    "@typescript-eslint/no-var-requires": "off",
-    "@typescript-eslint/ban-ts-comment": "off",
-  },
-};

.eslintrc.yml

@@ -0,0 +1,454 @@
+env:
+  browser: true
+  commonjs: true
+  es6: true
+  node: true
+  mocha: true
+plugins:
+  - lodash
+  - jsdoc
+  - node
+  - react
+extends: 'standard'
+parserOptions:
+  sourceType: 'script'
+  ecmaFeatures:
+    jsx: true
+settings:
+  jsdoc:
+    additionalTagNames:
+      customTags:
+        - fulfil
+rules:
+
+  # Possible Errors
+
+  no-console:
+    - off
+  no-empty:
+    - error
+  no-extra-semi:
+    - error
+  no-negated-in-lhs:
+    - error
+  no-prototype-builtins:
+    - error
+  valid-jsdoc:
+    - error
+    - requireReturn: false
+      requireReturnDescription: false
+      requireReturnType: true
+      requireParamDescription: true
+      preferType:
+        boolean: "Boolean"
+        number: "Number"
+        object: "Object"
+        string: "String"
+        array: "Array"
+      prefer:
+        arg: "param"
+        return: "returns"
+
+  # Best Practices
+
+  array-callback-return:
+    - error
+  block-scoped-var:
+    - error
+  class-methods-use-this:
+    - error
+  complexity:
+    - off
+  consistent-return:
+    - error
+  curly:
+    - error
+  default-case:
+    - error
+  dot-notation:
+    - error
+  guard-for-in:
+    - error
+  no-alert:
+    - error
+  no-case-declarations:
+    - error
+  no-div-regex:
+    - error
+  no-else-return:
+    - error
+  no-empty-function:
+    - error
+  no-eq-null:
+    - error
+  no-extra-label:
+    - error
+  no-implicit-coercion:
+    - error
+  no-implicit-globals:
+    - error
+  no-loop-func:
+    - error
+  no-magic-numbers:
+    - error
+  no-native-reassign:
+    - error
+  no-param-reassign:
+    - error
+  no-restricted-properties:
+    - error
+    - property: __proto__
+  no-return-await:
+    - error
+  no-script-url:
+    - error
+  no-unused-expressions:
+    - error
+  no-unused-labels:
+    - error
+  no-useless-concat:
+    - error
+  no-void:
+    - error
+  no-warning-comments:
+    - off
+  radix:
+    - error
+  vars-on-top:
+    - off
+
+  # Strict mode
+
+  strict:
+    - error
+    - global
+
+  # Variables
+
+  init-declarations:
+    - error
+    - always
+  no-catch-shadow:
+    - error
+  no-restricted-globals:
+    - error
+    - event
+  no-shadow:
+    - error
+  no-undefined:
+    - error
+  no-unused-vars:
+    - error
+  no-use-before-define:
+    - error
+
+  # NodeJS and CommonJS
+
+  callback-return:
+    - error
+  global-require:
+    - off
+  no-mixed-requires:
+    - error
+  no-process-env:
+    - off
+  no-process-exit:
+    - off
+  no-sync:
+    - off
+
+  # Stylistic Issues
+
+  array-bracket-spacing:
+    - error
+    - always
+  capitalized-comments:
+    - error
+    - always
+    - ignoreConsecutiveComments: true
+  comma-spacing:
+    - error
+    - before: false
+      after: true
+  computed-property-spacing:
+    - error
+    - never
+  consistent-this:
+    - error
+    - self
+  func-name-matching:
+    - error
+    - always
+  func-names:
+    - error
+    - never
+  func-style:
+    - error
+    - expression
+  id-blacklist:
+    - error
+  id-length:
+    - error
+    - min: 2
+      exceptions:
+        - "_"
+  id-match:
+    - error
+    - "^[_0-9A-Za-z\\$]+$"
+  line-comment-position:
+    - error
+    - position: above
+  linebreak-style:
+    - error
+    - unix
+  lines-around-comment:
+    - error
+    - beforeBlockComment: true
+      afterBlockComment: false
+      beforeLineComment: true
+      afterLineComment: false
+      allowBlockStart: true
+      allowBlockEnd: false
+      allowObjectStart: true
+      allowObjectEnd: false
+      allowArrayStart: true
+      allowArrayEnd: false
+  lines-around-directive:
+    - error
+    - always
+  max-len:
+    - error
+    - code: 130
+      comments: 150
+      ignoreComments: false
+      ignoreTrailingComments: false
+      ignoreUrls: true
+  max-params:
+    - off
+  max-statements-per-line:
+    - error
+    - max: 1
+  multiline-ternary:
+    - off
+  newline-per-chained-call:
+    - off
+  no-bitwise:
+    - error
+  no-continue:
+    - error
+  no-inline-comments:
+    - error
+  no-lonely-if:
+    - error
+  no-mixed-operators:
+    - error
+  no-multi-assign:
+    - error
+  no-negated-condition:
+    - error
+  no-nested-ternary:
+    - error
+  no-plusplus:
+    - error
+  no-restricted-syntax:
+    - error
+    - WithStatement
+    - ForInStatement
+  no-spaced-func:
+    - error
+  no-underscore-dangle:
+    - error
+    - allowAfterThis: false
+  object-curly-newline:
+    - error
+    - minProperties: 3
+      consistent: true
+  object-curly-spacing:
+    - error
+    - always
+  one-var-declaration-per-line:
+    - error
+    - always
+  operator-assignment:
+    - error
+    - always
+  quotes:
+    - error
+    - single
+  quote-props:
+    - error
+    - as-needed
+  require-jsdoc:
+    - error
+    - require:
+        FunctionDeclaration: true
+        ClassDeclaration: true
+        MethodDefinition: true
+        ArrowFunctionExpression: true
+  space-before-function-paren:
+    - error
+    - anonymous: always
+      named: always
+      asyncArrow: always
+  template-tag-spacing:
+    - error
+    - always
+  unicode-bom:
+    - error
+
+  # ECMAScript 6
+
+  arrow-parens:
+    - error
+    - always
+  arrow-spacing:
+    - error
+    - before: true
+      after: true
+  generator-star-spacing:
+    - error
+    - before: true
+      after: false
+  no-confusing-arrow:
+    - error
+  no-var:
+    - error
+  object-shorthand:
+    - error
+    - always
+  prefer-const:
+    - error
+  prefer-spread:
+    - error
+  prefer-numeric-literals:
+    - error
+  prefer-rest-params:
+    - error
+  prefer-template:
+    - error
+  prefer-arrow-callback:
+    - error
+    - allowNamedFunctions: false
+  require-yield:
+    - error
+  symbol-description:
+    - error
+
+  # Lodash
+
+  lodash/chain-style:
+    - error
+    - explicit
+  lodash/identity-shorthand:
+    - error
+    - always
+  lodash/import-scope:
+    - error
+    - full
+  lodash/matches-prop-shorthand:
+    - error
+    - always
+  lodash/matches-shorthand:
+    - error
+    - always
+  lodash/no-commit:
+    - error
+  lodash/path-style:
+    - error
+    - array
+  lodash/prefer-compact:
+    - error
+  lodash/prefer-filter:
+    - error
+    - 5
+  lodash/prefer-flat-map:
+    - error
+  lodash/prefer-invoke-map:
+    - error
+  lodash/prefer-map:
+    - error
+  lodash/prefer-reject:
+    - error
+  lodash/prefer-thru:
+    - error
+  lodash/prefer-wrapper-method:
+    - error
+  lodash/prop-shorthand:
+    - error
+    - always
+  lodash/prefer-constant:
+    - error
+    - true
+    - true
+  lodash/prefer-get:
+    - error
+    - 2
+  lodash/prefer-includes:
+    - error
+    - includeNative: true
+  lodash/prefer-is-nil:
+    - error
+  lodash/prefer-lodash-chain:
+    - error
+  lodash/prefer-lodash-method:
+    - error
+  lodash/prefer-lodash-typecheck:
+    - error
+  lodash/prefer-matches:
+    - error
+    - 3
+  lodash/prefer-noop:
+    - error
+  lodash/prefer-over-quantifier:
+    - error
+  lodash/prefer-startswith:
+    - error
+  lodash/prefer-times:
+    - error
+
+  # JSDoc
+
+  jsdoc/check-param-names:
+    - error
+  jsdoc/check-tag-names:
+    - error
+  jsdoc/newline-after-description:
+    - error
+  jsdoc/require-example:
+    - error
+  jsdoc/require-hyphen-before-param-description:
+    - error
+  jsdoc/require-param:
+    - error
+  jsdoc/require-param-description:
+    - error
+  jsdoc/require-param-type:
+    - error
+  jsdoc/require-returns-type:
+    - error
+
+  # Node
+
+  node/no-deprecated-api:
+    - error
+  node/no-missing-import:
+    - error
+  node/no-missing-require:
+    - error
+  node/process-exit-as-throw:
+    - error
+  node/no-extraneous-require:
+    - error
+  node/no-extraneous-import:
+    - error
+
+  # React
+
+  react/jsx-uses-vars:
+    - error
+
+overrides:
+  files: ['*.jsx']
+  rules:
+    require-jsdoc:
+    - off

.gitattributes

@@ -1,6 +1,3 @@
-# default
-* text
-
 # Javascript files must retain LF line-endings (to keep eslint happy)
 *.js text eol=lf
 *.jsx text eol=lf
@@ -30,7 +27,6 @@ Makefile text
 *.yml text
 *.patch text
 *.txt text
-*.tpl text
 CODEOWNERS text
 *.plist text
 
@@ -62,7 +58,3 @@ CODEOWNERS text
 *.ttf binary diff=hex
 xz-without-extension binary diff=hex
 wmic-output.txt binary diff=hex
-
-# gitsecret
-*.secret binary
-.gitsecret/** binary

.github/ISSUE_TEMPLATE.md

@@ -1,11 +1,6 @@
 - **Etcher version:** 
 - **Operating system and architecture:** 
 - **Image flashed:** 
-- **What do you think should have happened:** <!-- or a step by step reproduction process -->
-- **What happened:**
 - **Do you see any meaningful error information in the DevTools?** 
-<!-- You can open DevTools by pressing `Ctrl+Shift+I` (`Ctrl+Alt+I` for Etcher before v1.3.x), or `Cmd+Opt+I` if you're on macOS. -->
 
-<!-- issues with missing information will be labeled as not-enough-info and closed shortly -->
-<!-- please try to include as many influencing elements as possible are you root, does any other process block the device, etc. -->
-<!-- if you find a solution in the meantime thank you for sharing the fix and not just closing / abandoning your issue -->
+<!-- You can open DevTools by pressing `Ctrl+Shift+I` (`Ctrl+Alt+I` for Etcher before v1.3.x), or `Cmd+Opt+I` if you're on macOS. -->

.github/actions/publish/action.yml

@@ -1,205 +0,0 @@
----
-name: package and publish GitHub (draft) release
-# https://github.com/product-os/flowzone/tree/master/.github/actions
-inputs:
-  json:
-    description: "JSON stringified object containing all the inputs from the calling workflow"
-    required: true
-  secrets:
-    description: "JSON stringified object containing all the secrets from the calling workflow"
-    required: true
-
-  # --- custom environment
-  NODE_VERSION:
-    type: string
-    # Beware that native modules will be built for this version,
-    # which might not be compatible with the one used by pkg (see forge.sidecar.ts)
-    # https://github.com/vercel/pkg-fetch/releases
-    default: "20.x"
-  VERBOSE:
-    type: string
-    default: "true"
-
-runs:
-  # https://docs.github.com/en/actions/creating-actions/creating-a-composite-action
-  using: "composite"
-  steps:
-    - name: Download custom source artifact
-      uses: actions/download-artifact@v4
-      with:
-        name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}-${{ runner.arch }}
-        path: ${{ runner.temp }}
-
-    - name: Extract custom source artifact
-      if: runner.os != 'Windows'
-      shell: bash
-      working-directory: .
-      run: tar -xf ${{ runner.temp }}/custom.tgz
-
-    - name: Extract custom source artifact
-      if: runner.os == 'Windows'
-      shell: pwsh
-      working-directory: .
-      run: C:\"Program Files"\Git\usr\bin\tar.exe --force-local -xf ${{ runner.temp }}\custom.tgz
-
-    - name: Setup Node.js
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ inputs.NODE_VERSION }}
-        cache: npm
-
-    - name: Install host dependencies
-      if: runner.os == 'Linux'
-      shell: bash
-      run: sudo apt-get install -y --no-install-recommends fakeroot dpkg rpm
-
-    # rpmbuild will strip binaries by default, which breaks the sidecar.
-    # Use a macro to override the "strip" to bypass stripping.
-    - name: Configure rpmbuild to not strip executables
-      if: runner.os == 'Linux'
-      shell: bash
-      run: echo '%__strip  /usr/bin/true' > ~/.rpmmacros
-
-    - name: Install host dependencies
-      if: runner.os == 'macOS'
-      # FIXME: Python 3.12 dropped distutils that node-gyp depends upon.
-      # This is a temporary workaround to make the job use Python 3.11 until
-      # we update to npm 10+.
-      uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
-      with:
-        python-version: '3.11'
-
-    # https://www.electron.build/code-signing.html
-    # https://dev.to/rwwagner90/signing-electron-apps-with-github-actions-4cof
-    - name: Import Apple code signing certificate
-      if: runner.os == 'macOS'
-      shell: bash
-      run: |
-        KEY_CHAIN=build.keychain
-        CERTIFICATE_P12=certificate.p12
-
-        # Recreate the certificate from the secure environment variable
-        echo $CERTIFICATE_P12_B64 | base64 --decode > $CERTIFICATE_P12
-
-        # Create a keychain
-        security create-keychain -p actions $KEY_CHAIN
-
-        # Make the keychain the default so identities are found
-        security default-keychain -s $KEY_CHAIN
-
-        # Unlock the keychain
-        security unlock-keychain -p actions $KEY_CHAIN
-
-        security import $CERTIFICATE_P12 -k $KEY_CHAIN -P $CERTIFICATE_PASSWORD -T /usr/bin/codesign
-
-        security set-key-partition-list -S apple-tool:,apple: -s -k actions $KEY_CHAIN
-
-        # remove certs
-        rm -fr *.p12
-      env:
-        CERTIFICATE_P12_B64: ${{ fromJSON(inputs.secrets).APPLE_SIGNING }}
-        CERTIFICATE_PASSWORD: ${{ fromJSON(inputs.secrets).APPLE_SIGNING_PASSWORD }}
-
-    - name: Import Windows code signing certificate
-      if: runner.os == 'Windows'
-      id: import_win_signing_cert
-      shell: powershell
-      run: |
-        Set-Content -Path ${{ runner.temp }}/certificate.base64 -Value $env:SM_CLIENT_CERT_FILE_B64
-        certutil -decode ${{ runner.temp }}/certificate.base64 ${{ runner.temp }}/Certificate_pkcs12.p12
-        Remove-Item -path ${{ runner.temp }} -include certificate.base64
-
-        echo "certFilePath=${{ runner.temp }}/Certificate_pkcs12.p12" >> $GITHUB_OUTPUT
-
-      env:
-        SM_CLIENT_CERT_FILE_B64: ${{ fromJSON(inputs.secrets).SM_CLIENT_CERT_FILE_B64 }}
-
-    - name: Package release
-      shell: bash
-      # IMPORTANT: before making changes to this step please consult @engineering in balena's chat.
-      run: |
-        ## FIXME: causes issues with `xxhash` which tries to load a debug build which doens't exist and cannot be compiled
-        # if [[ '${{ inputs.VERBOSE }}' =~ on|On|Yes|yes|true|True ]]; then
-        #  export DEBUG='electron-forge:*,sidecar'
-        # fi
-
-        APPLICATION_VERSION="$(jq -r '.version' package.json)"
-        HOST_ARCH="$(echo "${RUNNER_ARCH}" | tr '[:upper:]' '[:lower:]')"
-
-        if [[ "${RUNNER_OS}" == Linux ]]; then
-          PLATFORM=Linux
-          SHA256SUM_BIN=sha256sum
-
-        elif [[ "${RUNNER_OS}" == macOS ]]; then
-          PLATFORM=Darwin
-          SHA256SUM_BIN='shasum -a 256'
-
-        elif [[ "${RUNNER_OS}" == Windows ]]; then
-          PLATFORM=Windows
-          SHA256SUM_BIN=sha256sum
-
-          # Install DigiCert Signing Manager Tools
-          curl --silent --retry 3 --fail https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download \
-            -H "x-api-key:$SM_API_KEY" \
-            -o smtools-windows-x64.msi
-          msiexec -i smtools-windows-x64.msi -qn
-          PATH="/c/Program Files/DigiCert/DigiCert One Signing Manager Tools:${PATH}"
-          smksp_registrar.exe list
-          smctl.exe keypair ls
-          /c/Windows/System32/certutil.exe -csp "DigiCert Signing Manager KSP" -key -user
-          smksp_cert_sync.exe
-
-          # (signtool.exe) https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md#installed-windows-sdks
-          PATH="/c/Program Files (x86)/Windows Kits/10/bin/${runner_arch}:${PATH}"
-
-        else
-          echo "ERROR: unexpected runner OS: ${RUNNER_OS}"
-          exit 1
-        fi
-
-        # Currently, we can only build for the host architecture.
-        npx electron-forge make
-
-        echo "version=${APPLICATION_VERSION}" >> $GITHUB_OUTPUT
-
-        # collect all artifacts from subdirectories under a common top-level directory
-        mkdir -p dist
-        find ./out/make -type f \( \
-          -iname "*.zip" -o        \
-          -iname "*.dmg" -o        \
-          -iname "*.rpm" -o        \
-          -iname "*.deb" -o        \
-          -iname "*.AppImage" -o   \
-          -iname "*Setup.exe"      \
-        \) -ls -exec cp '{}' dist/ \;
-
-        if [[ -n "${SHA256SUM_BIN}" ]]; then
-          # Compute and save digests.
-          cd dist/
-          ${SHA256SUM_BIN} *.* >"SHA256SUMS.${PLATFORM}.${HOST_ARCH}.txt"
-        fi
-      env:
-        # ensure we sign the artifacts
-        NODE_ENV: production
-        # analytics tokens
-        SENTRY_TOKEN: https://739bbcfc0ba4481481138d3fc831136d@o95242.ingest.sentry.io/4504451487301632
-        AMPLITUDE_TOKEN: 'balena-etcher'
-        # Apple notarization
-        XCODE_APP_LOADER_EMAIL: ${{ fromJSON(inputs.secrets).XCODE_APP_LOADER_EMAIL }}
-        XCODE_APP_LOADER_PASSWORD: ${{ fromJSON(inputs.secrets).XCODE_APP_LOADER_PASSWORD }}
-        XCODE_APP_LOADER_TEAM_ID: ${{ fromJSON(inputs.secrets).XCODE_APP_LOADER_TEAM_ID }}
-        # Windows signing
-        SM_CLIENT_CERT_PASSWORD: ${{ fromJSON(inputs.secrets).SM_CLIENT_CERT_PASSWORD }}
-        SM_CLIENT_CERT_FILE: '${{ runner.temp }}\Certificate_pkcs12.p12'
-        SM_HOST: ${{ fromJSON(inputs.secrets).SM_HOST }}
-        SM_API_KEY: ${{ fromJSON(inputs.secrets).SM_API_KEY }}
-        SM_CODE_SIGNING_CERT_SHA1_HASH: ${{ fromJSON(inputs.secrets).SM_CODE_SIGNING_CERT_SHA1_HASH }}
-        TIMESTAMP_SERVER: http://timestamp.digicert.com
-
-    - name: Upload artifacts
-      uses: actions/upload-artifact@v4
-      with:
-        name: gh-release-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}-${{ runner.arch }}
-        path: dist
-        retention-days: 1
-        if-no-files-found: error

.github/actions/test/action.yml

@@ -1,87 +0,0 @@
----
-name: test release
-# https://github.com/product-os/flowzone/tree/master/.github/actions
-inputs:
-  json:
-    description: 'JSON stringified object containing all the inputs from the calling workflow'
-    required: true
-  secrets:
-    description: 'JSON stringified object containing all the secrets from the calling workflow'
-    required: true
-
-  # --- custom environment
-  NODE_VERSION:
-    type: string
-    default: '20.10'
-  VERBOSE:
-    type: string
-    default: 'true'
-
-runs:
-  # https://docs.github.com/en/actions/creating-actions/creating-a-composite-action
-  using: 'composite'
-  steps:
-    # https://github.com/actions/setup-node#caching-global-packages-data
-    - name: Setup Node.js
-      uses: actions/setup-node@v3
-      with:
-        node-version: ${{ inputs.NODE_VERSION }}
-        cache: npm
-
-    - name: Install host dependencies
-      if: runner.os == 'Linux'
-      shell: bash
-      run: |
-        sudo apt-get update && sudo apt-get install -y --no-install-recommends xvfb libudev-dev
-        cat < package.json | jq -r '.hostDependencies[][]' - | \
-          xargs -L1 echo | sed 's/|//g' | xargs -L1 \
-          sudo apt-get --ignore-missing install || true
-
-    - name: Install host dependencies
-      if: runner.os == 'macOS'
-      # FIXME: Python 3.12 dropped distutils that node-gyp depends upon.
-      # This is a temporary workaround to make the job use Python 3.11 until
-      # we update to npm 10+.
-      uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
-      with:
-        python-version: '3.11'
-
-    - name: Test release
-      shell: bash
-      run: |
-        ## FIXME: causes issues with `xxhash` which tries to load a debug build which doens't exist and cannot be compiled
-        # if [[ '${{ inputs.VERBOSE }}' =~ on|On|Yes|yes|true|True ]]; then
-        #   export DEBUG='electron-forge:*,sidecar'
-        # fi
-
-        npm ci
-
-        # as the shrinkwrap might have been done on mac/linux, this is ensure the package is there for windows
-        if [[ "$RUNNER_OS" == "Windows" ]]; then
-          npm i -D winusb-driver-generator
-        fi
-
-        npm run lint
-        npm run package
-        npm run wdio # test stage, note that it requires the package to be done first
-
-      env:
-        # https://www.electronjs.org/docs/latest/api/environment-variables
-        ELECTRON_NO_ATTACH_CONSOLE: 'true'
-
-    - name: Compress custom source
-      if: runner.os != 'Windows'
-      shell: bash
-      run: tar -acf ${{ runner.temp }}/custom.tgz .
-
-    - name: Compress custom source
-      if: runner.os == 'Windows'
-      shell: pwsh
-      run: C:\"Program Files"\Git\usr\bin\tar.exe --force-local -acf ${{ runner.temp }}\custom.tgz .
-
-    - name: Upload custom artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}-${{ runner.arch }}
-        path: ${{ runner.temp }}/custom.tgz
-        retention-days: 1

.github/workflows/flowzone.yml

@@ -1,41 +0,0 @@
-name: Flowzone
-on:
-  pull_request:
-    types: [opened, synchronize, closed]
-    branches: [main, master]
-  # allow external contributions to use secrets within trusted code
-  pull_request_target:
-    types: [opened, synchronize, closed]
-    branches: [main, master]
-jobs:
-  flowzone:
-    name: Flowzone
-    uses: product-os/flowzone/.github/workflows/flowzone.yml@master
-    # prevent duplicate workflows and only allow one `pull_request` or `pull_request_target` for
-    # internal or external contributions respectively
-    if: |
-      (github.event.pull_request.head.repo.full_name == github.repository && github.event_name == 'pull_request') ||
-      (github.event.pull_request.head.repo.full_name != github.repository && github.event_name == 'pull_request_target')
-    secrets: inherit
-    with:
-      custom_test_matrix: >
-        {
-          "os": [
-            ["ubuntu-22.04"],
-            ["windows-2019"],
-            ["macos-13"],
-            ["macos-latest-xlarge"]
-          ]
-        }
-      custom_publish_matrix: >
-        {
-          "os": [
-            ["ubuntu-22.04"],
-            ["windows-2019"],
-            ["macos-13"],
-            ["macos-latest-xlarge"]
-          ]
-        }
-      restrict_custom_actions: false
-      github_prerelease: true
-      cloudflare_website: "etcher"

.github/workflows/winget.yml

@@ -1,14 +0,0 @@
-name: Publish to WinGet
-on:
-  release:
-    types: [released]
-jobs:
-  publish:
-    runs-on: windows-latest # action can only be run on windows
-    steps:
-      - uses: vedantmgoyal2009/winget-releaser@v2
-        with:
-          identifier: Balena.Etcher
-          # matches something like "balenaEtcher-1.19.0.Setup.exe"
-          installers-regex: 'balenaEtcher-[\d.-]+\.Setup.exe$'
-          token: ${{ secrets.WINGET_PAT }}

.gitignore

@@ -1,103 +1,40 @@
-
-# -- ADD NEW ENTRIES AT THE END OF THE FILE ---
-
 # Logs
-logs
+/logs
 *.log
 npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-lerna-debug.log*
-
-# Diagnostic reports (https://nodejs.org/api/report.html)
-report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
 
 # Runtime data
 pids
 *.pid
 *.seed
-*.pid.lock
-.DS_Store
 
 # Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
+/lib-cov
+
+# Image stream output directory
+/tests/image-stream/output
 
 # Coverage directory used by tools like istanbul
-coverage
-*.lcov
+/coverage
 
-# nyc test coverage
-.nyc_output
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
 
 # node-waf configuration
 .lock-wscript
 
-# Compiled binary addons (https://nodejs.org/api/addons.html)
-build/Release
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+/build
 
-# Dependency directories
-node_modules/
-jspm_packages/
+# Generated files
+/generated
 
-# TypeScript v1 declaration files
-typings/
+# Dependency directory
+# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
+node_modules
 
-# TypeScript cache
-*.tsbuildinfo
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# dotenv environment variables file
-.env
-.env.test
-
-# parcel-bundler cache (https://parceljs.org/)
-.cache
-
-# next.js build output
-.next
-
-# nuxt.js build output
-.nuxt
-
-# vuepress build output
-.vuepress/dist
-
-# Serverless directories
-.serverless/
-
-# FuseBox cache
-.fusebox/
-
-# DynamoDB Local files
-.dynamodb/
-
-# Webpack
-.webpack/
-
-# Vite
-.vite/
-
-# Electron-Forge
-out/
-
-# ---- Do not modify entries above this line ----
-
-# Build artifacts
-dist/
+# Compiled Etcher releases
+/dist
 
 # Certificates
 *.spc
@@ -107,17 +44,6 @@ dist/
 *.crt
 *.pem
 
-# Secrets
-.gitsecret/keys/random_seed
-!*.secret
-secrets/APPLE_SIGNING_PASSWORD.txt
-secrets/WINDOWS_SIGNING_PASSWORD.txt
-secrets/XCODE_APP_LOADER_PASSWORD.txt
-secrets/WINDOWS_SIGNING.pfx
+# OSX files
 
-# Image stream output directory
-/tests/image-stream/output
-
-#local development
-.yalc
-yalc.lock
+.DS_Store

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "scripts/resin"]
+	path = scripts/resin
+	url = https://github.com/balena-io/scripts.git
+	branch = master

.gitsecret/paths/mapping.cfg

@@ -1,5 +0,0 @@
-secrets/APPLE_SIGNING_PASSWORD.txt:5c9cfeb1ea5142b547bc842cc6e0b4a932641ae9811ee47abe2c3953f2a4de5d
-secrets/WINDOWS_SIGNING_PASSWORD.txt:852e431628494f2559793c39cf09c34e9406dd79bb15b90c9f88194020470568
-secrets/XCODE_APP_LOADER_PASSWORD.txt:005eb9a3c7035c77232973c9355468fc396b94e62783fb8e6dce16bce95b94a1
-secrets/WINDOWS_SIGNING.pfx:929f401db38733ffc41572539de7c0d938023af51ed06c205a72a71c1f815714
-secrets/APPLE_SIGNING.p12:61abf7b4ff2eec76ce889d71bcdd568b99a6a719b4947ac20f03966265b0946a

.nvmrc

@@ -1 +0,0 @@
-18

.prettierrc.js

@@ -1,6 +0,0 @@
-const fs = require("fs");
-const path = require("path");
-
-module.exports = JSON.parse(
-  fs.readFileSync(path.join(__dirname, "node_modules", "@balena", "lint", "config", ".prettierrc"), "utf8"),
-);

.resinci.json

@@ -0,0 +1,74 @@
+{
+  "electron": {
+    "npm_version": "6.14.5",
+    "dependencies": {
+      "linux": [
+        "libudev-dev",
+        "libusb-1.0-0-dev",
+        "libyaml-dev",
+        "libgtk-3-0",
+        "libatk-bridge2.0-0",
+        "libdbus-1-3",
+        "libgbm1",
+        "libc6"
+      ]
+    },
+    "builder": {
+      "appId": "io.balena.etcher",
+      "copyright": "Copyright 2016-2020 Balena Ltd",
+      "productName": "balenaEtcher",
+      "nodeGypRebuild": false,
+      "afterPack": "./afterPack.js",
+      "asar": false,
+      "files": [
+        "generated",
+        "lib/shared/catalina-sudo/sudo-askpass.osascript.js"
+      ],
+      "beforeBuild": "./beforeBuild.js",
+      "afterSign": "./afterSignHook.js",
+      "mac": {
+        "category": "public.app-category.developer-tools",
+        "hardenedRuntime": true,
+        "entitlements": "entitlements.mac.plist",
+        "entitlementsInherit": "entitlements.mac.plist"
+      },
+      "dmg": {
+        "iconSize": 110,
+        "contents": [
+          {
+            "x": 140,
+            "y": 245
+          },
+          {
+            "x": 415,
+            "y": 245,
+            "type": "link",
+            "path": "/Applications"
+          }
+        ],
+        "window": {
+          "width": 544,
+          "height": 407
+        }
+      },
+      "linux": {
+        "category": "Utility",
+        "packageCategory": "utils",
+        "synopsis": "balenaEtcher is a powerful OS image flasher built with web technologies to ensure flashing an SDCard or USB drive is a pleasant and safe experience. It protects you from accidentally writing to your hard-drives, ensures every byte of data was written correctly and much more."
+      },
+      "deb": {
+        "compression": "bzip2",
+        "priority": "optional",
+        "depends": [
+          "polkit-1-auth-agent | policykit-1-gnome | polkit-kde-1"
+        ]
+      },
+      "protocols": {
+        "name": "etcher",
+        "schemes": [
+          "etcher"
+        ]
+      }
+    }
+  }
+}

CODEOWNERS

@@ -0,0 +1,2 @@
+* @thundron @zvin @jviotti
+/scripts @nazrhom

FAQ.md

@@ -37,16 +37,10 @@ modules=xwayland.so
 Sometimes, things might go wrong, and you end up with a half-flashed drive that is unusable by your operating systems, and common graphical tools might even refuse to get it back to a normal state.
 To solve these kinds of problems, we've collected [a list of fail-proof methods](https://github.com/balena-io/etcher/blob/master/docs/USER-DOCUMENTATION.md#recovering-broken-drives) to completely erase your drive in major operating systems.
 
-## I receive "No polkit authentication agent found" error in GNU/Linux
+## I receive ”No polkit authentication agent found” error in GNU/Linux
 
 Etcher requires an available [polkit authentication agent](https://wiki.archlinux.org/index.php/Polkit#Authentication_agents) in your system in order to show a secure password prompt dialog to perform elevation. Make sure you have one installed for the desktop environment of your choice.
 
 ## May I run Etcher in older macOS versions?
 
-Etcher GUI is based on the [Electron](http://electron.atom.io/) framework, [which only supports macOS 10.10 and newer versions](https://github.com/electron/electron/blob/master/docs/tutorial/support.md#supported-platforms).
-
-## Can I use the Flash With Etcher button on my site?
-
-You can use the Flash with Etcher button on your site or blog, if you have an OS that you want your users to be able to easily flash using Etcher, add the following code where you want to button to be:
-
-`<a href="https://efp.balena.io/open-image-url?imageUrl=<your image URL>"><img src="http://balena.io/flash-with-etcher.png" /></a>`
+Etcher GUI is based on the [Electron](http://electron.atom.io/) framework, [which only supports macOS 10.9 and newer versions](https://github.com/electron/electron/blob/master/docs/tutorial/support.md#supported-platforms).

Makefile

@@ -0,0 +1,151 @@
+# ---------------------------------------------------------------------
+# Build configuration
+# ---------------------------------------------------------------------
+
+RESIN_SCRIPTS ?= ./scripts/resin
+export NPM_VERSION ?= 6.14.5
+S3_BUCKET = artifacts.ci.balena-cloud.com
+
+# This directory will be completely deleted by the `clean` rule
+BUILD_DIRECTORY ?= dist
+
+BUILD_TEMPORARY_DIRECTORY = $(BUILD_DIRECTORY)/.tmp
+
+$(BUILD_DIRECTORY):
+	mkdir $@
+
+$(BUILD_TEMPORARY_DIRECTORY): | $(BUILD_DIRECTORY)
+	mkdir $@
+
+SHELL := /bin/bash
+
+# ---------------------------------------------------------------------
+# Operating system and architecture detection
+# ---------------------------------------------------------------------
+
+# http://stackoverflow.com/a/12099167
+ifeq ($(OS),Windows_NT)
+	PLATFORM = win32
+
+	ifeq ($(PROCESSOR_ARCHITEW6432),AMD64)
+		HOST_ARCH = x64
+	else
+		ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
+			HOST_ARCH = x64
+		endif
+		ifeq ($(PROCESSOR_ARCHITECTURE),x86)
+			HOST_ARCH = x86
+		endif
+	endif
+else
+	ifeq ($(shell uname -s),Linux)
+		PLATFORM = linux
+
+		ifeq ($(shell uname -m),x86_64)
+			HOST_ARCH = x64
+		endif
+		ifneq ($(filter %86,$(shell uname -m)),)
+			HOST_ARCH = x86
+		endif
+		ifeq ($(shell uname -m),armv7l)
+			HOST_ARCH = armv7hf
+		endif
+		ifeq ($(shell uname -m),aarch64)
+			HOST_ARCH = aarch64
+		endif
+		ifeq ($(shell uname -m),armv8)
+			HOST_ARCH = aarch64
+		endif
+		ifeq ($(shell uname -m),arm64)
+			HOST_ARCH = aarch64
+		endif
+	endif
+	ifeq ($(shell uname -s),Darwin)
+		PLATFORM = darwin
+
+		ifeq ($(shell uname -m),x86_64)
+			HOST_ARCH = x64
+		endif
+	endif
+endif
+
+ifndef PLATFORM
+$(error We could not detect your host platform)
+endif
+ifndef HOST_ARCH
+$(error We could not detect your host architecture)
+endif
+
+# Default to host architecture. You can override by doing:
+#
+#   make <target> TARGET_ARCH=<arch>
+#
+TARGET_ARCH ?= $(HOST_ARCH)
+
+# ---------------------------------------------------------------------
+# Electron
+# ---------------------------------------------------------------------
+electron-develop:
+	$(RESIN_SCRIPTS)/electron/install.sh \
+		-b $(shell pwd) \
+		-r $(TARGET_ARCH) \
+		-s $(PLATFORM) \
+		-m $(NPM_VERSION)
+
+electron-test:
+	$(RESIN_SCRIPTS)/electron/test.sh \
+		-b $(shell pwd) \
+		-s $(PLATFORM)
+
+assets/dmg/background.tiff: assets/dmg/background.png assets/dmg/background@2x.png
+	tiffutil -cathidpicheck $^ -out $@
+
+electron-build: assets/dmg/background.tiff | $(BUILD_TEMPORARY_DIRECTORY)
+	$(RESIN_SCRIPTS)/electron/build.sh \
+		-b $(shell pwd) \
+		-r $(TARGET_ARCH) \
+		-s $(PLATFORM) \
+		-v production \
+		-n $(BUILD_TEMPORARY_DIRECTORY)/npm
+
+# ---------------------------------------------------------------------
+# Phony targets
+# ---------------------------------------------------------------------
+
+TARGETS = \
+	help \
+	info \
+	lint \
+	test \
+	clean \
+	distclean \
+	electron-develop \
+	electron-test \
+	electron-build
+
+.PHONY: $(TARGETS)
+
+lint: 
+	npm run lint
+
+test:
+	npm run test
+
+help:
+	@echo "Available targets: $(TARGETS)"
+
+info:
+	@echo "Platform            : $(PLATFORM)"
+	@echo "Host arch           : $(HOST_ARCH)"
+	@echo "Target arch         : $(TARGET_ARCH)"
+
+clean:
+	rm -rf $(BUILD_DIRECTORY)
+
+distclean: clean
+	rm -rf node_modules
+	rm -rf dist
+	rm -rf generated
+	rm -rf $(BUILD_TEMPORARY_DIRECTORY)
+
+.DEFAULT_GOAL = help

README.md

@@ -5,61 +5,126 @@
 Etcher is a powerful OS image flasher built with web technologies to ensure
 flashing an SDCard or USB drive is a pleasant and safe experience. It protects
 you from accidentally writing to your hard-drives, ensures every byte of data
-was written correctly, and much more. It can also directly flash Raspberry Pi devices that support [USB device boot mode](https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#usb-device-boot-mode).
+was written correctly and much more. It can also flash directly Raspberry Pi devices that support the usbboot protocol
 
 [![Current Release](https://img.shields.io/github/release/balena-io/etcher.svg?style=flat-square)](https://balena.io/etcher)
 [![License](https://img.shields.io/github/license/balena-io/etcher.svg?style=flat-square)](https://github.com/balena-io/etcher/blob/master/LICENSE)
+[![Dependency status](https://img.shields.io/david/balena-io/etcher.svg?style=flat-square)](https://david-dm.org/balena-io/etcher)
 [![Balena.io Forums](https://img.shields.io/discourse/https/forums.balena.io/topics.svg?style=flat-square&label=balena.io%20forums)](https://forums.balena.io/c/etcher)
 
----
+***
 
-[**Download**][etcher] | [**Support**][support] | [**Documentation**][user-documentation] | [**Contributing**][contributing] | [**Roadmap**][milestones]
+[**Download**][etcher] | [**Support**][SUPPORT] | [**Documentation**][USER-DOCUMENTATION] | [**Contributing**][CONTRIBUTING] | [**Roadmap**][milestones]
 
 ## Supported Operating Systems
 
-- Linux; most distros; Intel 64-bit.
-- Windows 10 and later; Intel 64-bit.
-- macOS 10.13 (High Sierra) and later; both Intel and Apple Silicon.
+- Linux (most distros)
+- macOS 10.10 (Yosemite) and later
+- Microsoft Windows 7 and later
+
+Note that Etcher will run on any platform officially supported by
+[Electron][electron]. Read more in their
+[documentation][electron-supported-platforms].
 
 ## Installers
 
 Refer to the [downloads page][etcher] for the latest pre-made
 installers for all supported operating systems.
 
-## Packages
-
 #### Debian and Ubuntu based Package Repository (GNU/Linux x86/x64)
 
-Package for Debian and Ubuntu can be downloaded from the [Github release page](https://github.com/balena-io/etcher/releases/)
+1. Add Etcher debian repository:
 
-##### Install .deb file using apt
+    ```sh
+    echo "deb https://deb.etcher.io stable etcher" | sudo tee /etc/apt/sources.list.d/balena-etcher.list
+    ```
 
-   ```sh
-      sudo apt install ./balena-etcher_******_amd64.deb
-   ```
+2. Trust Bintray.com's GPG key:
+
+    ```sh
+    sudo apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv-keys 379CE192D401AB61
+    ```
+
+3. Update and install:
+
+    ```sh
+    sudo apt-get update
+    sudo apt-get install balena-etcher-electron
+    ```
 
 ##### Uninstall
 
-   ```sh
-      sudo apt remove balena-etcher
-   ```
-
-#### Redhat (RHEL) and Fedora-based Package Repository (GNU/Linux x86/x64)
-
-##### Yum
-
-Package for Fedora-based and Redhat can be downloaded from the [Github release page](https://github.com/balena-io/etcher/releases/)
-
-1. Install using yum
-
 ```sh
-   sudo yum localinstall balena-etcher-***.x86_64.rpm
+sudo apt-get remove balena-etcher-electron
+sudo rm /etc/apt/sources.list.d/balena-etcher.list
+sudo apt-get update
 ```
 
-#### Arch/Manjaro Linux (GNU/Linux x64)
+##### OpenSUSE LEAP & Tumbleweed install
+
+```sh
+sudo zypper ar https://balena.io/etcher/static/etcher-rpm.repo
+sudo zypper ref
+sudo zypper in balena-etcher-electron
+```
+
+##### Uninstall
+
+```sh
+sudo zypper rm balena-etcher-electron
+```
+
+#### Redhat (RHEL) and Fedora based Package Repository (GNU/Linux x86/x64)
+
+1. Add Etcher rpm repository:
+
+    ```sh
+    sudo wget https://balena.io/etcher/static/etcher-rpm.repo -O /etc/yum.repos.d/etcher-rpm.repo
+    ```
+
+2. Update and install:
+
+    ```sh
+    sudo yum install -y balena-etcher-electron
+    ```
+    or
+    ```sh
+    sudo dnf install -y balena-etcher-electron
+    ```
+
+##### Uninstall
+
+```sh
+sudo yum remove -y balena-etcher-electron
+sudo rm /etc/yum.repos.d/etcher-rpm.repo
+sudo yum clean all
+sudo yum makecache fast
+```
+or
+```sh
+sudo dnf remove -y balena-etcher-electron
+sudo rm /etc/yum.repos.d/etcher-rpm.repo
+sudo dnf clean all
+sudo dnf makecache
+```
+
+#### Solus (GNU/Linux x64)
+
+```sh
+sudo eopkg it etcher
+```
+
+##### Uninstall
+
+```sh
+sudo eopkg rm etcher
+```
+
+#### Arch Linux / Manjaro (GNU/Linux x64)
 
 Etcher is offered through the Arch User Repository and can be installed on both Manjaro and Arch systems. You can compile it from the source code in this repository using [`balena-etcher`](https://aur.archlinux.org/packages/balena-etcher/). The following example uses a common AUR helper to install the latest release:
 
+
 ```sh
 yay -S balena-etcher
 ```
@@ -70,18 +135,20 @@ yay -S balena-etcher
 yay -R balena-etcher
 ```
 
-#### WinGet (Windows)
+#### Brew Cask (macOS)
 
-This package is updated by [gh-action](https://github.com/vedantmgoyal2009/winget-releaser), and is kept up to date automatically.
+Note that the Etcher Cask has to be updated manually to point to new versions,
+so it might not refer to the latest version immediately after an Etcher
+release.
 
 ```sh
-winget install balenaEtcher #or Balena.Etcher
+brew cask install balenaetcher
 ```
 
 ##### Uninstall
 
 ```sh
-winget uninstall balenaEtcher
+brew cask uninstall balenaetcher
 ```
 
 #### Chocolatey (Windows)
@@ -101,20 +168,20 @@ choco uninstall etcher
 
 ## Support
 
-If you're having any problem, please [raise an issue][newissue] on GitHub, and
+If you're having any problem, please [raise an issue][newissue] on GitHub and
 the balena.io team will be happy to help.
 
 ## License
 
-Etcher is free software and may be redistributed under the terms specified in
+Etcher is free software, and may be redistributed under the terms specified in
 the [license].
 
 [etcher]: https://balena.io/etcher
 [electron]: https://electronjs.org/
 [electron-supported-platforms]: https://electronjs.org/docs/tutorial/support#supported-platforms
-[support]: https://github.com/balena-io/etcher/blob/master/docs/SUPPORT.md
-[contributing]: https://github.com/balena-io/etcher/blob/master/docs/CONTRIBUTING.md
-[user-documentation]: https://github.com/balena-io/etcher/blob/master/docs/USER-DOCUMENTATION.md
+[SUPPORT]: https://github.com/balena-io/etcher/blob/master/SUPPORT.md
+[CONTRIBUTING]: https://github.com/balena-io/etcher/blob/master/docs/CONTRIBUTING.md
+[USER-DOCUMENTATION]: https://github.com/balena-io/etcher/blob/master/docs/USER-DOCUMENTATION.md
 [milestones]: https://github.com/balena-io/etcher/milestones
 [newissue]: https://github.com/balena-io/etcher/issues/new
 [license]: https://github.com/balena-io/etcher/blob/master/LICENSE

SUPPORT.md

@@ -1,16 +1,9 @@
-Getting help with BalenaEtcher
-===============================
+Getting help with Etcher
+========================
 
 There are various ways to get support for Etcher if you experience an issue or
 have an idea you'd like to share with us.
 
-Documentation
-------
-
-We have answers to a variety of frequently asked questions in the [user 
-documentation][documentation] and also in the [FAQs][faq] on the Etcher website.
-
-
 Forums
 ------
 
@@ -22,7 +15,7 @@ a look at the existing threads before opening a new one!
 Make sure to mention the following information to help us provide better
 support:
 
-- The BalenaEtcher version you're running.
+- The Etcher version you're running.
 
 - The operating system you're running Etcher in.
 
@@ -32,12 +25,10 @@ support:
 GitHub
 ------
 
-If you encounter an issue or have a suggestion, head on over to BalenaEtcher's [issue
+If you encounter an issue or have a suggestion, head on over to Etcher's [issue
 tracker][issues] and if there isn't a ticket covering it, [create
 one][new-issue].
 
 [discourse]: https://forums.balena.io/c/etcher
 [issues]: https://github.com/balena-io/etcher/issues
 [new-issue]: https://github.com/balena-io/etcher/issues/new
-[documentation]: https://github.com/balena-io/etcher/blob/master/docs/USER-DOCUMENTATION.md
-[faq]: https://etcher.io

after-install.tpl

@@ -1,11 +0,0 @@
-#!/bin/bash
-
-# Link to the binary
-# Must hardcode balenaEtcher directory; no variable available
-ln -sf '/opt/balenaEtcher/${executable}' '/usr/bin/${executable}'
-
-# SUID chrome-sandbox for Electron 5+
-chmod 4755 '/opt/balenaEtcher/chrome-sandbox' || true
-
-update-mime-database /usr/share/mime || true
-update-desktop-database /usr/share/applications || true

afterPack.js

@@ -0,0 +1,31 @@
+'use strict'
+
+const cp = require('child_process')
+const fs = require('fs')
+const outdent = require('outdent')
+const path = require('path')
+
+exports.default = function(context) {
+  if (context.packager.platform.name !== 'linux') {
+    return
+  }
+  const scriptPath = path.join(context.appOutDir, context.packager.executableName)
+  const binPath = scriptPath + '.bin'
+  cp.execFileSync('mv', [scriptPath, binPath])
+  fs.writeFileSync(
+    scriptPath,
+    outdent({trimTrailingNewline: false})`
+      #!/bin/bash
+
+      # Resolve symlinks. Warning, readlink -f doesn't work on MacOS/BSD
+      script_dir="$(dirname "$(readlink -f "\${BASH_SOURCE[0]}")")"
+
+      if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
+        "\${script_dir}"/${context.packager.executableName}.bin "$@"
+      else
+        "\${script_dir}"/${context.packager.executableName}.bin "$@" --no-sandbox
+      fi
+    `
+  )
+  cp.execFileSync('chmod', ['+x', scriptPath])
+}

afterSignHook.js

@@ -0,0 +1,23 @@
+'use strict'
+
+const { notarize } = require('electron-notarize')
+const { ELECTRON_SKIP_NOTARIZATION } = process.env
+
+async function main(context) {
+  const { electronPlatformName, appOutDir } = context
+  if (electronPlatformName !== 'darwin' || ELECTRON_SKIP_NOTARIZATION === 'true') {
+    return
+  }
+
+  const appName = context.packager.appInfo.productFilename
+  const appleId = 'accounts+apple@balena.io'
+
+  await notarize({
+    appBundleId: 'io.balena.etcher',
+    appPath: `${appOutDir}/${appName}.app`,
+    appleId,
+    appleIdPassword: `@keychain:Application Loader: ${appleId}`
+  })
+}
+
+exports.default = main

beforeBuild.js

@@ -0,0 +1,26 @@
+'use strict'
+
+const cp = require('child_process');
+const rimraf = require('rimraf');
+const process = require('process');
+
+// Rebuild native modules for ia32 and run webpack again for the ia32 part of windows packages
+exports.default = function(context) {
+        if (context.platform.name === 'windows') {
+                cp.execFileSync(
+                        'bash',
+                        ['./node_modules/.bin/electron-rebuild', '--types', 'dev', '--arch', context.arch],
+                );
+		rimraf.sync('generated');
+                cp.execFileSync(
+                        'bash',
+                        ['./node_modules/.bin/webpack'],
+			{
+				env: {
+					...process.env,
+					npm_config_target_arch: context.arch,
+				},
+			},
+                );
+        }
+}

dev-app-update.yml

@@ -0,0 +1,4 @@
+owner: balena-io
+repo: etcher
+provider: github
+updaterCacheDirName: balena-etcher-updater

dictionary.txt

@@ -0,0 +1,9 @@
+boolen->boolean
+aknowledge->acknowledge
+seleted->selected
+reming->remind
+locl->local
+subsribe->subscribe
+unsubsribe->unsubscribe
+calcluate->calculate
+dictionaty->dictionary

docs/COMMIT-GUIDELINES.md

@@ -12,29 +12,67 @@ over the commit history.
 - Be able to automatically reference relevant changes from a dependency
 upgrade.
 
+The guidelines are inspired by the [AngularJS git commit
+guidelines][angular-commit-guidelines].
 
 Commit structure
 ----------------
 
-Each commit message needs to specify the semver-type. Which can be `patch|minor|major`.
-See the [Semantic Versioning][semver] specification for a more detailed explanation of the meaning of these types.
-See balena commit guidelines for more info about the whole commit structure.
+Each commit message consists of a header, a body and a footer. The header has a
+special format that includes a type, a scope and a subject.
 
 ```
-<semver-type>: <subject>
-```
-or
-```
-<subject>
+<type>(<scope>): <subject>
 <BLANK LINE>
-<details>
+<body>
 <BLANK LINE>
-Change-Type: <semver-type>
+<footer>
 ```
 
 The subject should not contain more than 70 characters, including the type and
 scope, and the body should be wrapped at 72 characters.
 
+Type
+----
+
+Must be one of the following:
+
+- `feat`: A new feature.
+- `fix`: A bug fix.
+- `minifix`: A minimal fix that doesn't warrant an entry in the CHANGELOG.
+- `docs`: Documentation only changes.
+- `style`: Changes that do not affect the meaning of the code (white-space,
+formatting, missing semi-colons, JSDoc annotations, comments, etc).
+- `refactor`: A code change that neither fixes a bug nor adds a feature.
+- `perf`: A code change that improves performance.
+- `test`: Adding missing tests.
+- `chore`: Changes to the build process or auxiliary tools and libraries.
+- `upgrade`: A version upgrade of a project dependency.
+
+Scope
+-----
+
+The scope is required for types that make sense, such as `feat`, `fix`,
+`test`, etc. Certain commit types, such as `chore` might not have a clearly
+defined scope, in which case its better to omit it.
+
+Subject
+-------
+
+The subject should contain a short description of the change:
+
+- Use the imperative, present tense.
+- Don't capitalize the first letter.
+- No dot (.) at the end.
+
+Footer
+------
+
+The footer contains extra information about the commit, such as tags.
+
+**Breaking Changes** should start with the word BREAKING CHANGE: with a space
+or two newlines. The rest of the commit message is then used for this.
+
 Tags
 ----
 
@@ -83,4 +121,125 @@ Closes: https://github.com/balena-io/etcher/issues/XXX
 Fixes: https://github.com/balena-io/etcher/issues/XXX
 ```
 
+### `Change-Type: <type>`
+
+This tag is used to determine the change type that a commit introduces. The
+following types are supported:
+
+- `major`
+- `minor`
+- `patch`
+
+This tag can be omitted for commits that don't change the application from the
+user's point of view, such as for refactoring commits.
+
+Examples:
+
+```
+Change-Type: major
+Change-Type: minor
+Change-Type: patch
+```
+
+See the [Semantic Versioning][semver] specification for a more detailed
+explanation of the meaning of these types.
+
+### `Changelog-Entry: <message>`
+
+This tag is used to describe the changes introduced by the commit in a more
+human style that would fit the `CHANGELOG.md` better.
+
+If the commit type is either `fix` or `feat`, the commit will take part in the
+CHANGELOG. If this tag is not defined, then the commit subject will be used
+instead.
+
+You explicitly can use this tag to make a commit whose type is not `fix` nor
+`feat` appear in the `CHANGELOG.md`.
+
+Since whatever your write here will be shown *as it is* in the `CHANGELOG.md`,
+take some time to write a decent entry. Consider the following guidelines:
+
+- Use the imperative, present tense.
+- Capitalize the first letter.
+
+There is no fixed length limit for the contents of this tag, but always strive
+to make as short as possible without compromising its quality.
+
+Examples:
+
+```
+Changelog-Entry: Fix EPERM errors when flashing to a GPT drive.
+```
+
+Complete examples
+-----------------
+
+```
+fix(GUI): ignore extensions before the first non-compressed extension
+
+Currently, we extract all the extensions from an image path and report back
+that the image is invalid if *any* of the extensions is not valid , however
+this can cause trouble with images including information between dots that are
+not strictly extensions, for example:
+
+    elementaryos-0.3.2-stable-i386.20151209.iso
+
+Etcher will consider `20151209` to be an invalid extension and therefore
+will prevent such image from being selected at all.
+
+As a way to allow these corner cases but still make use of our enforced check
+controls, the validation routine now only consider extensions starting from the
+first non compressed extension.
+
+Change-Type: patch
+Changelog-Entry: Don't interpret image file name information between dots as image extensions.
+Fixes: https://github.com/balena-io/etcher/issues/492
+```
+
+***
+
+```
+upgrade: etcher-image-write to v5.0.2
+
+This version contains a fix to an `EPERM` issue happening to some Windows user,
+triggered by the `write` system call during the first ~5% of a flash given that
+the operating system still thinks the drive has a file system.
+
+Change-Type: patch
+Changelog-Entry: Upgrade `etcher-image-write` to v5.0.2.
+Link: https://github.com/balena-io-modules/etcher-image-write/blob/master/CHANGELOG.md#502---2016-06-27
+Fixes: https://github.com/balena-io/etcher/issues/531
+```
+
+***
+
+```
+feat(GUI): implement update notifier functionality
+
+Auto-update functionality is not ready for usage. As a workaround to
+prevent users staying with older versions, we now check for updates at
+startup, and if the user is not running the latest version, we present a
+modal informing the user of the availiblity of a new version, and
+provide a call to action to open the Etcher website in his web browser.
+
+Extra features:
+
+- The user can skip the update, and tell the program to delay the
+notification for 7 days.
+
+Misc changes:
+
+- Center modal with flexbox, to allow more flexibility on the modal height.
+interacting with the S3 server.
+- Implement `ManifestBindService`, which now serves as a backend for the
+`manifest-bind` directive to allow the directive's functionality to be
+re-used by other services.
+- Namespace checkbox styles that are specific to the settings page.
+
+Change-Type: minor
+Changelog-Entry: Check for updates and show a modal prompting the user to download the latest version.
+Closes: https://github.com/balena-io/etcher/issues/396
+```
+
+[angular-commit-guidelines]: https://github.com/angular/angular.js/blob/master/CONTRIBUTING.md#commit
 [semver]: http://semver.org

docs/CONTRIBUTING.md

@@ -17,11 +17,11 @@ Developing
 
 #### Common
 
-- [NodeJS](https://nodejs.org) (at least v16.11)
-- [Python 3](https://www.python.org)
+- [NodeJS](https://nodejs.org) (at least v6.11)
+- [Python 2.7](https://www.python.org)
 - [jq](https://stedolan.github.io/jq/)
 - [curl](https://curl.haxx.se/)
-- [npm](https://www.npmjs.com/)
+- [npm](https://www.npmjs.com/) (version 6.7)
 
 ```sh
 pip install -r requirements.txt
@@ -33,16 +33,16 @@ You might need to run this with `sudo` or administrator permissions.
 
 - [NSIS v2.51](http://nsis.sourceforge.net/Main_Page) (v3.x won't work)
 - Either one of the following:
-  - [Visual C++ 2019 Build Tools](https://visualstudio.microsoft.com/vs/features/cplusplus/) containing standalone compilers, libraries and scripts
-  - The [windows-build-tools](https://github.com/felixrieseberg/windows-build-tools#windows-build-tools) should be installed along with NodeJS
-  - [Visual Studio Community 2019](https://visualstudio.microsoft.com/vs/) (free) (other editions, like Professional and Enterprise, should work too)
-    **NOTE:** Visual Studio doesn't install C++ by default. You have to rerun the
+  - [Visual C++ 2015 Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools) containing standalone compilers, libraries and scripts
+  - Install the [windows-build-tools](https://github.com/felixrieseberg/windows-build-tools) via npm with `npm install --global windows-build-tools`
+  - [Visual Studio Community 2015](https://www.microsoft.com/en-us/download/details.aspx?id=48146) (free) (other editions, like Professional and Enterprise, should work too)
+    **NOTE:** Visual Studio 2015 doesn't install C++ by default. You have to rerun the
     setup, select "Modify" and then check `Visual C++ -> Common Tools for Visual
-    C++` (see http://stackoverflow.com/a/31955339)
+    C++ 2015` (see http://stackoverflow.com/a/31955339)
 - [MinGW](http://www.mingw.org)
 
-You might need to `npm config set msvs_version 2019` for node-gyp to correctly detect
-the version of Visual Studio you're using (in this example VS2019).
+You might need to `npm config set msvs_version 2015` for node-gyp to correctly detect
+the version of Visual Studio you're using (in this example VS2015).
 
 The following MinGW packages are required:
 
@@ -61,7 +61,7 @@ as well.
 
 #### Linux
 
-- `libudev-dev` for libusb (for example install with `sudo apt install libudev-dev`, or on fedora `systemd-devel` contains the required package)
+- `libudev-dev` for libusb (install with `sudo apt install libudev-dev` for example)
 
 ### Cloning the project
 
@@ -70,12 +70,29 @@ git clone --recursive https://github.com/balena-io/etcher
 cd etcher
 ```
 
+### Installing npm dependencies
+
+**NOTE:** Please make use of the following command to install npm dependencies rather
+than simply running `npm install` given that we need to do extra configuration
+to make sure native dependencies are correctly compiled for Electron, otherwise
+the application might not run successfully.
+
+If you're on Windows, **run the command from the _Developer Command Prompt for
+VS2015_**, to ensure all Visual Studio command utilities are available in the
+`%PATH%`.
+
+```sh
+make electron-develop
+```
+
 ### Running the application
 
 #### GUI
 
 ```sh
-# Build and start application
+# Build the GUI
+make webpack
+# Start Electron
 npm start
 ```
 
@@ -102,6 +119,11 @@ systems as they can before sending a pull request.
 *The test suite is run automatically by CI servers when you send a pull
 request.*
 
+We also rely on various `make` targets to perform some common tasks:
+
+- `make lint`: Run the linter.
+- `make sass`: Compile SCSS files.
+
 We make use of [EditorConfig] to communicate indentation, line endings and
 other text editing default. We encourage you to install the relevant plugin in
 your text editor of choice to avoid having to fix any issues during the review
@@ -110,7 +132,19 @@ process.
 Updating a dependency
 ---------------------
 
-- Install new version of dependency using npm
+Given we use [npm shrinkwrap][shrinkwrap], we have to take extra steps to make
+sure the `npm-shrinkwrap.json` file gets updated correctly when we update a
+dependency.
+
+Use the following steps to ensure everything goes flawlessly:
+
+- Run `make electron-develop` to ensure you don't have extraneous dependencies
+  you might have brought during development, or you are running older
+  dependencies because you come from another branch or reference.
+
+- Install the new version of the dependency. For example: `npm install --save
+  <package>@<version>`. This will update the `npm-shrinkwrap.json` file.
+
 - Commit *both* `package.json` and `npm-shrinkwrap.json`.
 
 Diffing Binaries

docs/MAINTAINERS.md

@@ -8,14 +8,10 @@ Releasing
 
 ### Release Types
 
-- **draft**: A continues snapshot of current master, made by the CI services
-- **pre-release** (default): A continues snapshot of current master, made by the CI services
-- **release**: Full releases
-
-Draft release is created from each PR, tagged with the branch name.
-All merged PR will generate a new tag/version as a *pre-release*.
-Mark the pre-release as final when it is necessary, then distribute the packages in alternative channels as necessary.
+- **snapshot** (default): A continues snapshot of current master, made by the CI services
+- **production**: Full releases
 
+### Flight Plan
 
 #### Preparation
 
@@ -35,10 +31,11 @@ Mark the pre-release as final when it is necessary, then distribute the packages
 - [Post release note to forums](https://forums.balena.io/c/etcher)
 - [Submit Windows binaries to Symantec for whitelisting](#submitting-binaries-to-symantec)
 - [Update the website](https://github.com/balena-io/etcher-homepage)
-- Wait 2-3 hours for analytics (Sentry, Amplitude) to trickle in and check for elevated error rates, or regressions
+- Wait 2-3 hours for analytics (Sentry, Mixpanel) to trickle in and check for elevated error rates, or regressions
 - If regressions arise; pull the release, and release a patched version, else:
-- [Upload deb & rpm packages to Cloudfront](#uploading-packages-to-cloudfront)
-- Post changelog with `#release-notes` tag on internal chat
+- [Upload deb & rpm packages to Bintray](#uploading-packages-to-bintray)
+- [Upload build artifacts to Amazon S3](#uploading-binaries-to-amazon-s3)
+- Post changelog with `#release-notes` tag on Flowdock
 - If this release packs noteworthy major changes:
   - Write a blog post about it, and / or
   - Write about it to the Etcher mailing list
@@ -51,30 +48,95 @@ Make sure to set the analytics tokens when generating production release binarie
 
 ```bash
 export ANALYTICS_SENTRY_TOKEN="xxxxxx"
-export ANALYTICS_AMPLITUDE_TOKEN="xxxxxx"
+export ANALYTICS_MIXPANEL_TOKEN="xxxxxx"
 ```
 
 #### Linux
 
 ##### Clean dist folder
 
-Delete `.webpack` and `out/`.
+**NOTE:** Make sure to adjust the path as necessary (here the Etcher repository has been cloned to `/home/$USER/code/etcher`)
+
+```bash
+./scripts/build/docker/run-command.sh -r x64 -s . -c "make distclean"
+```
 
 ##### Generating artifacts
 
-The artifacts are generated by the CI and published as draft-release or pre-release.
-Etcher is built with electron-forge. Run:
+```bash
+# x64
 
-```
-npm run make
+# Build Debian packages
+./scripts/build/docker/run-command.sh -r x64 -s . -c "make electron-develop && make RELEASE_TYPE=production electron-installer-debian"
+# Build RPM packages
+./scripts/build/docker/run-command.sh -r x64 -s . -c "make electron-develop && make RELEASE_TYPE=production electron-installer-redhat"
+# Build AppImages
+./scripts/build/docker/run-command.sh -r x64 -s . -c "make electron-develop && make RELEASE_TYPE=production electron-installer-appimage"
+
+# x86
+
+# Build Debian packages
+./scripts/build/docker/run-command.sh -r x86 -s . -c "make electron-develop && make RELEASE_TYPE=production electron-installer-debian"
+# Build RPM packages
+./scripts/build/docker/run-command.sh -r x86 -s . -c "make electron-develop && make RELEASE_TYPE=production electron-installer-redhat"
+# Build AppImages
+./scripts/build/docker/run-command.sh -r x86 -s . -c "make electron-develop && make RELEASE_TYPE=production electron-installer-appimage"
 ```
 
-Our CI will appropriately sign artifacts for macOS and some Windows targets.
+#### Mac OS
 
+**ATTENTION:** For production releases you'll need the code-signing key,
+and set `CSC_NAME` to generate signed binaries on Mac OS.
 
-### Uploading packages to Cloudfront
+```bash
+make electron-develop
 
-Log in to cloudfront and upload the `rpm` and `deb` files.
+# Build the zip
+make RELEASE_TYPE=production electron-installer-app-zip
+# Build the dmg
+make RELEASE_TYPE=production electron-installer-dmg
+```
+
+#### Windows
+
+**ATTENTION:** For production releases you'll need the code-signing key,
+and set `CSC_LINK`, and `CSC_KEY_PASSWORD` to generate signed binaries on Windows.
+
+**NOTE:**
+- Keep in mind to also generate artifacts for x86, with `TARGET_ARCH=x86`.
+
+```bash
+make electron-develop
+
+# Build the Portable version
+make RELEASE_TYPE=production electron-installer-portable
+# Build the Installer
+make RELEASE_TYPE=production electron-installer-nsis
+```
+
+### Uploading packages to Bintray
+
+```bash
+export BINTRAY_USER="username@account"
+export BINTRAY_API_KEY="youruserapikey"
+```
+
+```bash
+./scripts/publish/bintray.sh -c "etcher" -t "production" -v "1.2.1" -o "etcher" -p "debian" -y "debian" -r "x64" -f "dist/etcher-electron_1.2.1_amd64.deb"
+./scripts/publish/bintray.sh -c "etcher" -t "production" -v "1.2.1" -o "etcher" -p "debian" -y "debian" -r "x86" -f "dist/etcher-electron_1.2.1_i386.deb"
+./scripts/publish/bintray.sh -c "etcher" -t "production" -v "1.2.1" -o "etcher" -p "redhat" -y "redhat" -r "x64" -f "dist/etcher-electron-1.2.1.x86_64.rpm"
+./scripts/publish/bintray.sh -c "etcher" -t "production" -v "1.2.1" -o "etcher" -p "redhat" -y "redhat" -r "x86" -f "dist/etcher-electron-1.2.1.i686.rpm"
+```
+
+### Uploading binaries to Amazon S3
+
+```bash
+export S3_KEY="..."
+```
+
+```bash
+./scripts/publish/aws-s3.sh -b "balena-production-downloads" -v "1.2.1" -p "etcher" -f "dist/<filename>"
+```
 
 ### Dealing with a Problematic Release
 

docs/MANUAL-TESTING.md

@@ -112,4 +112,4 @@ Analytics
 - [ ] Disable analytics, open DevTools Network pane or a packet sniffer, and
   check that no request is sent
 - [ ] **Disable analytics, refresh application from DevTools (using Cmd-R or
-  F5), and check that initial events are not sent to Amplitude**
+  F5), and check that initial events are not sent to Mixpanel**

docs/PUBLISHING.md

@@ -7,9 +7,44 @@ systems.
 Release Types
 -------------
 
-Etcher supports **pre-release** and **final** release types as does Github. Each is
-published to Github releases.
-The release version is generated automatically from the commit messasges.
+Etcher supports **production** and **snapshot** release types. Each is
+published to a different S3 bucket, and production release types are code
+signed, while snapshot release types aren't and include a short git commit-hash
+as a build number. For example, `1.0.0-beta.19` is a production release type,
+while `1.0.0-beta.19+531ab82` is a snapshot release type.
+
+In terms of comparison: `1.0.0-beta.19` (production) < `1.0.0-beta.19+531ab82`
+(snapshot) < `1.0.0-rc.1` (production) < `1.0.0-rc.1+7fde24a` (snapshot) <
+`1.0.0` (production) < `1.0.0+2201e5f` (snapshot). Keep in mind that if you're
+running a production release type, you'll only be prompted to update to
+production release types, and if you're running a snapshot release type, you'll
+only be prompted to update to other snapshot release types.
+
+The build system creates (and publishes) snapshot release types by default, but
+you can build a specific release type by setting the `RELEASE_TYPE` make
+variable.  For example:
+
+```sh
+make <target> RELEASE_TYPE=snapshot
+make <target> RELEASE_TYPE=production
+```
+
+We can control the version range a specific Etcher version will consider when
+showing the update notification dialog by tweaking the `updates.semverRange`
+property of `package.json`.
+
+Update Channels
+---------------
+
+Etcher has a setting to include the unstable update channel. If this option is
+set, Etcher will consider both stable and unstable versions when showing the
+update notifier dialog. Unstable versions are the ones that contain a `beta`
+pre-release tag. For example:
+
+- Production unstable version: `1.4.0-beta.1`
+- Snapshot unstable version: `1.4.0-beta.1+7fde24a`
+- Production stable version: `1.4.0`
+- Snapshot stable version: `1.4.0+7fde24a`
 
 Signing
 -------
@@ -36,24 +71,65 @@ employee by asking for it from the relevant people.
 Packaging
 ---------
 
-Run the following command on each platform:
+The resulting installers will be saved to `dist/out`.
+
+Run the following commands:
+
+### OS X
 
 ```sh
-npm run make
+make electron-installer-dmg
+make electron-installer-app-zip
 ```
 
-This will produce all targets (eg. zip, dmg) specified in forge.config.ts for the
-host platform and architecture.
+### GNU/Linux
 
-The resulting artifacts can be found in `out/make`.
+```sh
+make electron-installer-appimage
+make electron-installer-debian
+```
 
+### Windows
 
-Publishing to Cloudfront
+```sh
+make electron-installer-zip
+make electron-installer-nsis
+```
+
+Publishing to Bintray
 ---------------------
 
-We publish GNU/Linux Debian packages to [Cloudfront][cloudfront].
+We publish GNU/Linux Debian packages to [Bintray][bintray].
 
-Log in to cloudfront and upload the `rpm` and `deb` files.
+Make sure you set the following environment variables:
+
+- `BINTRAY_USER`
+- `BINTRAY_API_KEY`
+
+Run the following command:
+
+```sh
+make publish-bintray-debian
+```
+
+Publishing to S3
+----------------
+
+- [AWS CLI][aws-cli]
+
+Make sure you have the [AWS CLI tool][aws-cli] installed and configured to
+access balena.io's production or snapshot S3 bucket.
+
+Run the following command to publish all files for the current combination of
+_platform_ and _arch_ (building them if necessary):
+
+```sh
+make publish-aws-s3
+```
+
+Also add links to each AWS S3 file in [GitHub Releases][github-releases]. See
+[`v1.0.0-beta.17`](https://github.com/balena-io/etcher/releases/tag/v1.0.0-beta.17)
+as an example.
 
 Publishing to Homebrew Cask
 ---------------------------
@@ -71,12 +147,8 @@ Post messages to the [Etcher forum][balena-forum-etcher] announcing the new vers
 of Etcher, and including the relevant section of the Changelog.
 
 [aws-cli]: https://aws.amazon.com/cli
-[cloudfront]: https://cloudfront.com
+[bintray]: https://bintray.com
 [etcher-cask-file]: https://github.com/caskroom/homebrew-cask/blob/master/Casks/balenaetcher.rb
 [homebrew-cask]: https://github.com/caskroom/homebrew-cask
 [balena-forum-etcher]: https://forums.balena.io/c/etcher
 [github-releases]: https://github.com/balena-io/etcher/releases
-
-Updating EFP / Success-Banner
------------------------------
-Etcher Featured Project is automatically run based on an algorithm which promoted projects from the balena marketplace which have been contributed by the community, the algorithm prioritises projects which give uses the best experience. Editing both EFP and the Etcher Success-Banner can only be done by someone from balena, instruction are on the [Etcher-EFP repo (private)](https://github.com/balena-io/etcher-efp)

docs/USER-DOCUMENTATION.md

@@ -3,11 +3,6 @@ Etcher User Documentation
 
 This document contains how-tos and FAQs oriented to Etcher users.
 
-Config
-------
-Etcher's configuration is saved to the `config.json` file in the apps folder.
-Not all the options are surfaced to the UI. You may edit this file to tweak settings even before launching the app.
-
 Why is my drive not bootable?
 -----------------------------
 
@@ -122,6 +117,7 @@ run Etcher on a GNU/Linux system.
 - xrender
 - xtst
 - xscrnsaver
+- gconf-2.0
 - gmodule-2.0
 - nss
 
@@ -163,18 +159,6 @@ pre-installed in all modern Windows versions.
 
 - Run `clean`. This command will completely clean your drive by erasing any
   existent filesystem.
-  
-- Run `create partition primary`. This command will create a new partition.
-
-- Run  `active`. This command will active the partition.
-
-- Run  `list partition`. This command will show available partition.
-
-- Run  `select partition N`, where `N` corresponds to the id of the newly available partition.
-
-- Run `format override quick`. This command will format the partition. You can choose a specific formatting by adding `FS=xx` where `xx` could be `NTFS or FAT or FAT32` after `format`. Example : `format FS=NTFS override quick`
-
-- Run `exit` to quit diskpart.
 
 ### OS X
 
@@ -222,5 +206,3 @@ macOS 10.10 (Yosemite) and newer versions][electron-supported-platforms].
 [unetbootin]: https://unetbootin.github.io
 [windows-iot-dashboard]: https://developer.microsoft.com/en-us/windows/iot/downloads
 [woeusb]: https://github.com/slacka/WoeUSB
-
-See [PUBLISHING](/docs/PUBLISHING.md) for more details about release types.

electron-builder.yml

@@ -0,0 +1,97 @@
+appId: io.balena.etcher
+copyright: Copyright 2016-2020 Balena Ltd
+productName: balenaEtcher
+npmRebuild: true
+nodeGypRebuild: false
+publish: null
+beforeBuild: "./beforeBuild.js"
+afterPack: "./afterPack.js"
+asar: false
+files:
+  - generated
+  - lib/shared/catalina-sudo/sudo-askpass.osascript.js
+mac:
+  icon: assets/icon.icns
+  category: public.app-category.developer-tools
+  hardenedRuntime: true
+  entitlements: "entitlements.mac.plist"
+  entitlementsInherit: "entitlements.mac.plist"
+dmg:
+  background: assets/dmg/background.tiff
+  icon: assets/icon.icns
+  iconSize: 110
+  contents:
+    - x: 140
+      y: 225
+    - x: 415
+      y: 225
+      type: link
+      path: /Applications
+  window:
+    width: 540
+    height: 405
+win:
+  icon: assets/icon.ico
+nsis:
+  oneClick: true
+  runAfterFinish: true
+  installerIcon: assets/icon.ico
+  uninstallerIcon: assets/icon.ico
+  deleteAppDataOnUninstall: true
+  license: LICENSE
+  artifactName: "${productName}-Setup-${version}.${ext}"
+portable:
+  artifactName: "${productName}-Portable-${version}.${ext}"
+  requestExecutionLevel: user
+linux:
+  category: Utility
+  packageCategory: utils
+  executableName: balena-etcher-electron
+  synopsis: balenaEtcher is a powerful OS image flasher built with web technologies to ensure flashing an SDCard or USB drive is a pleasant and safe experience. It protects you from accidentally writing to your hard-drives, ensures every byte of data was written correctly and much more.
+  icon: assets/iconset
+deb:
+  priority: optional
+  depends:
+    - gconf2
+    - gconf-service
+    - libappindicator1
+    - libasound2
+    - libatk1.0-0
+    - libc6
+    - libcairo2
+    - libcups2
+    - libdbus-1-3
+    - libexpat1
+    - libfontconfig1
+    - libfreetype6
+    - libgbm1
+    - libgcc1
+    - libgconf-2-4
+    - libgdk-pixbuf2.0-0
+    - libglib2.0-0
+    - libgtk-3-0
+    - liblzma5
+    - libnotify4
+    - libnspr4
+    - libnss3
+    - libpango1.0-0 | libpango-1.0-0
+    - libstdc++6
+    - libx11-6
+    - libxcomposite1
+    - libxcursor1
+    - libxdamage1
+    - libxext6
+    - libxfixes3
+    - libxi6
+    - libxrandr2
+    - libxrender1
+    - libxss1
+    - libxtst6
+    - polkit-1-auth-agent | policykit-1-gnome | polkit-kde-1
+rpm:
+  depends:
+    - util-linux
+protocols:
+  name: etcher
+  schemes:
+    - etcher

entitlements.mac.plist

@@ -14,11 +14,5 @@
     <true/>
     <key>com.apple.security.network.client</key>
     <true/>
-    <key>com.apple.security.cs.disable-library-validation</key>
-    <true/>
-    <key>com.apple.security.get-task-allow</key>
-    <true/>
-    <key>com.apple.security.cs.disable-executable-page-protection</key>
-    <true/>
   </dict>
 </plist>

forge.config.ts

@@ -1,159 +0,0 @@
-import type { ForgeConfig } from '@electron-forge/shared-types';
-import { MakerSquirrel } from '@electron-forge/maker-squirrel';
-import { MakerZIP } from '@electron-forge/maker-zip';
-import { MakerDeb } from '@electron-forge/maker-deb';
-import { MakerRpm } from '@electron-forge/maker-rpm';
-import { MakerDMG } from '@electron-forge/maker-dmg';
-import { MakerAppImage } from '@reforged/maker-appimage';
-import { AutoUnpackNativesPlugin } from '@electron-forge/plugin-auto-unpack-natives';
-import { WebpackPlugin } from '@electron-forge/plugin-webpack';
-import { exec } from 'child_process';
-
-import { mainConfig, rendererConfig } from './webpack.config';
-import * as sidecar from './forge.sidecar';
-
-import { hostDependencies, productDescription } from './package.json';
-
-const osxSigningConfig: any = {};
-let winSigningConfig: any = {};
-
-if (process.env.NODE_ENV === 'production') {
-	osxSigningConfig.osxNotarize = {
-		tool: 'notarytool',
-		appleId: process.env.XCODE_APP_LOADER_EMAIL,
-		appleIdPassword: process.env.XCODE_APP_LOADER_PASSWORD,
-		teamId: process.env.XCODE_APP_LOADER_TEAM_ID,
-	};
-
-	winSigningConfig = {
-		signWithParams: `-sha1 ${process.env.SM_CODE_SIGNING_CERT_SHA1_HASH} -tr ${process.env.TIMESTAMP_SERVER} -td sha256 -fd sha256 -d balena-etcher`,
-	};
-}
-
-const config: ForgeConfig = {
-	packagerConfig: {
-		asar: true,
-		icon: './assets/icon',
-		executableName:
-			process.platform === 'linux' ? 'balena-etcher' : 'balenaEtcher',
-		appBundleId: 'io.balena.etcher',
-		appCategoryType: 'public.app-category.developer-tools',
-		appCopyright: 'Copyright 2016-2023 Balena Ltd',
-		darwinDarkModeSupport: true,
-		protocols: [{ name: 'etcher', schemes: ['etcher'] }],
-		extraResource: [
-			'lib/shared/sudo/sudo-askpass.osascript-zh.js',
-			'lib/shared/sudo/sudo-askpass.osascript-en.js',
-		],
-		osxSign: {
-			optionsForFile: () => ({
-				entitlements: './entitlements.mac.plist',
-				hardenedRuntime: true,
-			}),
-		},
-		...osxSigningConfig,
-	},
-	rebuildConfig: {
-		onlyModules: [], // prevent rebuilding *any* native modules as they won't be used by electron but by the sidecar
-	},
-	makers: [
-		new MakerZIP(),
-		new MakerSquirrel({
-			setupIcon: 'assets/icon.ico',
-			loadingGif: 'assets/icon.png',
-			...winSigningConfig,
-		}),
-		new MakerDMG({
-			background: './assets/dmg/background.tiff',
-			icon: './assets/icon.icns',
-			iconSize: 110,
-			contents: ((opts: { appPath: string }) => {
-				return [
-					{ x: 140, y: 250, type: 'file', path: opts.appPath },
-					{ x: 415, y: 250, type: 'link', path: '/Applications' },
-				];
-			}) as any, // type of MakerDMGConfig omits `appPath`
-			additionalDMGOptions: {
-				window: {
-					size: {
-						width: 540,
-						height: 425,
-					},
-					position: {
-						x: 400,
-						y: 500,
-					},
-				},
-			},
-		}),
-		new MakerAppImage({
-			options: {
-				icon: './assets/icon.png',
-				categories: ['Utility'],
-			},
-		}),
-		new MakerRpm({
-			options: {
-				icon: './assets/icon.png',
-				categories: ['Utility'],
-				productDescription,
-				requires: ['util-linux'],
-			},
-		}),
-		new MakerDeb({
-			options: {
-				icon: './assets/icon.png',
-				categories: ['Utility'],
-				section: 'utils',
-				priority: 'optional',
-				productDescription,
-				scripts: {
-					postinst: './after-install.tpl',
-				},
-				depends: hostDependencies['debian'],
-			},
-		}),
-	],
-	plugins: [
-		new AutoUnpackNativesPlugin({}),
-		new WebpackPlugin({
-			mainConfig,
-			renderer: {
-				config: rendererConfig,
-				nodeIntegration: true,
-				entryPoints: [
-					{
-						html: './lib/gui/app/index.html',
-						js: './lib/gui/app/renderer.ts',
-						name: 'main_window',
-						preload: {
-							js: './lib/gui/app/preload.ts',
-						},
-					},
-				],
-			},
-		}),
-		new sidecar.SidecarPlugin(),
-	],
-	hooks: {
-		postPackage: async (_forgeConfig, options) => {
-			if (options.platform === 'linux') {
-				// symlink the etcher binary from balena-etcher to balenaEtcher to ensure compatibility with the wdio suite and the old name
-				await new Promise<void>((resolve, reject) => {
-					exec(
-						`ln -s "${options.outputPaths}/balena-etcher" "${options.outputPaths}/balenaEtcher"`,
-						(err) => {
-							if (err) {
-								reject(err);
-							} else {
-								resolve();
-							}
-						},
-					);
-				});
-			}
-		},
-	},
-};
-
-export default config;

forge.sidecar.ts

@@ -1,168 +0,0 @@
-import { PluginBase } from '@electron-forge/plugin-base';
-import type {
-	ForgeHookMap,
-	ResolvedForgeConfig,
-} from '@electron-forge/shared-types';
-import { WebpackPlugin } from '@electron-forge/plugin-webpack';
-import { DefinePlugin } from 'webpack';
-
-import { execFileSync } from 'child_process';
-import * as fs from 'fs';
-import * as path from 'path';
-
-import * as d from 'debug';
-
-const debug = d('sidecar');
-
-function isStartScrpt(): boolean {
-	return process.env.npm_lifecycle_event === 'start';
-}
-
-function addWebpackDefine(
-	config: ResolvedForgeConfig,
-	defineName: string,
-	binDir: string,
-	binName: string,
-): ResolvedForgeConfig {
-	config.plugins.forEach((plugin) => {
-		if (plugin.name !== 'webpack' || !(plugin instanceof WebpackPlugin)) {
-			return;
-		}
-
-		const { mainConfig } = plugin.config as any;
-		if (mainConfig.plugins == null) {
-			mainConfig.plugins = [];
-		}
-
-		const value = isStartScrpt()
-			? // on `npm start`, point directly to the binary
-				path.resolve(binDir, binName)
-			: // otherwise point relative to the resources folder of the bundled app
-				binName;
-
-		debug(`define '${defineName}'='${value}'`);
-
-		mainConfig.plugins.push(
-			new DefinePlugin({
-				// expose path to helper via this webpack define
-				[defineName]: JSON.stringify(value),
-			}),
-		);
-	});
-
-	return config;
-}
-
-function build(
-	sourcesDir: string,
-	buildForArchs: string,
-	binDir: string,
-	binName: string,
-) {
-	const commands: Array<[string, string[], object?]> = [
-		['tsc', ['--project', 'tsconfig.sidecar.json', '--outDir', sourcesDir]],
-	];
-
-	buildForArchs.split(',').forEach((arch) => {
-		const binPath = isStartScrpt()
-			? // on `npm start`, we don't know the arch we're building for at the time we're
-				// adding the webpack define, so we just build under binDir
-				path.resolve(binDir, binName)
-			: // otherwise build in arch-specific directory within binDir
-				path.resolve(binDir, arch, binName);
-
-		// FIXME: rebuilding mountutils shouldn't be necessary, but it is.
-		// It's coming from etcher-sdk, a fix has been upstreamed but to use
-		// the latest etcher-sdk we need to upgrade axios at the same time.
-		commands.push(['npm', ['rebuild', 'mountutils', `--arch=${arch}`]]);
-
-		commands.push([
-			'pkg',
-			[
-				path.join(sourcesDir, 'util', 'api.js'),
-				'-c',
-				'pkg-sidecar.json',
-				// `--no-bytecode` so that we can cross-compile for arm64 on x64
-				'--no-bytecode',
-				'--public',
-				'--public-packages',
-				'"*"',
-				// always build for host platform and node version
-				// https://github.com/vercel/pkg-fetch/releases
-				'--target',
-				`node20-${arch}`,
-				'--output',
-				binPath,
-			],
-		]);
-	});
-
-	commands.forEach(([cmd, args, opt]) => {
-		debug('running command:', cmd, args.join(' '));
-		execFileSync(cmd, args, { shell: true, stdio: 'inherit', ...opt });
-	});
-}
-
-function copyArtifact(
-	buildPath: string,
-	arch: string,
-	binDir: string,
-	binName: string,
-) {
-	const binPath = isStartScrpt()
-		? // on `npm start`, we don't know the arch we're building for at the time we're
-			// adding the webpack define, so look for the binary directly under binDir
-			path.resolve(binDir, binName)
-		: // otherwise look into arch-specific directory within binDir
-			path.resolve(binDir, arch, binName);
-
-	// buildPath points to appPath, which is inside resources dir which is the one we actually want
-	const resourcesPath = path.dirname(buildPath);
-	const dest = path.resolve(resourcesPath, path.basename(binPath));
-	debug(`copying '${binPath}' to '${dest}'`);
-	fs.copyFileSync(binPath, dest);
-}
-
-export class SidecarPlugin extends PluginBase<void> {
-	name = 'sidecar';
-
-	constructor() {
-		super();
-		this.getHooks = this.getHooks.bind(this);
-		debug('isStartScript:', isStartScrpt());
-	}
-
-	getHooks(): ForgeHookMap {
-		const DEFINE_NAME = 'ETCHER_UTIL_BIN_PATH';
-		const BASE_DIR = path.join('out', 'sidecar');
-		const SRC_DIR = path.join(BASE_DIR, 'src');
-		const BIN_DIR = path.join(BASE_DIR, 'bin');
-		const BIN_NAME = `etcher-util${process.platform === 'win32' ? '.exe' : ''}`;
-
-		return {
-			resolveForgeConfig: async (currentConfig) => {
-				debug('resolveForgeConfig');
-				return addWebpackDefine(currentConfig, DEFINE_NAME, BIN_DIR, BIN_NAME);
-			},
-			generateAssets: async (_config, platform, arch) => {
-				debug('generateAssets', { platform, arch });
-				build(SRC_DIR, arch, BIN_DIR, BIN_NAME);
-			},
-			packageAfterCopy: async (
-				_config,
-				buildPath,
-				electronVersion,
-				platform,
-				arch,
-			) => {
-				debug('packageAfterCopy', {
-					buildPath,
-					electronVersion,
-					platform,
-					arch,
-				});
-				copyArtifact(buildPath, arch, BIN_DIR, BIN_NAME);
-			},
-		};
-	}
-}

lib/gui/app/app.ts

@@ -15,31 +15,29 @@
  */
 
 import * as electron from 'electron';
-import * as remote from '@electron/remote';
-import type { Dictionary } from 'lodash';
-import { debounce, capitalize, values } from 'lodash';
+import * as sdk from 'etcher-sdk';
+import * as _ from 'lodash';
 import outdent from 'outdent';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { v4 as uuidV4 } from 'uuid';
 
 import * as packageJSON from '../../../package.json';
-import type { DrivelistDrive } from '../../shared/drive-constraints';
+import { isDriveValid, isSourceDrive } from '../../shared/drive-constraints';
 import * as EXIT_CODES from '../../shared/exit-codes';
 import * as messages from '../../shared/messages';
 import * as availableDrives from './models/available-drives';
 import * as flashState from './models/flash-state';
+import { init as ledsInit } from './models/leds';
+import { deselectImage, getImage, selectDrive } from './models/selection-state';
 import * as settings from './models/settings';
 import { Actions, observe, store } from './models/store';
 import * as analytics from './modules/analytics';
-import { spawnChildAndConnect } from './modules/api';
+import { scanner as driveScanner } from './modules/drive-scanner';
 import * as exceptionReporter from './modules/exception-reporter';
 import * as osDialog from './os/dialog';
 import * as windowProgress from './os/window-progress';
 import MainPage from './pages/main/MainPage';
-import './css/main.css';
-import * as i18next from 'i18next';
-import type { SourceMetadata } from '../../shared/typings/source-selector';
 
 window.addEventListener(
 	'unhandledrejection',
@@ -89,7 +87,7 @@ analytics.logEvent('Application start', {
 	version: currentVersion,
 });
 
-const debouncedLog = debounce(console.log, 1000, { maxWait: 1000 });
+const debouncedLog = _.debounce(console.log, 1000, { maxWait: 1000 });
 
 function pluralize(word: string, quantity: number) {
 	return `${quantity} ${word}${quantity === 1 ? '' : 's'}`;
@@ -115,7 +113,7 @@ observe(() => {
 	// might cause some non-sense flashing state logs including
 	// `undefined` values.
 	debouncedLog(outdent({ newline: ' ' })`
-		${capitalize(currentFlashState.type)}
+		${_.capitalize(currentFlashState.type)}
 		${active},
 		${currentFlashState.percentage}%
 		at
@@ -128,48 +126,184 @@ observe(() => {
 	`);
 });
 
-function setDrives(drives: Dictionary<DrivelistDrive>) {
-	// prevent setting drives while flashing otherwise we might lose some while we unmount them
-	if (!flashState.isFlashing()) {
-		availableDrives.setDrives(values(drives));
+/**
+ * @summary The radix used by USB ID numbers
+ */
+const USB_ID_RADIX = 16;
+
+/**
+ * @summary The expected length of a USB ID number
+ */
+const USB_ID_LENGTH = 4;
+
+/**
+ * @summary Convert a USB id (e.g. product/vendor) to a string
+ *
+ * @example
+ * console.log(usbIdToString(2652))
+ * > '0x0a5c'
+ */
+function usbIdToString(id: number): string {
+	return `0x${_.padStart(id.toString(USB_ID_RADIX), USB_ID_LENGTH, '0')}`;
+}
+
+/**
+ * @summary Product ID of BCM2708
+ */
+const USB_PRODUCT_ID_BCM2708_BOOT = 0x2763;
+
+/**
+ * @summary Product ID of BCM2710
+ */
+const USB_PRODUCT_ID_BCM2710_BOOT = 0x2764;
+
+/**
+ * @summary Compute module descriptions
+ */
+const COMPUTE_MODULE_DESCRIPTIONS: _.Dictionary<string> = {
+	[USB_PRODUCT_ID_BCM2708_BOOT]: 'Compute Module 1',
+	[USB_PRODUCT_ID_BCM2710_BOOT]: 'Compute Module 3',
+};
+
+async function driveIsAllowed(drive: {
+	devicePath: string;
+	device: string;
+	raw: string;
+}) {
+	const driveBlacklist = (await settings.get('driveBlacklist')) || [];
+	return !(
+		driveBlacklist.includes(drive.devicePath) ||
+		driveBlacklist.includes(drive.device) ||
+		driveBlacklist.includes(drive.raw)
+	);
+}
+
+type Drive =
+	| sdk.sourceDestination.BlockDevice
+	| sdk.sourceDestination.UsbbootDrive
+	| sdk.sourceDestination.DriverlessDevice;
+
+function prepareDrive(drive: Drive) {
+	if (drive instanceof sdk.sourceDestination.BlockDevice) {
+		// @ts-ignore (BlockDevice.drive is private)
+		return drive.drive;
+	} else if (drive instanceof sdk.sourceDestination.UsbbootDrive) {
+		// This is a workaround etcher expecting a device string and a size
+		// @ts-ignore
+		drive.device = drive.usbDevice.portId;
+		drive.size = null;
+		// @ts-ignore
+		drive.progress = 0;
+		drive.disabled = true;
+		drive.on('progress', (progress) => {
+			updateDriveProgress(drive, progress);
+		});
+		return drive;
+	} else if (drive instanceof sdk.sourceDestination.DriverlessDevice) {
+		const description =
+			COMPUTE_MODULE_DESCRIPTIONS[
+				drive.deviceDescriptor.idProduct.toString()
+			] || 'Compute Module';
+		return {
+			device: `${usbIdToString(
+				drive.deviceDescriptor.idVendor,
+			)}:${usbIdToString(drive.deviceDescriptor.idProduct)}`,
+			displayName: 'Missing drivers',
+			description,
+			mountpoints: [],
+			isReadOnly: false,
+			isSystem: false,
+			disabled: true,
+			icon: 'warning',
+			size: null,
+			link:
+				'https://www.raspberrypi.org/documentation/hardware/computemodule/cm-emmc-flashing.md',
+			linkCTA: 'Install',
+			linkTitle: 'Install missing drivers',
+			linkMessage: outdent`
+				Would you like to download the necessary drivers from the Raspberry Pi Foundation?
+				This will open your browser.
+
+
+				Once opened, download and run the installer from the "Windows Installer" section to install the drivers
+			`,
+		};
 	}
 }
 
-// Spawning the child process without privileges to get the drives list
-// TODO: clean up this mess of exports
-export let requestMetadata: any;
+function setDrives(drives: _.Dictionary<any>) {
+	availableDrives.setDrives(_.values(drives));
+}
 
-// start the api and spawn the child process
-spawnChildAndConnect({
-	withPrivileges: false,
-})
-	.then(({ emit, registerHandler }) => {
-		// start scanning
-		emit('scan', {});
+function getDrives() {
+	return _.keyBy(availableDrives.getDrives() || [], 'device');
+}
 
-		// make the sourceMetada awaitable to be used on source selection
-		requestMetadata = async (params: any): Promise<SourceMetadata> => {
-			emit('sourceMetadata', JSON.stringify(params));
+async function addDrive(drive: Drive) {
+	const preparedDrive = prepareDrive(drive);
+	if (!(await driveIsAllowed(preparedDrive))) {
+		return;
+	}
+	const drives = getDrives();
+	drives[preparedDrive.device] = preparedDrive;
+	setDrives(drives);
+	if (
+		(await settings.get('autoSelectAllDrives')) &&
+		drive instanceof sdk.sourceDestination.BlockDevice &&
+		// @ts-ignore BlockDevice.drive is private
+		isDriveValid(drive.drive, getImage())
+	) {
+		selectDrive(drive.device);
+	}
+}
 
-			return new Promise((resolve) =>
-				registerHandler('sourceMetadata', (data: any) => {
-					resolve(JSON.parse(data));
-				}),
-			);
-		};
+function removeDrive(drive: Drive) {
+	if (
+		drive instanceof sdk.sourceDestination.BlockDevice &&
+		// @ts-ignore BlockDevice.drive is private
+		isSourceDrive(drive.drive, getImage())
+	) {
+		// Deselect the image if it was on the drive that was removed.
+		// This will also deselect the image if the drive mountpoints change.
+		deselectImage();
+	}
+	const preparedDrive = prepareDrive(drive);
+	const drives = getDrives();
+	delete drives[preparedDrive.device];
+	setDrives(drives);
+}
 
-		registerHandler('drives', (data: any) => {
-			setDrives(JSON.parse(data));
-		});
-	})
-	.catch((error: any) => {
-		throw new Error(`Failed to start the flasher process. error: ${error}`);
-	});
+function updateDriveProgress(
+	drive: sdk.sourceDestination.UsbbootDrive,
+	progress: number,
+) {
+	const drives = getDrives();
+	// @ts-ignore
+	const driveInMap = drives[drive.device];
+	if (driveInMap) {
+		// @ts-ignore
+		drives[drive.device] = { ...driveInMap, progress };
+		setDrives(drives);
+	}
+}
+
+driveScanner.on('attach', addDrive);
+driveScanner.on('detach', removeDrive);
+
+driveScanner.on('error', (error) => {
+	// Stop the drive scanning loop in case of errors,
+	// otherwise we risk presenting the same error over
+	// and over again to the user, while also heavily
+	// spamming our error reporting service.
+	driveScanner.stop();
+
+	return exceptionReporter.report(error);
+});
+
+driveScanner.start();
 
 let popupExists = false;
 
-analytics.initAnalytics();
-
 window.addEventListener('beforeunload', async (event) => {
 	if (!flashState.isFlashing() || popupExists) {
 		analytics.logEvent('Close application', {
@@ -188,9 +322,9 @@ window.addEventListener('beforeunload', async (event) => {
 
 	try {
 		const confirmed = await osDialog.showWarning({
-			confirmationLabel: i18next.t('yesExit'),
-			rejectionLabel: i18next.t('cancel'),
-			title: i18next.t('reallyExit'),
+			confirmationLabel: 'Yes, quit',
+			rejectionLabel: 'Cancel',
+			title: 'Are you sure you want to close Etcher?',
 			description: messages.warning.exitWhileFlashing(),
 		});
 		if (confirmed) {
@@ -199,8 +333,8 @@ window.addEventListener('beforeunload', async (event) => {
 			});
 
 			// This circumvents the 'beforeunload' event unlike
-			// remote.app.quit() which does not.
-			remote.process.exit(EXIT_CODES.SUCCESS);
+			// electron.remote.app.quit() which does not.
+			electron.remote.process.exit(EXIT_CODES.SUCCESS);
 		}
 
 		analytics.logEvent('Close rejected while flashing', {
@@ -208,31 +342,17 @@ window.addEventListener('beforeunload', async (event) => {
 			flashingWorkflowUuid,
 		});
 		popupExists = false;
-	} catch (error: any) {
+	} catch (error) {
 		exceptionReporter.report(error);
 	}
 });
 
-export async function main() {
-	try {
-		const { init: ledsInit } = require('./models/leds');
-		await ledsInit();
-	} catch (error: any) {
-		exceptionReporter.report(error);
-	}
-
+async function main() {
+	await ledsInit();
 	ReactDOM.render(
 		React.createElement(MainPage),
 		document.getElementById('main'),
-		// callback to set the correct zoomFactor for webviews as well
-		async () => {
-			const fullscreen = await settings.get('fullscreen');
-			const width = fullscreen ? window.screen.width : window.outerWidth;
-			try {
-				electron.webFrame.setZoomFactor(width / settings.DEFAULT_WIDTH);
-			} catch (err) {
-				// noop
-			}
-		},
 	);
 }
+
+main();

lib/gui/app/components/drive-selector/drive-selector.tsx

@@ -1,572 +0,0 @@
-/*
- * Copyright 2019 balena.io
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import ExclamationTriangleSvg from '@fortawesome/fontawesome-free/svgs/solid/triangle-exclamation.svg';
-import ChevronDownSvg from '@fortawesome/fontawesome-free/svgs/solid/chevron-down.svg';
-import type * as sourceDestination from 'etcher-sdk/build/source-destination/';
-import * as React from 'react';
-import type { ModalProps, TableColumn } from 'rendition';
-import { Flex, Txt, Badge, Link } from 'rendition';
-import styled from 'styled-components';
-
-import type {
-	DriveStatus,
-	DrivelistDrive,
-} from '../../../../shared/drive-constraints';
-import {
-	getDriveImageCompatibilityStatuses,
-	isDriveValid,
-	isDriveSizeLarge,
-} from '../../../../shared/drive-constraints';
-import { compatibility, warning } from '../../../../shared/messages';
-import prettyBytes from 'pretty-bytes';
-import { getDrives, hasAvailableDrives } from '../../models/available-drives';
-import { getImage, isDriveSelected } from '../../models/selection-state';
-import { store } from '../../models/store';
-import { logEvent, logException } from '../../modules/analytics';
-import { open as openExternal } from '../../os/open-external/services/open-external';
-import type { GenericTableProps } from '../../styled-components';
-import { Alert, Modal, Table } from '../../styled-components';
-
-import type { SourceMetadata } from '../../../../shared/typings/source-selector';
-import { middleEllipsis } from '../../utils/middle-ellipsis';
-import * as i18next from 'i18next';
-
-interface UsbbootDrive extends sourceDestination.UsbbootDrive {
-	progress: number;
-}
-
-interface DriverlessDrive {
-	displayName: string; // added in app.ts
-	description: string;
-	link: string;
-	linkTitle: string;
-	linkMessage: string;
-	linkCTA: string;
-}
-
-type Drive = DrivelistDrive | DriverlessDrive | UsbbootDrive;
-
-function isUsbbootDrive(drive: Drive): drive is UsbbootDrive {
-	return (drive as UsbbootDrive).progress !== undefined;
-}
-
-function isDriverlessDrive(drive: Drive): drive is DriverlessDrive {
-	return (drive as DriverlessDrive).link !== undefined;
-}
-
-function isDrivelistDrive(drive: Drive): drive is DrivelistDrive {
-	return typeof (drive as DrivelistDrive).size === 'number';
-}
-
-const DrivesTable = styled((props: GenericTableProps<Drive>) => (
-	<Table<Drive> {...props} />
-))`
-	[data-display='table-head'],
-	[data-display='table-body'] {
-		> [data-display='table-row'] > [data-display='table-cell'] {
-			&:nth-child(2) {
-				width: 32%;
-			}
-
-			&:nth-child(3) {
-				width: 15%;
-			}
-
-			&:nth-child(4) {
-				width: 15%;
-			}
-
-			&:nth-child(5) {
-				width: 32%;
-			}
-		}
-	}
-`;
-
-function badgeShadeFromStatus(status: string) {
-	switch (status) {
-		case compatibility.containsImage():
-			return 16;
-		case compatibility.system():
-		case compatibility.tooSmall():
-			return 5;
-		default:
-			return 14;
-	}
-}
-
-const InitProgress = styled(
-	({
-		value,
-		...props
-	}: {
-		value: number;
-		props?: React.ProgressHTMLAttributes<Element>;
-	}) => {
-		return <progress max="100" value={value} {...props} />;
-	},
-)`
-	/* Reset the default appearance */
-	appearance: none;
-
-	::-webkit-progress-bar {
-		width: 130px;
-		height: 4px;
-		background-color: #dde1f0;
-		border-radius: 14px;
-	}
-
-	::-webkit-progress-value {
-		background-color: #1496e1;
-		border-radius: 14px;
-	}
-`;
-
-export interface DriveSelectorProps
-	extends Omit<ModalProps, 'done' | 'cancel' | 'onSelect'> {
-	write: boolean;
-	multipleSelection: boolean;
-	showWarnings?: boolean;
-	cancel: (drives: DrivelistDrive[]) => void;
-	done: (drives: DrivelistDrive[]) => void;
-	titleLabel: string;
-	emptyListLabel: string;
-	emptyListIcon: JSX.Element;
-	selectedList?: DrivelistDrive[];
-	updateSelectedList?: () => DrivelistDrive[];
-	onSelect?: (drive: DrivelistDrive) => void;
-}
-
-interface DriveSelectorState {
-	drives: Drive[];
-	image?: SourceMetadata;
-	missingDriversModal: { drive?: DriverlessDrive };
-	selectedList: DrivelistDrive[];
-	showSystemDrives: boolean;
-}
-
-function isSystemDrive(drive: Drive) {
-	return isDrivelistDrive(drive) && drive.isSystem;
-}
-
-export class DriveSelector extends React.Component<
-	DriveSelectorProps,
-	DriveSelectorState
-> {
-	private unsubscribe: (() => void) | undefined;
-	tableColumns: Array<TableColumn<Drive>>;
-	originalList: DrivelistDrive[];
-
-	constructor(props: DriveSelectorProps) {
-		super(props);
-
-		const defaultMissingDriversModalState: { drive?: DriverlessDrive } = {};
-		const selectedList = this.props.selectedList || [];
-		this.originalList = [...(this.props.selectedList || [])];
-
-		this.state = {
-			drives: getDrives(),
-			image: getImage(),
-			missingDriversModal: defaultMissingDriversModalState,
-			selectedList,
-			showSystemDrives: false,
-		};
-
-		this.tableColumns = [
-			{
-				field: 'description',
-				label: i18next.t('drives.name'),
-				render: (description: string, drive: Drive) => {
-					if (isDrivelistDrive(drive)) {
-						const isLargeDrive = isDriveSizeLarge(drive);
-						const hasWarnings =
-							this.props.showWarnings && (isLargeDrive || drive.isSystem);
-						return (
-							<Flex alignItems="center">
-								{hasWarnings && (
-									<ExclamationTriangleSvg
-										height="1em"
-										fill={drive.isSystem ? '#fca321' : '#8f9297'}
-									/>
-								)}
-								<Txt ml={(hasWarnings && 8) || 0}>
-									{middleEllipsis(description, 32)}
-								</Txt>
-							</Flex>
-						);
-					}
-					return <Txt>{description}</Txt>;
-				},
-			},
-			{
-				field: 'description',
-				key: 'size',
-				label: i18next.t('drives.size'),
-				render: (_description: string, drive: Drive) => {
-					if (isDrivelistDrive(drive) && drive.size !== null) {
-						return prettyBytes(drive.size);
-					}
-				},
-			},
-			{
-				field: 'description',
-				key: 'link',
-				label: i18next.t('drives.location'),
-				render: (_description: string, drive: Drive) => {
-					return (
-						<Txt>
-							{drive.displayName}
-							{isDriverlessDrive(drive) && (
-								<>
-									{' '}
-									-{' '}
-									<b>
-										<a onClick={() => this.installMissingDrivers(drive)}>
-											{drive.linkCTA}
-										</a>
-									</b>
-								</>
-							)}
-						</Txt>
-					);
-				},
-			},
-			{
-				field: 'description',
-				key: 'extra',
-				// We use an empty React fragment otherwise it uses the field name as label
-				label: <></>,
-				render: (_description: string, drive: Drive) => {
-					if (isUsbbootDrive(drive)) {
-						return this.renderProgress(drive.progress);
-					} else if (isDrivelistDrive(drive)) {
-						return this.renderStatuses(drive);
-					}
-				},
-			},
-		];
-	}
-
-	private driveShouldBeDisabled(drive: Drive, image?: SourceMetadata) {
-		return (
-			isUsbbootDrive(drive) ||
-			isDriverlessDrive(drive) ||
-			!isDriveValid(drive, image, this.props.write) ||
-			(this.props.write && drive.isReadOnly)
-		);
-	}
-
-	private getDisplayedDrives(drives: Drive[]): Drive[] {
-		return drives.filter((drive) => {
-			return (
-				isUsbbootDrive(drive) ||
-				isDriverlessDrive(drive) ||
-				isDriveSelected(drive.device) ||
-				this.state.showSystemDrives ||
-				!drive.isSystem
-			);
-		});
-	}
-
-	private getDisabledDrives(drives: Drive[], image?: SourceMetadata): string[] {
-		return drives
-			.filter((drive) => this.driveShouldBeDisabled(drive, image))
-			.map((drive) => drive.displayName);
-	}
-
-	private renderProgress(progress: number) {
-		return (
-			<Flex flexDirection="column">
-				<Txt fontSize={12}>Initializing device</Txt>
-				<InitProgress value={progress} />
-			</Flex>
-		);
-	}
-
-	private warningFromStatus(
-		status: string,
-		drive: { device: string; size: number },
-	) {
-		switch (status) {
-			case compatibility.containsImage():
-				return warning.sourceDrive();
-			case compatibility.largeDrive():
-				return warning.largeDriveSize();
-			case compatibility.system():
-				return warning.systemDrive();
-			case compatibility.tooSmall():
-				return warning.tooSmall(
-					{
-						size:
-							this.state.image?.recommendedDriveSize ||
-							this.state.image?.size ||
-							0,
-					},
-					drive,
-				);
-			default:
-				return '';
-		}
-	}
-
-	private renderStatuses(drive: DrivelistDrive) {
-		const statuses: DriveStatus[] = getDriveImageCompatibilityStatuses(
-			drive,
-			this.state.image,
-			this.props.write,
-		).slice(0, 2);
-		return (
-			// the column render fn expects a single Element
-			<>
-				{statuses.map((status) => {
-					const badgeShade = badgeShadeFromStatus(status.message);
-					const warningMessage = this.warningFromStatus(status.message, {
-						device: drive.device,
-						size: drive.size || 0,
-					});
-					return (
-						<Badge
-							key={status.message}
-							shade={badgeShade}
-							mr="8px"
-							tooltip={this.props.showWarnings ? warningMessage : ''}
-						>
-							{status.message}
-						</Badge>
-					);
-				})}
-			</>
-		);
-	}
-
-	private installMissingDrivers(drive: DriverlessDrive) {
-		if (drive.link) {
-			logEvent('Open driver link modal', {
-				url: drive.link,
-			});
-			this.setState({ missingDriversModal: { drive } });
-		}
-	}
-
-	componentDidMount() {
-		this.unsubscribe = store.subscribe(() => {
-			const drives = getDrives();
-			const image = getImage();
-			this.setState({
-				drives,
-				image,
-				selectedList:
-					(this.props.updateSelectedList && this.props.updateSelectedList()) ||
-					[],
-			});
-		});
-	}
-
-	componentWillUnmount() {
-		this.unsubscribe?.();
-	}
-
-	render() {
-		const { cancel, done, ...props } = this.props;
-		const { selectedList, drives, image, missingDriversModal } = this.state;
-
-		const displayedDrives = this.getDisplayedDrives(drives);
-		const disabledDrives = this.getDisabledDrives(drives, image);
-		const numberOfSystemDrives = drives.filter(isSystemDrive).length;
-		const numberOfDisplayedSystemDrives =
-			displayedDrives.filter(isSystemDrive).length;
-		const numberOfHiddenSystemDrives =
-			numberOfSystemDrives - numberOfDisplayedSystemDrives;
-		const hasSystemDrives = selectedList.filter(isSystemDrive).length;
-		const showWarnings = this.props.showWarnings && hasSystemDrives;
-
-		return (
-			<Modal
-				titleElement={
-					<Flex alignItems="baseline" mb={18}>
-						<Txt fontSize={24} align="left">
-							{this.props.titleLabel}
-						</Txt>
-						<Txt
-							fontSize={11}
-							ml={12}
-							color="#5b82a7"
-							style={{ fontWeight: 600 }}
-						>
-							{i18next.t('drives.find', { length: drives.length })}
-						</Txt>
-					</Flex>
-				}
-				titleDetails={<Txt fontSize={11}>{getDrives().length} found</Txt>}
-				cancel={() => cancel(this.originalList)}
-				done={() => done(selectedList)}
-				action={i18next.t('drives.select', { select: selectedList.length })}
-				primaryButtonProps={{
-					primary: !showWarnings,
-					warning: showWarnings,
-					disabled: !hasAvailableDrives(),
-				}}
-				{...props}
-			>
-				{!hasAvailableDrives() ? (
-					<Flex
-						flexDirection="column"
-						justifyContent="center"
-						alignItems="center"
-						width="100%"
-					>
-						{this.props.emptyListIcon}
-						<b>{this.props.emptyListLabel}</b>
-					</Flex>
-				) : (
-					<>
-						<DrivesTable
-							refFn={() => {
-								// noop
-							}}
-							checkedItems={selectedList}
-							checkedRowsNumber={selectedList.length}
-							multipleSelection={this.props.multipleSelection}
-							columns={this.tableColumns}
-							data={displayedDrives}
-							disabledRows={disabledDrives}
-							getRowClass={(row: Drive) =>
-								isDrivelistDrive(row) && row.isSystem ? ['system'] : []
-							}
-							rowKey="displayName"
-							onCheck={(rows) => {
-								if (rows == null) {
-									rows = [];
-								}
-								let newSelection = rows.filter(isDrivelistDrive);
-								if (this.props.multipleSelection) {
-									if (rows.length === 0) {
-										newSelection = [];
-									}
-									const deselecting = selectedList.filter(
-										(selected) =>
-											newSelection.filter(
-												(row) => row.device === selected.device,
-											).length === 0,
-									);
-									const selecting = newSelection.filter(
-										(row) =>
-											selectedList.filter(
-												(selected) => row.device === selected.device,
-											).length === 0,
-									);
-									deselecting.concat(selecting).forEach((row) => {
-										if (this.props.onSelect) {
-											this.props.onSelect(row);
-										}
-									});
-									this.setState({
-										selectedList: newSelection,
-									});
-									return;
-								}
-								if (this.props.onSelect) {
-									this.props.onSelect(newSelection[newSelection.length - 1]);
-								}
-								this.setState({
-									selectedList: newSelection.slice(newSelection.length - 1),
-								});
-							}}
-							onRowClick={(row: Drive) => {
-								if (
-									!isDrivelistDrive(row) ||
-									this.driveShouldBeDisabled(row, image)
-								) {
-									return;
-								}
-								if (this.props.onSelect) {
-									this.props.onSelect(row);
-								}
-								const index = selectedList.findIndex(
-									(d) => d.device === row.device,
-								);
-								const newList = this.props.multipleSelection
-									? [...selectedList]
-									: [];
-								if (index === -1) {
-									newList.push(row);
-								} else {
-									// Deselect if selected
-									newList.splice(index, 1);
-								}
-								this.setState({
-									selectedList: newList,
-								});
-							}}
-						/>
-						{numberOfHiddenSystemDrives > 0 && (
-							<Link
-								mt={15}
-								mb={15}
-								fontSize="14px"
-								onClick={() => this.setState({ showSystemDrives: true })}
-							>
-								<Flex alignItems="center">
-									<ChevronDownSvg height="1em" fill="currentColor" />
-									<Txt ml={8}>
-										{i18next.t('drives.showHidden', {
-											num: numberOfHiddenSystemDrives,
-										})}
-									</Txt>
-								</Flex>
-							</Link>
-						)}
-					</>
-				)}
-				{this.props.showWarnings && hasSystemDrives ? (
-					<Alert className="system-drive-alert" style={{ width: '67%' }}>
-						{i18next.t('drives.systemDriveDanger')}
-					</Alert>
-				) : null}
-
-				{missingDriversModal.drive !== undefined && (
-					<Modal
-						width={400}
-						title={missingDriversModal.drive.linkTitle}
-						cancel={() => this.setState({ missingDriversModal: {} })}
-						done={() => {
-							try {
-								if (missingDriversModal.drive !== undefined) {
-									openExternal(missingDriversModal.drive.link);
-								}
-							} catch (error: any) {
-								logException(error);
-							} finally {
-								this.setState({ missingDriversModal: {} });
-							}
-						}}
-						action={i18next.t('yesContinue')}
-						cancelButtonProps={{
-							children: i18next.t('cancel'),
-						}}
-						children={
-							missingDriversModal.drive.linkMessage ||
-							i18next.t('drives.openInBrowser', {
-								link: missingDriversModal.drive.link,
-							})
-						}
-					/>
-				)}
-			</Modal>
-		);
-	}
-}

lib/gui/app/components/drive-status-warning-modal/drive-status-warning-modal.tsx

@@ -1,83 +0,0 @@
-import ExclamationTriangleSvg from '@fortawesome/fontawesome-free/svgs/solid/triangle-exclamation.svg';
-import * as React from 'react';
-import type { ModalProps } from 'rendition';
-import { Badge, Flex, Txt } from 'rendition';
-import { Modal, ScrollableFlex } from '../../styled-components';
-import { middleEllipsis } from '../../utils/middle-ellipsis';
-
-import prettyBytes from 'pretty-bytes';
-import type { DriveWithWarnings } from '../../pages/main/Flash';
-import * as i18next from 'i18next';
-
-const DriveStatusWarningModal = ({
-	done,
-	cancel,
-	isSystem,
-	drivesWithWarnings,
-}: ModalProps & {
-	isSystem: boolean;
-	drivesWithWarnings: DriveWithWarnings[];
-}) => {
-	let warningSubtitle = i18next.t('drives.largeDriveWarning');
-	let warningCta = i18next.t('drives.largeDriveWarningMsg');
-
-	if (isSystem) {
-		warningSubtitle = i18next.t('drives.systemDriveWarning');
-		warningCta = i18next.t('drives.systemDriveWarningMsg');
-	}
-	return (
-		<Modal
-			footerShadow={false}
-			reverseFooterButtons={true}
-			done={done}
-			cancel={cancel}
-			cancelButtonProps={{
-				primary: false,
-				warning: true,
-				children: i18next.t('drives.changeTarget'),
-			}}
-			action={i18next.t('sure')}
-			primaryButtonProps={{
-				primary: false,
-				outline: true,
-			}}
-		>
-			<Flex
-				flexDirection="column"
-				alignItems="center"
-				justifyContent="center"
-				width="100%"
-			>
-				<Flex flexDirection="column">
-					<ExclamationTriangleSvg height="2em" fill="#fca321" />
-					<Txt fontSize="24px" color="#fca321">
-						{i18next.t('warning')}
-					</Txt>
-				</Flex>
-				<Txt fontSize="24px">{warningSubtitle}</Txt>
-				<ScrollableFlex
-					flexDirection="column"
-					backgroundColor="#fff5e6"
-					m="2em 0"
-					p="1em 2em"
-					width="420px"
-					maxHeight="100px"
-				>
-					{drivesWithWarnings.map((drive, i, array) => (
-						<>
-							<Flex justifyContent="space-between" alignItems="baseline">
-								<strong>{middleEllipsis(drive.description, 28)}</strong>{' '}
-								{drive.size && prettyBytes(drive.size) + ' '}
-								<Badge shade={5}>{drive.statuses[0].message}</Badge>
-							</Flex>
-							{i !== array.length - 1 ? <hr style={{ width: '100%' }} /> : null}
-						</>
-					))}
-				</ScrollableFlex>
-				<Txt style={{ fontWeight: 600 }}>{warningCta}</Txt>
-			</Flex>
-		</Modal>
-	);
-};
-
-export default DriveStatusWarningModal;

lib/gui/app/components/finish/finish.tsx

@@ -14,19 +14,22 @@
  * limitations under the License.
  */
 
+import * as _ from 'lodash';
 import * as React from 'react';
 import { Flex } from 'rendition';
 import { v4 as uuidV4 } from 'uuid';
 
 import * as flashState from '../../models/flash-state';
 import * as selectionState from '../../models/selection-state';
-import * as settings from '../../models/settings';
 import { Actions, store } from '../../models/store';
 import * as analytics from '../../modules/analytics';
+import { open as openExternal } from '../../os/open-external/services/open-external';
 import { FlashAnother } from '../flash-another/flash-another';
-import type { FlashError } from '../flash-results/flash-results';
 import { FlashResults } from '../flash-results/flash-results';
-import { SafeWebview } from '../safe-webview/safe-webview';
+
+import EtcherSvg from '../../../assets/etcher.svg';
+import LoveSvg from '../../../assets/love.svg';
+import BalenaSvg from '../../../assets/balena.svg';
 
 function restart(goToMain: () => void) {
 	selectionState.deselectAllDrives();
@@ -41,62 +44,22 @@ function restart(goToMain: () => void) {
 	goToMain();
 }
 
-async function getSuccessBannerURL() {
-	return (
-		(await settings.get('successBannerURL')) ??
-		'https://efp.balena.io/success-banner?borderTop=false&darkBackground=true'
+function formattedErrors() {
+	const errors = _.map(
+		_.get(flashState.getFlashResults(), ['results', 'errors']),
+		(error) => {
+			return `${error.device}: ${error.message || error.code}`;
+		},
 	);
+	return errors.join('\n');
 }
 
 function FinishPage({ goToMain }: { goToMain: () => void }) {
-	const [webviewShowing, setWebviewShowing] = React.useState(false);
-	const [successBannerURL, setSuccessBannerURL] = React.useState('');
-	(async () => {
-		setSuccessBannerURL(await getSuccessBannerURL());
-	})();
-	const flashResults = flashState.getFlashResults();
-	const errors: FlashError[] = (
-		store.getState().toJS().failedDeviceErrors || []
-	).map(([, error]: [string, FlashError]) => ({
-		...error,
-	}));
-	const { averageSpeed, blockmappedSize, bytesWritten, failed, size } =
-		flashState.getFlashState();
-	const {
-		skip,
-		results = {
-			bytesWritten,
-			sourceMetadata: {
-				size,
-				blockmappedSize,
-			},
-			averageFlashingSpeed: averageSpeed,
-			devices: { failed, successful: 0 },
-		},
-	} = flashResults;
+	const results = flashState.getFlashResults().results || {};
 	return (
-		<Flex height="100%" justifyContent="space-between">
-			<Flex
-				width={webviewShowing ? '36.2vw' : '100vw'}
-				height="100vh"
-				alignItems="center"
-				justifyContent="center"
-				flexDirection="column"
-				style={{
-					position: 'absolute',
-					top: 0,
-					zIndex: 1,
-					boxShadow: '0 2px 15px 0 rgba(0, 0, 0, 0.2)',
-				}}
-			>
-				<FlashResults
-					image={selectionState.getImage()?.name}
-					results={results}
-					skip={skip}
-					errors={errors}
-					mb="32px"
-					goToMain={goToMain}
-				/>
+		<Flex flexDirection="column" width="100%" color="#fff">
+			<Flex height="160px" alignItems="center" justifyContent="center">
+				<FlashResults results={results} errors={formattedErrors()} />
 
 				<FlashAnother
 					onClick={() => {
@@ -104,20 +67,34 @@ function FinishPage({ goToMain }: { goToMain: () => void }) {
 					}}
 				/>
 			</Flex>
-			{successBannerURL.length && (
-				<SafeWebview
-					src={successBannerURL}
-					onWebviewShow={setWebviewShowing}
-					style={{
-						display: webviewShowing ? 'flex' : 'none',
-						position: 'absolute',
-						right: 0,
-						bottom: 0,
-						width: '63.8vw',
-						height: '100vh',
-					}}
-				/>
-			)}
+
+			<Flex
+				flexDirection="column"
+				height="320px"
+				justifyContent="space-between"
+				alignItems="center"
+			>
+				<Flex fontSize="28px" mt="40px">
+					Thanks for using
+					<EtcherSvg
+						width="165px"
+						style={{ margin: '0 10px', cursor: 'pointer' }}
+						onClick={() =>
+							openExternal('https://balena.io/etcher?ref=etcher_offline_banner')
+						}
+					/>
+				</Flex>
+				<Flex mb="10px">
+					made with
+					<LoveSvg height="20px" style={{ margin: '0 10px' }} />
+					by
+					<BalenaSvg
+						height="20px"
+						style={{ margin: '0 10px', cursor: 'pointer' }}
+						onClick={() => openExternal('https://balena.io?ref=etcher_success')}
+					/>
+				</Flex>
+			</Flex>
 		</Flex>
 	);
 }

lib/gui/app/components/flash-another/flash-another.tsx

@@ -17,7 +17,6 @@
 import * as React from 'react';
 
 import { BaseButton } from '../../styled-components';
-import * as i18next from 'i18next';
 
 export interface FlashAnotherProps {
 	onClick: () => void;
@@ -26,7 +25,7 @@ export interface FlashAnotherProps {
 export const FlashAnother = (props: FlashAnotherProps) => {
 	return (
 		<BaseButton primary onClick={props.onClick}>
-			{i18next.t('flash.another')}
+			Flash Another
 		</BaseButton>
 	);
 };

lib/gui/app/components/flash-results/flash-results.tsx

@@ -15,230 +15,92 @@
  */
 
 import CircleSvg from '@fortawesome/fontawesome-free/svgs/solid/circle.svg';
-import CheckCircleSvg from '@fortawesome/fontawesome-free/svgs/solid/circle-check.svg';
-import TimesCircleSvg from '@fortawesome/fontawesome-free/svgs/solid/circle-xmark.svg';
+import CheckCircleSvg from '@fortawesome/fontawesome-free/svgs/solid/check-circle.svg';
+import * as _ from 'lodash';
+import outdent from 'outdent';
 import * as React from 'react';
-import type { FlexProps, TableColumn } from 'rendition';
-import { Flex, Link, Txt } from 'rendition';
-import styled from 'styled-components';
+import { Flex, Txt } from 'rendition';
 
 import { progress } from '../../../../shared/messages';
 import { bytesToMegabytes } from '../../../../shared/units';
 
-import FlashSvg from '../../../assets/flash.svg';
-import { getDrives } from '../../models/available-drives';
-import { resetState } from '../../models/flash-state';
-import * as selection from '../../models/selection-state';
-import { middleEllipsis } from '../../utils/middle-ellipsis';
-import { Modal, Table } from '../../styled-components';
-import * as i18next from 'i18next';
-
-const ErrorsTable = styled((props) => <Table<FlashError> {...props} />)`
-	&&& [data-display='table-head'],
-	&&& [data-display='table-body'] {
-		> [data-display='table-row'] {
-			> [data-display='table-cell'] {
-				&:first-child {
-					width: 30%;
-				}
-
-				&:nth-child(2) {
-					width: 20%;
-				}
-
-				&:last-child {
-					width: 50%;
-				}
-			}
-		}
-	}
-`;
-const DoneIcon = (props: {
-	skipped: boolean;
-	color: string;
-	allFailed: boolean;
-}) => {
-	const svgProps = {
-		width: '28px',
-		fill: props.color,
-		style: {
-			marginTop: '-25px',
-			marginLeft: '13px',
-			zIndex: 1,
-		},
-	};
-	return props.allFailed && !props.skipped ? (
-		<TimesCircleSvg {...svgProps} />
-	) : (
-		<CheckCircleSvg {...svgProps} />
-	);
-};
-
-export interface FlashError extends Error {
-	description: string;
-	device: string;
-	code: string;
-}
-
-function formattedErrors(errors: FlashError[]) {
-	return errors
-		.map((error) => `${error.device}: ${error.message || error.code}`)
-		.join('\n');
-}
-
-const columns: Array<TableColumn<FlashError>> = [
-	{
-		field: 'description',
-		label: i18next.t('flash.target'),
-	},
-	{
-		field: 'device',
-		label: i18next.t('flash.location'),
-	},
-	{
-		field: 'message',
-		label: i18next.t('flash.error'),
-		render: (message: string, { code }: FlashError) => {
-			return message ?? code;
-		},
-	},
-];
-
-function getEffectiveSpeed(results: {
-	sourceMetadata: {
-		size: number;
-		blockmappedSize?: number;
-	};
-	averageFlashingSpeed: number;
-}) {
-	const flashedSize =
-		results.sourceMetadata.blockmappedSize ?? results.sourceMetadata.size;
-	const timeSpent = flashedSize / results.averageFlashingSpeed;
-	return results.sourceMetadata.size / timeSpent;
-}
-
 export function FlashResults({
-	goToMain,
-	image = '',
 	errors,
 	results,
-	skip,
-	...props
 }: {
-	goToMain: () => void;
-	image?: string;
-	errors: FlashError[];
-	skip: boolean;
+	errors: string;
 	results: {
+		bytesWritten: number;
 		sourceMetadata: {
 			size: number;
-			blockmappedSize?: number;
+			blockmappedSize: number;
 		};
 		averageFlashingSpeed: number;
 		devices: { failed: number; successful: number };
 	};
-} & FlexProps) {
-	const [showErrorsInfo, setShowErrorsInfo] = React.useState(false);
-
-	const allFailed = !skip && results?.devices?.successful === 0;
-	const someFailed = results?.devices?.failed !== 0 || errors?.length !== 0;
-	const effectiveSpeed = bytesToMegabytes(getEffectiveSpeed(results)).toFixed(
+}) {
+	const allDevicesFailed = results.devices.successful === 0;
+	const effectiveSpeed = _.round(
+		bytesToMegabytes(
+			results.sourceMetadata.size /
+				(results.bytesWritten / results.averageFlashingSpeed),
+		),
 		1,
 	);
 	return (
-		<Flex flexDirection="column" {...props}>
-			<Flex alignItems="center" flexDirection="column">
-				<Flex
-					alignItems="center"
-					mt="50px"
-					mb="32px"
-					color="#7e8085"
-					flexDirection="column"
-				>
-					<FlashSvg width="40px" height="40px" className="disabled" />
-					<DoneIcon
-						skipped={skip}
-						allFailed={allFailed}
-						color={allFailed || someFailed ? '#c6c8c9' : '#1ac135'}
-					/>
-					<Txt>{middleEllipsis(image, 24)}</Txt>
-				</Flex>
-				<Txt fontSize={24} color="#fff" mb="17px">
-					{allFailed
-						? i18next.t('flash.flashFailed')
-						: i18next.t('flash.flashCompleted')}
+		<Flex
+			flexDirection="column"
+			mr="80px"
+			height="90px"
+			style={{
+				position: 'relative',
+				top: '25px',
+			}}
+		>
+			<Flex alignItems="center">
+				<CheckCircleSvg
+					width="24px"
+					fill={allDevicesFailed ? '#c6c8c9' : '#1ac135'}
+					style={{
+						margin: '0 15px 0 0',
+					}}
+				/>
+				<Txt fontSize={24} color="#fff">
+					Flash Complete!
 				</Txt>
-				{skip ? <Txt color="#7e8085">{i18next.t('flash.skip')}</Txt> : null}
 			</Flex>
-			<Flex flexDirection="column" color="#7e8085">
-				{results.devices.successful !== 0 ? (
-					<Flex alignItems="center">
-						<CircleSvg width="14px" fill="#1ac135" />
-						<Txt ml="10px" color="#fff">
-							{results.devices.successful}
-						</Txt>
-						<Txt ml="10px">
-							{progress.successful(results.devices.successful)}
-						</Txt>
-					</Flex>
-				) : null}
-				{errors.length !== 0 ? (
-					<Flex alignItems="center">
-						<CircleSvg width="14px" fill="#ff4444" />
-						<Txt ml="10px" color="#fff">
-							{errors.length}
-						</Txt>
-						<Txt ml="10px" tooltip={formattedErrors(errors)}>
-							{progress.failed(errors.length)}
-						</Txt>
-						<Link ml="10px" onClick={() => setShowErrorsInfo(true)}>
-							{i18next.t('flash.moreInfo')}
-						</Link>
-					</Flex>
-				) : null}
-				{!allFailed && (
+			<Flex flexDirection="column" mr="0" mb="0" ml="40px" color="#7e8085">
+				{Object.entries(results.devices).map(([type, quantity]) => {
+					return quantity ? (
+						<Flex
+							alignItems="center"
+							tooltip={type === 'failed' ? errors : undefined}
+						>
+							<CircleSvg
+								width="14px"
+								fill={type === 'failed' ? '#ff4444' : '#1ac135'}
+							/>
+							<Txt ml={10}>{quantity}</Txt>
+							<Txt ml={10}>{progress[type](quantity)}</Txt>
+						</Flex>
+					) : null;
+				})}
+				{!allDevicesFailed && (
 					<Txt
 						fontSize="10px"
 						style={{
 							fontWeight: 500,
 							textAlign: 'center',
 						}}
-						tooltip={i18next.t('flash.speedTip')}
+						tooltip={outdent({ newline: ' ' })`
+							The speed is calculated by dividing the image size by the flashing time.
+							Disk images with ext partitions flash faster as we are able to skip unused parts.
+						`}
 					>
-						{i18next.t('flash.speed', { speed: effectiveSpeed })}
+						Effective speed: {effectiveSpeed} MB/s
 					</Txt>
 				)}
 			</Flex>
-
-			{showErrorsInfo && (
-				<Modal
-					titleElement={
-						<Flex alignItems="baseline" mb={18}>
-							<Txt fontSize={24} align="left">
-								{i18next.t('failedTarget')}
-							</Txt>
-						</Flex>
-					}
-					action={i18next.t('failedRetry')}
-					cancel={() => setShowErrorsInfo(false)}
-					done={() => {
-						setShowErrorsInfo(false);
-						resetState();
-						getDrives()
-							.map((drive) => {
-								selection.deselectDrive(drive.device);
-								return drive.device;
-							})
-							.filter((driveDevice) =>
-								errors.some((error) => error.device === driveDevice),
-							)
-							.forEach((driveDevice) => selection.selectDrive(driveDevice));
-						goToMain();
-					}}
-				>
-					<ErrorsTable columns={columns} data={errors} />
-				</Modal>
-			)}
 		</Flex>
 	);
 }

lib/gui/app/components/progress-button/progress-button.tsx

@@ -20,22 +20,20 @@ import { default as styled } from 'styled-components';
 
 import { fromFlashState } from '../../modules/progress-status';
 import { StepButton } from '../../styled-components';
-import * as i18next from 'i18next';
 
 const FlashProgressBar = styled(ProgressBar)`
 	> div {
-		width: 100%;
+		width: 220px;
 		height: 12px;
 		color: white !important;
 		text-shadow: none !important;
 		transition-duration: 0s;
-
 		> div {
 			transition-duration: 0s;
 		}
 	}
 
-	width: 100%;
+	width: 220px;
 	height: 12px;
 	margin-bottom: 6px;
 	border-radius: 14px;
@@ -51,7 +49,7 @@ interface ProgressButtonProps {
 	percentage: number;
 	position: number;
 	disabled: boolean;
-	cancel: (type: string) => void;
+	cancel: () => void;
 	callback: () => void;
 	warning?: boolean;
 }
@@ -62,16 +60,12 @@ const colors = {
 	verifying: '#1ac135',
 } as const;
 
-const CancelButton = styled(({ type, onClick, ...props }) => {
-	const status = type === 'verifying' ? i18next.t('skip') : i18next.t('cancel');
-	return (
-		<Button plain onClick={() => onClick(status)} {...props}>
-			{status}
-		</Button>
-	);
-})`
+const CancelButton = styled((props) => (
+	<Button plain {...props}>
+		Cancel
+	</Button>
+))`
 	font-weight: 600;
-
 	&&& {
 		width: auto;
 		height: auto;
@@ -81,14 +75,11 @@ const CancelButton = styled(({ type, onClick, ...props }) => {
 
 export class ProgressButton extends React.PureComponent<ProgressButtonProps> {
 	public render() {
-		const percentage = this.props.percentage;
-		const warning = this.props.warning;
 		const { status, position } = fromFlashState({
 			type: this.props.type,
-			percentage,
 			position: this.props.position,
+			percentage: this.props.percentage,
 		});
-		const type = this.props.type || 'default';
 		if (this.props.active) {
 			return (
 				<>
@@ -105,31 +96,28 @@ export class ProgressButton extends React.PureComponent<ProgressButtonProps> {
 					>
 						<Flex>
 							<Txt color="#fff">{status}&nbsp;</Txt>
-							<Txt color={colors[type]}>{position}</Txt>
+							<Txt color={colors[this.props.type]}>{position}</Txt>
 						</Flex>
-						{type && (
-							<CancelButton
-								type={type}
-								onClick={this.props.cancel}
-								color="#00aeef"
-							/>
-						)}
+						<CancelButton onClick={this.props.cancel} color="#00aeef" />
 					</Flex>
-					<FlashProgressBar background={colors[type]} value={percentage} />
+					<FlashProgressBar
+						background={colors[this.props.type]}
+						value={this.props.percentage}
+					/>
 				</>
 			);
 		}
 		return (
 			<StepButton
-				primary={!warning}
-				warning={warning}
+				primary={!this.props.warning}
+				warning={this.props.warning}
 				onClick={this.props.callback}
 				disabled={this.props.disabled}
 				style={{
 					marginTop: 30,
 				}}
 			>
-				{i18next.t('flash.flashNow')}
+				Flash!
 			</StepButton>
 		);
 	}

lib/gui/app/components/reduced-flashing-infos/reduced-flashing-infos.tsx

@@ -23,22 +23,23 @@ import { SVGIcon } from '../svg-icon/svg-icon';
 import { middleEllipsis } from '../../utils/middle-ellipsis';
 
 interface ReducedFlashingInfosProps {
-	imageLogo?: string;
-	imageName?: string;
+	imageLogo: string;
+	imageName: string;
 	imageSize: string;
 	driveTitle: string;
 	driveLabel: string;
 	style?: React.CSSProperties;
 }
 
-export class ReducedFlashingInfos extends React.Component<ReducedFlashingInfosProps> {
+export class ReducedFlashingInfos extends React.Component<
+	ReducedFlashingInfosProps
+> {
 	constructor(props: ReducedFlashingInfosProps) {
 		super(props);
 		this.state = {};
 	}
 
 	public render() {
-		const { imageName = '' } = this.props;
 		return (
 			<Flex
 				flexDirection="column"
@@ -55,9 +56,9 @@ export class ReducedFlashingInfos extends React.Component<ReducedFlashingInfosPr
 					/>
 					<Txt
 						style={{ marginRight: '9px' }}
-						tooltip={{ text: imageName, placement: 'right' }}
+						tooltip={{ text: this.props.imageName, placement: 'right' }}
 					>
-						{middleEllipsis(imageName, 16)}
+						{middleEllipsis(this.props.imageName, 16)}
 					</Txt>
 					<Txt color="#7e8085">{this.props.imageSize}</Txt>
 				</Flex>

lib/gui/app/components/safe-webview/safe-webview.tsx

@@ -15,7 +15,6 @@
  */
 
 import * as electron from 'electron';
-import * as remote from '@electron/remote';
 import * as _ from 'lodash';
 import * as React from 'react';
 
@@ -95,11 +94,10 @@ export class SafeWebview extends React.PureComponent<
 		);
 		this.entryHref = url.href;
 		// Events steal 'this'
-		this.handleDomReady = _.bind(this.handleDomReady, this);
 		this.didFailLoad = _.bind(this.didFailLoad, this);
 		this.didGetResponseDetails = _.bind(this.didGetResponseDetails, this);
 		// Make a persistent electron session for the webview
-		this.session = remote.session.fromPartition(ELECTRON_SESSION, {
+		this.session = electron.remote.session.fromPartition(ELECTRON_SESSION, {
 			// Disable the cache for the session such that new content shows up when refreshing
 			cache: false,
 		});
@@ -122,8 +120,6 @@ export class SafeWebview extends React.PureComponent<
 				ref={this.webviewRef}
 				partition={ELECTRON_SESSION}
 				style={style}
-				// @ts-ignore
-				allowpopups="true"
 			/>
 		);
 	}
@@ -137,8 +133,8 @@ export class SafeWebview extends React.PureComponent<
 				this.didFailLoad,
 			);
 			this.webviewRef.current.addEventListener(
-				'dom-ready',
-				this.handleDomReady,
+				'new-window',
+				SafeWebview.newWindow,
 			);
 			this.webviewRef.current.addEventListener(
 				'console-message',
@@ -160,8 +156,8 @@ export class SafeWebview extends React.PureComponent<
 				this.didFailLoad,
 			);
 			this.webviewRef.current.removeEventListener(
-				'dom-ready',
-				this.handleDomReady,
+				'new-window',
+				SafeWebview.newWindow,
 			);
 			this.webviewRef.current.removeEventListener(
 				'console-message',
@@ -171,15 +167,6 @@ export class SafeWebview extends React.PureComponent<
 		this.session.webRequest.onCompleted(null);
 	}
 
-	handleDomReady() {
-		const webview = this.webviewRef.current;
-		if (webview == null) {
-			return;
-		}
-		const id = webview.getWebContentsId();
-		electron.ipcRenderer.send('webview-dom-ready', id);
-	}
-
 	// Set the element state to hidden
 	public didFailLoad() {
 		this.setState({
@@ -196,10 +183,7 @@ export class SafeWebview extends React.PureComponent<
 		// only care about this event if it's a request for the main frame
 		if (event.resourceType === 'mainFrame') {
 			const HTTP_OK = 200;
-			const { webContents, ...webviewEvent } = event;
-			analytics.logEvent('SafeWebview loaded', {
-				...webviewEvent,
-			});
+			analytics.logEvent('SafeWebview loaded', { event });
 			this.setState({
 				shouldShow: event.statusCode === HTTP_OK,
 			});
@@ -208,4 +192,17 @@ export class SafeWebview extends React.PureComponent<
 			}
 		}
 	}
+
+	// Open link in browser if it's opened as a 'foreground-tab'
+	public static async newWindow(event: electron.NewWindowEvent) {
+		const url = new window.URL(event.url);
+		if (
+			(url.protocol === 'http:' || url.protocol === 'https:') &&
+			event.disposition === 'foreground-tab' &&
+			// Don't open links if they're disabled by the env var
+			!(await settings.get('disableExternalLinks'))
+		) {
+			electron.shell.openExternal(url.href);
+		}
+	}
 }

lib/gui/app/components/settings/settings.tsx

@@ -16,57 +16,60 @@
 
 import GithubSvg from '@fortawesome/fontawesome-free/svgs/brands/github.svg';
 import * as _ from 'lodash';
+import * as os from 'os';
 import * as React from 'react';
-import { Box, Checkbox, Flex, Txt } from 'rendition';
+import { Flex, Checkbox, Txt } from 'rendition';
 
 import { version, packageType } from '../../../../../package.json';
 import * as settings from '../../models/settings';
 import * as analytics from '../../modules/analytics';
 import { open as openExternal } from '../../os/open-external/services/open-external';
 import { Modal } from '../../styled-components';
-import * as i18next from 'i18next';
-import { etcherProInfo } from '../../utils/etcher-pro-specific';
+
+const platform = os.platform();
 
 interface Setting {
 	name: string;
 	label: string | JSX.Element;
+	options?: {
+		description: string;
+		confirmLabel: string;
+	};
+	hide?: boolean;
 }
 
 async function getSettingsList(): Promise<Setting[]> {
-	const list: Setting[] = [
+	return [
 		{
 			name: 'errorReporting',
-			label: i18next.t('settings.errorReporting'),
+			label: 'Anonymously report errors and usage statistics to balena.io',
 		},
 		{
-			name: 'autoBlockmapping',
-			label: i18next.t('settings.trimExtPartitions'),
+			name: 'unmountOnSuccess',
+			/**
+			 * On Windows, "Unmounting" basically means "ejecting".
+			 * On top of that, Windows users are usually not even
+			 * familiar with the meaning of "unmount", which comes
+			 * from the UNIX world.
+			 */
+			label: `${platform === 'win32' ? 'Eject' : 'Auto-unmount'} on success`,
+		},
+		{
+			name: 'validateWriteOnSuccess',
+			label: 'Validate write on success',
+		},
+		{
+			name: 'updatesEnabled',
+			label: 'Auto-updates enabled',
+			hide: _.includes(['rpm', 'deb'], packageType),
 		},
 	];
-	if (['appimage', 'nsis', 'dmg'].includes(packageType)) {
-		list.push({
-			name: 'updatesEnabled',
-			label: i18next.t('settings.autoUpdate'),
-		});
-	}
-	return list;
 }
 
 interface SettingsModalProps {
 	toggleModal: (value: boolean) => void;
 }
 
-const EPInfo = etcherProInfo();
-
-const InfoBox = (props: any) => (
-	<Box fontSize={14}>
-		<Txt>{props.label}</Txt>
-		<Txt code copy={props.value}>
-			{props.value}{' '}
-		</Txt>
-	</Box>
-);
-
 export function SettingsModal({ toggleModal }: SettingsModalProps) {
 	const [settingsList, setCurrentSettingsList] = React.useState<Setting[]>([]);
 	React.useEffect(() => {
@@ -87,57 +90,57 @@ export function SettingsModal({ toggleModal }: SettingsModalProps) {
 		})();
 	});
 
-	const toggleSetting = async (setting: string) => {
+	const toggleSetting = async (
+		setting: string,
+		options?: Setting['options'],
+	) => {
 		const value = currentSettings[setting];
-		analytics.logEvent('Toggle setting', { setting, value });
+		const dangerous = options !== undefined;
+
+		analytics.logEvent('Toggle setting', {
+			setting,
+			value,
+			dangerous,
+		});
+
 		await settings.set(setting, !value);
 		setCurrentSettings({
 			...currentSettings,
 			[setting]: !value,
 		});
+		return;
 	};
 
 	return (
 		<Modal
 			titleElement={
 				<Txt fontSize={24} mb={24}>
-					{i18next.t('settings.settings')}
+					Settings
 				</Txt>
 			}
 			done={() => toggleModal(false)}
 		>
 			<Flex flexDirection="column">
-				{settingsList.map((setting: Setting, i: number) => {
-					return (
-						<Flex key={setting.name} mb={14}>
+				{_.map(settingsList, (setting: Setting, i: number) => {
+					return setting.hide ? null : (
+						<Flex key={setting.name}>
 							<Checkbox
 								toggle
 								tabIndex={6 + i}
 								label={setting.label}
 								checked={currentSettings[setting.name]}
-								onChange={() => toggleSetting(setting.name)}
+								onChange={() => toggleSetting(setting.name, setting.options)}
 							/>
 						</Flex>
 					);
 				})}
-				{EPInfo !== undefined && (
-					<Flex flexDirection="column">
-						<Txt fontSize={24}>{i18next.t('settings.systemInformation')}</Txt>
-						{EPInfo.get_serial() === undefined ? (
-							<InfoBox label="UUID" value={EPInfo.uuid} />
-						) : (
-							<InfoBox label="Serial" value={EPInfo.get_serial()} />
-						)}
-					</Flex>
-				)}
 				<Flex
-					mt={18}
+					mt={28}
 					alignItems="center"
 					color="#00aeef"
 					style={{
 						width: 'fit-content',
 						cursor: 'pointer',
-						fontSize: 14,
 					}}
 					onClick={() =>
 						openExternal(

lib/gui/app/components/source-selector/source-selector.tsx

@@ -14,41 +14,36 @@
  * limitations under the License.
  */
 
-import CopySvg from '@fortawesome/fontawesome-free/svgs/solid/copy.svg';
 import FileSvg from '@fortawesome/fontawesome-free/svgs/solid/file.svg';
 import LinkSvg from '@fortawesome/fontawesome-free/svgs/solid/link.svg';
-import ExclamationTriangleSvg from '@fortawesome/fontawesome-free/svgs/solid/triangle-exclamation.svg';
-import ChevronDownSvg from '@fortawesome/fontawesome-free/svgs/solid/chevron-down.svg';
-import ChevronRightSvg from '@fortawesome/fontawesome-free/svgs/solid/chevron-right.svg';
-import type { IpcRendererEvent } from 'electron';
-import { ipcRenderer } from 'electron';
-import { uniqBy, isNil } from 'lodash';
+import ExclamationTriangleSvg from '@fortawesome/fontawesome-free/svgs/solid/exclamation-triangle.svg';
+import { sourceDestination } from 'etcher-sdk';
+import { ipcRenderer, IpcRendererEvent } from 'electron';
+import * as _ from 'lodash';
+import { GPTPartition, MBRPartition } from 'partitioninfo';
 import * as path from 'path';
-import prettyBytes from 'pretty-bytes';
 import * as React from 'react';
-import { requestMetadata } from '../../app';
-
-import type { ButtonProps } from 'rendition';
 import {
 	Flex,
+	ButtonProps,
 	Modal as SmallModal,
 	Txt,
 	Card as BaseCard,
 	Input,
 	Spinner,
-	Link,
 } from 'rendition';
 import styled from 'styled-components';
 
 import * as errors from '../../../../shared/errors';
 import * as messages from '../../../../shared/messages';
 import * as supportedFormats from '../../../../shared/supported-formats';
+import * as shared from '../../../../shared/units';
 import * as selectionState from '../../models/selection-state';
 import { observe } from '../../models/store';
 import * as analytics from '../../modules/analytics';
 import * as exceptionReporter from '../../modules/exception-reporter';
 import * as osDialog from '../../os/dialog';
-
+import { replaceWindowsNetworkDriveLetter } from '../../os/windows-network-drives';
 import {
 	ChangeButton,
 	DetailsText,
@@ -62,16 +57,6 @@ import { middleEllipsis } from '../../utils/middle-ellipsis';
 import { SVGIcon } from '../svg-icon/svg-icon';
 
 import ImageSvg from '../../../assets/image.svg';
-import SrcSvg from '../../../assets/src.svg';
-import { DriveSelector } from '../drive-selector/drive-selector';
-import type { DrivelistDrive } from '../../../../shared/drive-constraints';
-import { isJson } from '../../../../shared/utils';
-import type {
-	SourceMetadata,
-	Authentication,
-	Source,
-} from '../../../../shared/typings/source-selector';
-import * as i18next from 'i18next';
 
 const recentUrlImagesKey = 'recentUrlImages';
 
@@ -83,12 +68,12 @@ function normalizeRecentUrlImages(urls: any[]): URL[] {
 		.map((url) => {
 			try {
 				return new URL(url);
-			} catch (error: any) {
+			} catch (error) {
 				// Invalid URL, skip
 			}
 		})
 		.filter((url) => url !== undefined);
-	urls = uniqBy(urls, (url) => url.href);
+	urls = _.uniqBy(urls, (url) => url.href);
 	return urls.slice(urls.length - 5);
 }
 
@@ -107,9 +92,6 @@ function setRecentUrlImages(urls: URL[]) {
 	localStorage.setItem(recentUrlImagesKey, JSON.stringify(normalized));
 }
 
-const isURL = (imagePath: string) =>
-	imagePath.startsWith('https://') || imagePath.startsWith('http://');
-
 const Card = styled(BaseCard)`
 	hr {
 		margin: 5px 0;
@@ -128,31 +110,23 @@ const ModalText = styled.p`
 `;
 
 function getState() {
-	const image = selectionState.getImage();
 	return {
 		hasImage: selectionState.hasImage(),
-		imageName: image?.name,
-		imageSize: image?.size,
+		imageName: selectionState.getImageName(),
+		imageSize: selectionState.getImageSize(),
 	};
 }
 
-function isString(value: any): value is string {
-	return typeof value === 'string';
-}
-
 const URLSelector = ({
 	done,
 	cancel,
 }: {
-	done: (imageURL: string, auth?: Authentication) => void;
+	done: (imageURL: string) => void;
 	cancel: () => void;
 }) => {
 	const [imageURL, setImageURL] = React.useState('');
 	const [recentImages, setRecentImages] = React.useState<URL[]>([]);
 	const [loading, setLoading] = React.useState(false);
-	const [showBasicAuth, setShowBasicAuth] = React.useState(false);
-	const [username, setUsername] = React.useState('');
-	const [password, setPassword] = React.useState('');
 	React.useEffect(() => {
 		const fetchRecentUrlImages = async () => {
 			const recentUrlImages: URL[] = await getRecentUrlImages();
@@ -166,7 +140,7 @@ const URLSelector = ({
 			primaryButtonProps={{
 				disabled: loading || !imageURL,
 			}}
-			action={loading ? <Spinner /> : i18next.t('ok')}
+			action={loading ? <Spinner /> : 'OK'}
 			done={async () => {
 				setLoading(true);
 				const urlStrings = recentImages.map((url: URL) => url.href);
@@ -175,93 +149,47 @@ const URLSelector = ({
 					imageURL,
 				]);
 				setRecentUrlImages(normalizedRecentUrls);
-				const auth = username ? { username, password } : undefined;
-				await done(imageURL, auth);
+				await done(imageURL);
 			}}
 		>
-			<Flex flexDirection="column">
-				<Flex mb={15} style={{ width: '100%' }} flexDirection="column">
-					<Txt mb="10px" fontSize="24px">
-						{i18next.t('source.useSourceURL')}
-					</Txt>
-					<Input
-						value={imageURL}
-						placeholder={i18next.t('source.enterValidURL')}
-						type="text"
-						onChange={(evt: React.ChangeEvent<HTMLInputElement>) =>
-							setImageURL(evt.target.value)
-						}
-					/>
-					<Link
-						mt={15}
-						mb={15}
-						fontSize="14px"
-						onClick={() => {
-							if (showBasicAuth) {
-								setUsername('');
-								setPassword('');
-							}
-							setShowBasicAuth(!showBasicAuth);
-						}}
-					>
-						<Flex alignItems="center">
-							{showBasicAuth && (
-								<ChevronDownSvg height="1em" fill="currentColor" />
-							)}
-							{!showBasicAuth && (
-								<ChevronRightSvg height="1em" fill="currentColor" />
-							)}
-							<Txt ml={8}>{i18next.t('source.auth')}</Txt>
-						</Flex>
-					</Link>
-					{showBasicAuth && (
-						<React.Fragment>
-							<Input
-								mb={15}
-								value={username}
-								placeholder={i18next.t('source.username')}
-								type="text"
-								onChange={(evt: React.ChangeEvent<HTMLInputElement>) =>
-									setUsername(evt.target.value)
-								}
-							/>
-							<Input
-								value={password}
-								placeholder={i18next.t('source.password')}
-								type="password"
-								onChange={(evt: React.ChangeEvent<HTMLInputElement>) =>
-									setPassword(evt.target.value)
-								}
-							/>
-						</React.Fragment>
-					)}
-				</Flex>
-				{recentImages.length > 0 && (
-					<Flex flexDirection="column" height="78.6%">
-						<Txt fontSize={18}>Recent</Txt>
-						<ScrollableFlex flexDirection="column">
-							<Card
-								p="10px 15px"
-								rows={recentImages
-									.map((recent) => (
-										<Txt
-											key={recent.href}
-											onClick={() => {
-												setImageURL(recent.href);
-											}}
-											style={{
-												overflowWrap: 'break-word',
-											}}
-										>
-											{recent.pathname.split('/').pop()} - {recent.href}
-										</Txt>
-									))
-									.reverse()}
-							/>
-						</ScrollableFlex>
-					</Flex>
-				)}
+			<Flex style={{ width: '100%' }} flexDirection="column">
+				<Txt mb="10px" fontSize="24px">
+					Use Image URL
+				</Txt>
+				<Input
+					value={imageURL}
+					placeholder="Enter a valid URL"
+					type="text"
+					onChange={(evt: React.ChangeEvent<HTMLInputElement>) =>
+						setImageURL(evt.target.value)
+					}
+				/>
 			</Flex>
+			{recentImages.length > 0 && (
+				<Flex flexDirection="column" height="78.6%">
+					<Txt fontSize={18}>Recent</Txt>
+					<ScrollableFlex flexDirection="column">
+						<Card
+							p="10px 15px"
+							rows={recentImages
+								.map((recent) => (
+									<Txt
+										key={recent.href}
+										onClick={() => {
+											setImageURL(recent.href);
+										}}
+										style={{
+											overflowWrap: 'break-word',
+										}}
+									>
+										{recent.pathname.split('/').pop()} - {recent.href}
+									</Txt>
+								))
+								.reverse()}
+						/>
+					</ScrollableFlex>
+				</Flex>
+			)}
 		</Modal>
 	);
 };
@@ -273,55 +201,49 @@ interface Flow {
 }
 
 const FlowSelector = styled(
-	({ flow, ...props }: { flow: Flow } & ButtonProps) => (
-		<StepButton
-			plain={!props.primary}
-			primary={props.primary}
-			onClick={(evt: React.MouseEvent<Element, MouseEvent>) =>
-				flow.onClick(evt)
-			}
-			icon={flow.icon}
-			{...props}
-		>
-			{flow.label}
-		</StepButton>
-	),
+	({ flow, ...props }: { flow: Flow; props?: ButtonProps }) => {
+		return (
+			<StepButton plain onClick={flow.onClick} icon={flow.icon} {...props}>
+				{flow.label}
+			</StepButton>
+		);
+	},
 )`
 	border-radius: 24px;
 	color: rgba(255, 255, 255, 0.7);
 
-	:enabled:focus,
-	:enabled:focus svg {
-		color: ${colors.primary.foreground} !important;
-	}
-
 	:enabled:hover {
 		background-color: ${colors.primary.background};
 		color: ${colors.primary.foreground};
 		font-weight: 600;
 
 		svg {
-			color: ${colors.primary.foreground} !important;
+			color: ${colors.primary.foreground}!important;
 		}
 	}
 `;
 
+export type Source =
+	| typeof sourceDestination.File
+	| typeof sourceDestination.Http;
+
+export interface SourceOptions {
+	imagePath: string;
+	SourceType: Source;
+}
+
 interface SourceSelectorProps {
 	flashing: boolean;
-	hideAnalyticsAlert: () => void;
+	afterSelected: (options: SourceOptions) => void;
 }
 
 interface SourceSelectorState {
 	hasImage: boolean;
-	imageName?: string;
-	imageSize?: number;
+	imageName: string;
+	imageSize: number;
 	warning: { message: string; title: string | null } | null;
 	showImageDetails: boolean;
 	showURLSelector: boolean;
-	showDriveSelector: boolean;
-	defaultFlowActive: boolean;
-	imageSelectorOpen: boolean;
-	imageLoading: boolean;
 }
 
 export class SourceSelector extends React.Component<
@@ -329,6 +251,7 @@ export class SourceSelector extends React.Component<
 	SourceSelectorState
 > {
 	private unsubscribe: (() => void) | undefined;
+	private afterSelected: SourceSelectorProps['afterSelected'];
 
 	constructor(props: SourceSelectorProps) {
 		super(props);
@@ -337,14 +260,15 @@ export class SourceSelector extends React.Component<
 			warning: null,
 			showImageDetails: false,
 			showURLSelector: false,
-			showDriveSelector: false,
-			defaultFlowActive: true,
-			imageSelectorOpen: false,
-			imageLoading: false,
 		};
 
-		// Bind `this` since it's used in an event's callback
+		this.openImageSelector = this.openImageSelector.bind(this);
+		this.openURLSelector = this.openURLSelector.bind(this);
+		this.reselectImage = this.reselectImage.bind(this);
 		this.onSelectImage = this.onSelectImage.bind(this);
+		this.onDrop = this.onDrop.bind(this);
+		this.showSelectedImageDetails = this.showSelectedImageDetails.bind(this);
+		this.afterSelected = props.afterSelected.bind(this);
 	}
 
 	public componentDidMount() {
@@ -360,171 +284,163 @@ export class SourceSelector extends React.Component<
 		ipcRenderer.removeListener('select-image', this.onSelectImage);
 	}
 
-	public componentDidUpdate(
-		_prevProps: Readonly<SourceSelectorProps>,
-		prevState: Readonly<SourceSelectorState>,
-	) {
-		if (
-			(!prevState.showDriveSelector && this.state.showDriveSelector) ||
-			(!prevState.showURLSelector && this.state.showURLSelector) ||
-			(!prevState.showImageDetails && this.state.showImageDetails) ||
-			(!prevState.imageSelectorOpen && this.state.imageSelectorOpen)
-		) {
-			this.props.hideAnalyticsAlert();
-		}
-	}
-
 	private async onSelectImage(_event: IpcRendererEvent, imagePath: string) {
-		this.setState({ imageLoading: true });
-		await this.selectSource(
+		const isURL =
+			imagePath.startsWith('https://') || imagePath.startsWith('http://');
+		await this.selectImageByPath({
 			imagePath,
-			isURL(this.normalizeImagePath(imagePath)) ? 'Http' : 'File',
-		).promise;
-		this.setState({ imageLoading: false });
+			SourceType: isURL ? sourceDestination.Http : sourceDestination.File,
+		}).promise;
 	}
 
-	public normalizeImagePath(imgPath: string) {
-		const decodedPath = decodeURIComponent(imgPath);
-		if (isJson(decodedPath)) {
-			return JSON.parse(decodedPath).url ?? decodedPath;
-		}
-		return decodedPath;
-	}
-
-	private reselectSource() {
+	private reselectImage() {
 		analytics.logEvent('Reselect image', {
 			previousImage: selectionState.getImage(),
 		});
 
 		selectionState.deselectImage();
-		this.props.hideAnalyticsAlert();
 	}
 
-	private selectSource(
-		selected: string | DrivelistDrive,
-		SourceType: Source,
-		auth?: Authentication,
-	): { promise: Promise<void>; cancel: () => void } {
+	private selectImage(
+		image: sourceDestination.Metadata & {
+			path: string;
+			extension: string;
+			hasMBR: boolean;
+		},
+	) {
+		try {
+			let message = null;
+			let title = null;
+
+			if (supportedFormats.looksLikeWindowsImage(image.path)) {
+				analytics.logEvent('Possibly Windows image', { image });
+				message = messages.warning.looksLikeWindowsImage();
+				title = 'Possible Windows image detected';
+			} else if (!image.hasMBR) {
+				analytics.logEvent('Missing partition table', { image });
+				title = 'Missing partition table';
+				message = messages.warning.missingPartitionTable();
+			}
+
+			if (message) {
+				this.setState({
+					warning: {
+						message,
+						title,
+					},
+				});
+			}
+
+			selectionState.selectImage(image);
+			analytics.logEvent('Select image', {
+				// An easy way so we can quickly identify if we're making use of
+				// certain features without printing pages of text to DevTools.
+				image: {
+					...image,
+					logo: Boolean(image.logo),
+					blockMap: Boolean(image.blockMap),
+				},
+			});
+		} catch (error) {
+			exceptionReporter.report(error);
+		}
+	}
+
+	private selectImageByPath({
+		imagePath,
+		SourceType,
+	}: SourceOptions): { promise: Promise<void>; cancel: () => void } {
+		let cancelled = false;
 		return {
 			cancel: () => {
-				// noop
+				cancelled = true;
 			},
 			promise: (async () => {
-				const sourcePath = isString(selected) ? selected : selected.device;
-				let metadata: SourceMetadata | undefined;
-				if (isString(selected)) {
-					if (
-						SourceType === 'Http' &&
-						!isURL(this.normalizeImagePath(selected))
-					) {
-						this.handleError(
-							i18next.t('source.unsupportedProtocol'),
-							selected,
-							messages.error.unsupportedProtocol(),
-						);
-						return;
-					}
-
-					if (supportedFormats.looksLikeWindowsImage(selected)) {
-						analytics.logEvent('Possibly Windows image', { image: selected });
-						this.setState({
-							warning: {
-								message: messages.warning.looksLikeWindowsImage(),
-								title: i18next.t('source.windowsImage'),
-							},
-						});
-					}
-
-					try {
-						// this will send an event down the ipcMain asking for metadata
-						// we'll get the response through an event
-
-						// FIXME: This is a poor man wait while loading to prevent a potential race condition without completely blocking the interface
-						// This should be addressed when refactoring the GUI
-						let retriesLeft = 10;
-						while (requestMetadata === undefined && retriesLeft > 0) {
-							await new Promise((resolve) => setTimeout(resolve, 1050)); // api is trying to connect every 1000, this is offset to make sure we fall between retries
-							retriesLeft--;
-						}
-
-						metadata = await requestMetadata({ selected, SourceType, auth });
-
-						if (!metadata?.hasMBR && this.state.warning === null) {
-							analytics.logEvent('Missing partition table', { metadata });
-							this.setState({
-								warning: {
-									message: messages.warning.missingPartitionTable(),
-									title: i18next.t('source.partitionTable'),
-								},
-							});
-						}
-					} catch (error: any) {
-						this.handleError(
-							i18next.t('source.errorOpen'),
-							sourcePath,
-							messages.error.openSource(sourcePath, error.message),
-							error,
-						);
-					}
-				} else {
-					if (selected.partitionTableType === null) {
-						analytics.logEvent('Missing partition table', { selected });
-						this.setState({
-							warning: {
-								message: messages.warning.driveMissingPartitionTable(),
-								title: i18next.t('source.partitionTable'),
-							},
-						});
-					}
-					metadata = {
-						path: selected.device,
-						displayName: selected.displayName,
-						description: selected.displayName,
-						size: selected.size as SourceMetadata['size'],
-						SourceType: 'BlockDevice',
-						drive: selected,
-					};
+				try {
+					imagePath = await replaceWindowsNetworkDriveLetter(imagePath);
+				} catch (error) {
+					analytics.logException(error);
+				}
+				if (cancelled) {
+					return;
 				}
 
-				if (metadata !== undefined) {
-					metadata.auth = auth;
-					metadata.SourceType = SourceType;
-					selectionState.selectSource(metadata);
-					analytics.logEvent('Select image', {
-						// An easy way so we can quickly identify if we're making use of
-						// certain features without printing pages of text to DevTools.
-						image: {
-							...metadata,
-							logo: Boolean(metadata.logo),
-							blockMap: Boolean(metadata.blockMap),
-						},
+				let source;
+				if (SourceType === sourceDestination.File) {
+					source = new sourceDestination.File({
+						path: imagePath,
 					});
+				} else {
+					if (
+						!imagePath.startsWith('https://') &&
+						!imagePath.startsWith('http://')
+					) {
+						const invalidImageError = errors.createUserError({
+							title: 'Unsupported protocol',
+							description: messages.error.unsupportedProtocol(),
+						});
+
+						osDialog.showError(invalidImageError);
+						analytics.logEvent('Unsupported protocol', { path: imagePath });
+						return;
+					}
+					source = new sourceDestination.Http({ url: imagePath });
+				}
+
+				try {
+					const innerSource = await source.getInnerSource();
+					if (cancelled) {
+						return;
+					}
+					const metadata = (await innerSource.getMetadata()) as sourceDestination.Metadata & {
+						hasMBR: boolean;
+						partitions: MBRPartition[] | GPTPartition[];
+						path: string;
+						extension: string;
+					};
+					if (cancelled) {
+						return;
+					}
+					const partitionTable = await innerSource.getPartitionTable();
+					if (cancelled) {
+						return;
+					}
+					if (partitionTable) {
+						metadata.hasMBR = true;
+						metadata.partitions = partitionTable.partitions;
+					} else {
+						metadata.hasMBR = false;
+					}
+					metadata.path = imagePath;
+					metadata.extension = path.extname(imagePath).slice(1);
+					this.selectImage(metadata);
+					this.afterSelected({
+						imagePath,
+						SourceType,
+					});
+				} catch (error) {
+					const imageError = errors.createUserError({
+						title: 'Error opening image',
+						description: messages.error.openImage(
+							path.basename(imagePath),
+							error.message,
+						),
+					});
+					osDialog.showError(imageError);
+					analytics.logException(error);
+				} finally {
+					try {
+						await source.close();
+					} catch (error) {
+						// Noop
+					}
 				}
 			})(),
 		};
 	}
 
-	private handleError(
-		title: string,
-		sourcePath: string,
-		description: string,
-		error?: Error,
-	) {
-		const imageError = errors.createUserError({
-			title,
-			description,
-		});
-		osDialog.showError(imageError);
-		if (error) {
-			analytics.logException(error);
-			return;
-		}
-		analytics.logEvent(title, { path: sourcePath });
-	}
-
 	private async openImageSelector() {
 		analytics.logEvent('Open image selector');
-		this.setState({ imageSelectorOpen: true });
 
 		try {
 			const imagePath = await osDialog.selectImage();
@@ -534,18 +450,22 @@ export class SourceSelector extends React.Component<
 				analytics.logEvent('Image selector closed');
 				return;
 			}
-			await this.selectSource(imagePath, 'File').promise;
-		} catch (error: any) {
+			await this.selectImageByPath({
+				imagePath,
+				SourceType: sourceDestination.File,
+			}).promise;
+		} catch (error) {
 			exceptionReporter.report(error);
-		} finally {
-			this.setState({ imageSelectorOpen: false });
 		}
 	}
 
 	private async onDrop(event: React.DragEvent<HTMLDivElement>) {
-		const file = event.dataTransfer.files.item(0);
-		if (file != null) {
-			await this.selectSource(file.path, 'File').promise;
+		const [file] = event.dataTransfer.files;
+		if (file) {
+			await this.selectImageByPath({
+				imagePath: file.path,
+				SourceType: sourceDestination.File,
+			}).promise;
 		}
 	}
 
@@ -557,14 +477,6 @@ export class SourceSelector extends React.Component<
 		});
 	}
 
-	private openDriveSelector() {
-		analytics.logEvent('Open drive selector');
-
-		this.setState({
-			showDriveSelector: true,
-		});
-	}
-
 	private onDragOver(event: React.DragEvent<HTMLDivElement>) {
 		// Needed to get onDrop events on div elements
 		event.preventDefault();
@@ -577,7 +489,7 @@ export class SourceSelector extends React.Component<
 
 	private showSelectedImageDetails() {
 		analytics.logEvent('Show selected image tooltip', {
-			imagePath: selectionState.getImage()?.path,
+			imagePath: selectionState.getImagePath(),
 		});
 
 		this.setState({
@@ -585,53 +497,30 @@ export class SourceSelector extends React.Component<
 		});
 	}
 
-	private setDefaultFlowActive(defaultFlowActive: boolean) {
-		this.setState({ defaultFlowActive });
-	}
-
-	private closeModal() {
-		this.setState({
-			showDriveSelector: false,
-		});
-	}
-
 	// TODO add a visual change when dragging a file over the selector
 	public render() {
 		const { flashing } = this.props;
-		const {
-			showImageDetails,
-			showURLSelector,
-			showDriveSelector,
-			imageLoading,
-		} = this.state;
-		const selectionImage = selectionState.getImage();
-		let image =
-			selectionImage !== undefined ? selectionImage : ({} as SourceMetadata);
+		const { showImageDetails, showURLSelector } = this.state;
 
-		image = image.drive ?? image;
+		const hasImage = selectionState.hasImage();
 
+		const imagePath = selectionState.getImagePath();
+		const imageBasename = hasImage ? path.basename(imagePath) : '';
+		const imageName = selectionState.getImageName();
+		const imageSize = selectionState.getImageSize();
+		const imageLogo = selectionState.getImageLogo();
 		let cancelURLSelection = () => {
 			// noop
 		};
-		image.name = image.description || image.name;
-		const imagePath = image.path || image.displayName || '';
-		const imageBasename = path.basename(imagePath);
-		const imageName = image.name || '';
-		const imageSize = image.size;
-		const imageLogo = image.logo || '';
 
 		return (
 			<>
 				<Flex
 					flexDirection="column"
 					alignItems="center"
-					onDrop={(evt: React.DragEvent<HTMLDivElement>) => this.onDrop(evt)}
-					onDragEnter={(evt: React.DragEvent<HTMLDivElement>) =>
-						this.onDragEnter(evt)
-					}
-					onDragOver={(evt: React.DragEvent<HTMLDivElement>) =>
-						this.onDragOver(evt)
-					}
+					onDrop={this.onDrop}
+					onDragEnter={this.onDragEnter}
+					onDragOver={this.onDragOver}
 				>
 					<SVGIcon
 						contents={imageLogo}
@@ -641,63 +530,39 @@ export class SourceSelector extends React.Component<
 						}}
 					/>
 
-					{selectionImage !== undefined || imageLoading ? (
+					{hasImage ? (
 						<>
 							<StepNameButton
 								plain
-								onClick={() => this.showSelectedImageDetails()}
+								onClick={this.showSelectedImageDetails}
 								tooltip={imageName || imageBasename}
 							>
-								<Spinner show={imageLoading}>
-									{middleEllipsis(imageName || imageBasename, 20)}
-								</Spinner>
+								{middleEllipsis(imageName || imageBasename, 20)}
 							</StepNameButton>
-							{!flashing && !imageLoading && (
-								<ChangeButton
-									plain
-									mb={14}
-									onClick={() => this.reselectSource()}
-								>
-									{i18next.t('cancel')}
+							{!flashing && (
+								<ChangeButton plain mb={14} onClick={this.reselectImage}>
+									Remove
 								</ChangeButton>
 							)}
-							{!isNil(imageSize) && !imageLoading && (
-								<DetailsText>{prettyBytes(imageSize)}</DetailsText>
-							)}
+							<DetailsText>{shared.bytesToClosestUnit(imageSize)}</DetailsText>
 						</>
 					) : (
 						<>
 							<FlowSelector
-								disabled={this.state.imageSelectorOpen}
-								primary={this.state.defaultFlowActive}
 								key="Flash from file"
 								flow={{
-									onClick: () => this.openImageSelector(),
-									label: i18next.t('source.fromFile'),
+									onClick: this.openImageSelector,
+									label: 'Flash from file',
 									icon: <FileSvg height="1em" fill="currentColor" />,
 								}}
-								onMouseEnter={() => this.setDefaultFlowActive(false)}
-								onMouseLeave={() => this.setDefaultFlowActive(true)}
 							/>
 							<FlowSelector
 								key="Flash from URL"
 								flow={{
-									onClick: () => this.openURLSelector(),
-									label: i18next.t('source.fromURL'),
+									onClick: this.openURLSelector,
+									label: 'Flash from URL',
 									icon: <LinkSvg height="1em" fill="currentColor" />,
 								}}
-								onMouseEnter={() => this.setDefaultFlowActive(false)}
-								onMouseLeave={() => this.setDefaultFlowActive(true)}
-							/>
-							<FlowSelector
-								key="Clone drive"
-								flow={{
-									onClick: () => this.openDriveSelector(),
-									label: i18next.t('source.clone'),
-									icon: <CopySvg height="1em" fill="currentColor" />,
-								}}
-								onMouseEnter={() => this.setDefaultFlowActive(false)}
-								onMouseLeave={() => this.setDefaultFlowActive(true)}
 							/>
 						</>
 					)}
@@ -705,19 +570,16 @@ export class SourceSelector extends React.Component<
 
 				{this.state.warning != null && (
 					<SmallModal
-						style={{
-							boxShadow: '0 3px 7px rgba(0, 0, 0, 0.3)',
-						}}
-						title={
+						titleElement={
 							<span>
 								<ExclamationTriangleSvg fill="#fca321" height="1em" />{' '}
 								<span>{this.state.warning.title}</span>
 							</span>
 						}
-						action={i18next.t('continue')}
+						action="Continue"
 						cancel={() => {
 							this.setState({ warning: null });
-							this.reselectSource();
+							this.reselectImage();
 						}}
 						done={() => {
 							this.setState({ warning: null });
@@ -732,17 +594,17 @@ export class SourceSelector extends React.Component<
 
 				{showImageDetails && (
 					<SmallModal
-						title={i18next.t('source.image')}
+						title="Image"
 						done={() => {
 							this.setState({ showImageDetails: false });
 						}}
 					>
 						<Txt.p>
-							<Txt.span bold>{i18next.t('source.name')}</Txt.span>
+							<Txt.span bold>Name: </Txt.span>
 							<Txt.span>{imageName || imageBasename}</Txt.span>
 						</Txt.p>
 						<Txt.p>
-							<Txt.span bold>{i18next.t('source.path')}</Txt.span>
+							<Txt.span bold>Path: </Txt.span>
 							<Txt.span>{imagePath}</Txt.span>
 						</Txt.p>
 					</SmallModal>
@@ -756,18 +618,20 @@ export class SourceSelector extends React.Component<
 								showURLSelector: false,
 							});
 						}}
-						done={async (imageURL: string, auth?: Authentication) => {
+						done={async (imageURL: string) => {
 							// Avoid analytics and selection state changes
 							// if no file was resolved from the dialog.
 							if (!imageURL) {
 								analytics.logEvent('URL selector closed');
 							} else {
 								let promise;
-								({ promise, cancel: cancelURLSelection } = this.selectSource(
-									imageURL,
-									'Http',
-									auth,
-								));
+								({
+									promise,
+									cancel: cancelURLSelection,
+								} = this.selectImageByPath({
+									imagePath: imageURL,
+									SourceType: sourceDestination.Http,
+								}));
 								await promise;
 							}
 							this.setState({
@@ -776,38 +640,6 @@ export class SourceSelector extends React.Component<
 						}}
 					/>
 				)}
-
-				{showDriveSelector && (
-					<DriveSelector
-						write={false}
-						multipleSelection={false}
-						titleLabel={i18next.t('source.selectSource')}
-						emptyListLabel={i18next.t('source.plugSource')}
-						emptyListIcon={<SrcSvg width="40px" />}
-						cancel={(originalList) => {
-							if (originalList.length) {
-								const originalSource = originalList[0];
-								if (selectionImage?.drive?.device !== originalSource.device) {
-									this.selectSource(originalSource, 'BlockDevice');
-								}
-							} else {
-								selectionState.deselectImage();
-							}
-							this.closeModal();
-						}}
-						done={() => this.closeModal()}
-						onSelect={(drive) => {
-							if (drive) {
-								if (
-									selectionState.getImage()?.drive?.device === drive?.device
-								) {
-									return selectionState.deselectImage();
-								}
-								this.selectSource(drive, 'BlockDevice');
-							}
-						}}
-					/>
-				)}
 			</>
 		);
 	}

lib/gui/app/components/svg-icon/svg-icon.tsx

@@ -37,9 +37,8 @@ function tryParseSVGContents(contents?: string): string | undefined {
 }
 
 interface SVGIconProps {
-	// Optional string representing the SVG contents to be tried
-	contents?: string;
-	// Fallback SVG element to show if `contents` is invalid/undefined
+	// List of embedded SVG contents to be tried in succession if any fails
+	contents: string;
 	fallback: React.FunctionComponent<React.SVGProps<HTMLOrSVGElement>>;
 	// SVG image width unit
 	width?: string;

lib/gui/app/components/target-selector/target-selector-button.tsx

@@ -14,16 +14,17 @@
  * limitations under the License.
  */
 
-import ExclamationTriangleSvg from '@fortawesome/fontawesome-free/svgs/solid/triangle-exclamation.svg';
+import ExclamationTriangleSvg from '@fortawesome/fontawesome-free/svgs/solid/exclamation-triangle.svg';
+import { Drive as DrivelistDrive } from 'drivelist';
 import * as React from 'react';
-import type { FlexProps } from 'rendition';
-import { Flex, Txt } from 'rendition';
+import { Flex, FlexProps, Txt } from 'rendition';
 
-import type { DriveStatus } from '../../../../shared/drive-constraints';
-import { getDriveImageCompatibilityStatuses } from '../../../../shared/drive-constraints';
-import { compatibility, warning } from '../../../../shared/messages';
-import prettyBytes from 'pretty-bytes';
-import { getImage, getSelectedDrives } from '../../models/selection-state';
+import {
+	getDriveImageCompatibilityStatuses,
+	Image,
+} from '../../../../shared/drive-constraints';
+import { bytesToClosestUnit } from '../../../../shared/units';
+import { getSelectedDrives } from '../../models/selection-state';
 import {
 	ChangeButton,
 	DetailsText,
@@ -31,7 +32,6 @@ import {
 	StepNameButton,
 } from '../../styled-components';
 import { middleEllipsis } from '../../utils/middle-ellipsis';
-import * as i18next from 'i18next';
 
 interface TargetSelectorProps {
 	targets: any[];
@@ -41,66 +41,55 @@ interface TargetSelectorProps {
 	flashing: boolean;
 	show: boolean;
 	tooltip: string;
+	image: Image;
 }
 
-function getDriveWarning(status: DriveStatus) {
-	switch (status.message) {
-		case compatibility.containsImage():
-			return warning.sourceDrive();
-		case compatibility.largeDrive():
-			return warning.largeDriveSize();
-		case compatibility.system():
-			return warning.systemDrive();
-		default:
-			return '';
-	}
-}
-
-const DriveCompatibilityWarning = ({
-	warnings,
+function DriveCompatibilityWarning({
+	drive,
+	image,
 	...props
 }: {
-	warnings: string[];
-} & FlexProps) => {
-	const systemDrive = warnings.find(
-		(message) => message === warning.systemDrive(),
+	drive: DrivelistDrive;
+	image: Image;
+} & FlexProps) {
+	const compatibilityWarnings = getDriveImageCompatibilityStatuses(
+		drive,
+		image,
 	);
+	if (compatibilityWarnings.length === 0) {
+		return null;
+	}
+	const messages = compatibilityWarnings.map((warning) => warning.message);
 	return (
-		<Flex tooltip={warnings.join(', ')} {...props}>
-			<ExclamationTriangleSvg
-				fill={systemDrive ? '#fca321' : '#8f9297'}
-				height="1em"
-			/>
+		<Flex tooltip={messages.join(', ')} {...props}>
+			<ExclamationTriangleSvg fill="currentColor" height="1em" />
 		</Flex>
 	);
-};
+}
 
-export function TargetSelectorButton(props: TargetSelectorProps) {
+export function TargetSelector(props: TargetSelectorProps) {
 	const targets = getSelectedDrives();
 
 	if (targets.length === 1) {
 		const target = targets[0];
-		const warnings = getDriveImageCompatibilityStatuses(
-			target,
-			getImage(),
-			true,
-		).map(getDriveWarning);
 		return (
 			<>
 				<StepNameButton plain tooltip={props.tooltip}>
-					{warnings.length > 0 && (
-						<DriveCompatibilityWarning warnings={warnings} mr={2} />
-					)}
 					{middleEllipsis(target.description, 20)}
 				</StepNameButton>
 				{!props.flashing && (
 					<ChangeButton plain mb={14} onClick={props.reselectDrive}>
-						{i18next.t('target.change')}
+						Change
 					</ChangeButton>
 				)}
-				{target.size != null && (
-					<DetailsText>{prettyBytes(target.size)}</DetailsText>
-				)}
+				<DetailsText>
+					<DriveCompatibilityWarning
+						drive={target}
+						image={props.image}
+						mr={2}
+					/>
+					{bytesToClosestUnit(target.size)}
+				</DetailsText>
 			</>
 		);
 	}
@@ -108,35 +97,32 @@ export function TargetSelectorButton(props: TargetSelectorProps) {
 	if (targets.length > 1) {
 		const targetsTemplate = [];
 		for (const target of targets) {
-			const warnings = getDriveImageCompatibilityStatuses(
-				target,
-				getImage(),
-				true,
-			).map(getDriveWarning);
 			targetsTemplate.push(
 				<DetailsText
 					key={target.device}
-					tooltip={`${target.description} ${target.displayName} ${
-						target.size != null ? prettyBytes(target.size) : ''
-					}`}
+					tooltip={`${target.description} ${
+						target.displayName
+					} ${bytesToClosestUnit(target.size)}`}
 					px={21}
 				>
-					{warnings.length > 0 ? (
-						<DriveCompatibilityWarning warnings={warnings} mr={2} />
-					) : null}
+					<DriveCompatibilityWarning
+						drive={target}
+						image={props.image}
+						mr={2}
+					/>
 					<Txt mr={2}>{middleEllipsis(target.description, 14)}</Txt>
-					{target.size != null && <Txt>{prettyBytes(target.size)}</Txt>}
+					<Txt>{bytesToClosestUnit(target.size)}</Txt>
 				</DetailsText>,
 			);
 		}
 		return (
 			<>
 				<StepNameButton plain tooltip={props.tooltip}>
-					{targets.length} {i18next.t('target.targets')}
+					{targets.length} Targets
 				</StepNameButton>
 				{!props.flashing && (
 					<ChangeButton plain onClick={props.reselectDrive} mb={14}>
-						{i18next.t('target.change')}
+						Change
 					</ChangeButton>
 				)}
 				{targetsTemplate}
@@ -151,7 +137,7 @@ export function TargetSelectorButton(props: TargetSelectorProps) {
 			disabled={props.disabled}
 			onClick={props.openDriveSelector}
 		>
-			{i18next.t('target.selectTarget')}
+			Select target
 		</StepButton>
 	);
 }

lib/gui/app/components/target-selector/target-selector-modal.tsx

@@ -0,0 +1,462 @@
+/*
+ * Copyright 2019 balena.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import ExclamationTriangleSvg from '@fortawesome/fontawesome-free/svgs/solid/exclamation-triangle.svg';
+import ChevronDownSvg from '@fortawesome/fontawesome-free/svgs/solid/chevron-down.svg';
+import { scanner, sourceDestination } from 'etcher-sdk';
+import * as React from 'react';
+import {
+	Flex,
+	ModalProps,
+	Txt,
+	Badge,
+	Link,
+	Table,
+	TableColumn,
+} from 'rendition';
+import styled from 'styled-components';
+
+import {
+	getDriveImageCompatibilityStatuses,
+	hasListDriveImageCompatibilityStatus,
+	isDriveValid,
+	TargetStatus,
+	Image,
+} from '../../../../shared/drive-constraints';
+import { compatibility } from '../../../../shared/messages';
+import { bytesToClosestUnit } from '../../../../shared/units';
+import { getDrives, hasAvailableDrives } from '../../models/available-drives';
+import {
+	getImage,
+	getSelectedDrives,
+	isDriveSelected,
+} from '../../models/selection-state';
+import { store } from '../../models/store';
+import { logEvent, logException } from '../../modules/analytics';
+import { open as openExternal } from '../../os/open-external/services/open-external';
+import { Modal, ScrollableFlex } from '../../styled-components';
+
+import TargetSVGIcon from '../../../assets/tgt.svg';
+
+interface UsbbootDrive extends sourceDestination.UsbbootDrive {
+	progress: number;
+}
+
+interface DriverlessDrive {
+	displayName: string; // added in app.ts
+	description: string;
+	link: string;
+	linkTitle: string;
+	linkMessage: string;
+	linkCTA: string;
+}
+
+type Target = scanner.adapters.DrivelistDrive | DriverlessDrive | UsbbootDrive;
+
+function isUsbbootDrive(drive: Target): drive is UsbbootDrive {
+	return (drive as UsbbootDrive).progress !== undefined;
+}
+
+function isDriverlessDrive(drive: Target): drive is DriverlessDrive {
+	return (drive as DriverlessDrive).link !== undefined;
+}
+
+function isDrivelistDrive(
+	drive: Target,
+): drive is scanner.adapters.DrivelistDrive {
+	return typeof (drive as scanner.adapters.DrivelistDrive).size === 'number';
+}
+
+const TargetsTable = styled(({ refFn, ...props }) => {
+	return (
+		<div>
+			<Table<Target> ref={refFn} {...props} />
+		</div>
+	);
+})`
+	[data-display='table-head'] [data-display='table-cell'] {
+		position: sticky;
+		top: 0;
+		background-color: ${(props) => props.theme.colors.quartenary.light};
+	}
+
+	[data-display='table-cell']:first-child {
+		padding-left: 15px;
+	}
+
+	[data-display='table-cell']:last-child {
+		width: 150px;
+	}
+
+	&& [data-display='table-row'] > [data-display='table-cell'] {
+		padding: 6px 8px;
+		color: #2a506f;
+	}
+`;
+
+function badgeShadeFromStatus(status: string) {
+	switch (status) {
+		case compatibility.containsImage():
+			return 16;
+		case compatibility.system():
+			return 5;
+		default:
+			return 14;
+	}
+}
+
+const InitProgress = styled(
+	({
+		value,
+		...props
+	}: {
+		value: number;
+		props?: React.ProgressHTMLAttributes<Element>;
+	}) => {
+		return <progress max="100" value={value} {...props} />;
+	},
+)`
+	/* Reset the default appearance */
+	appearance: none;
+
+	::-webkit-progress-bar {
+		width: 130px;
+		height: 4px;
+		background-color: #dde1f0;
+		border-radius: 14px;
+	}
+
+	::-webkit-progress-value {
+		background-color: #1496e1;
+		border-radius: 14px;
+	}
+`;
+
+interface TargetSelectorModalProps extends Omit<ModalProps, 'done'> {
+	done: (targets: scanner.adapters.DrivelistDrive[]) => void;
+}
+
+interface TargetSelectorModalState {
+	drives: Target[];
+	image: Image;
+	missingDriversModal: { drive?: DriverlessDrive };
+	selectedList: scanner.adapters.DrivelistDrive[];
+	showSystemDrives: boolean;
+}
+
+export class TargetSelectorModal extends React.Component<
+	TargetSelectorModalProps,
+	TargetSelectorModalState
+> {
+	private unsubscribe: (() => void) | undefined;
+	tableColumns: Array<TableColumn<Target>>;
+
+	constructor(props: TargetSelectorModalProps) {
+		super(props);
+
+		const defaultMissingDriversModalState: { drive?: DriverlessDrive } = {};
+		const selectedList = getSelectedDrives();
+
+		this.state = {
+			drives: getDrives(),
+			image: getImage(),
+			missingDriversModal: defaultMissingDriversModalState,
+			selectedList,
+			showSystemDrives: false,
+		};
+
+		this.tableColumns = [
+			{
+				field: 'description',
+				label: 'Name',
+				render: (description: string, drive: Target) => {
+					return isDrivelistDrive(drive) && drive.isSystem ? (
+						<Flex alignItems="center">
+							<ExclamationTriangleSvg height="1em" fill="#fca321" />
+							<Txt ml={8}>{description}</Txt>
+						</Flex>
+					) : (
+						<Txt>{description}</Txt>
+					);
+				},
+			},
+			{
+				field: 'description',
+				key: 'size',
+				label: 'Size',
+				render: (_description: string, drive: Target) => {
+					if (isDrivelistDrive(drive) && drive.size !== null) {
+						return bytesToClosestUnit(drive.size);
+					}
+				},
+			},
+			{
+				field: 'description',
+				key: 'link',
+				label: 'Location',
+				render: (_description: string, drive: Target) => {
+					return (
+						<Txt>
+							{drive.displayName}
+							{isDriverlessDrive(drive) && (
+								<>
+									{' '}
+									-{' '}
+									<b>
+										<a onClick={() => this.installMissingDrivers(drive)}>
+											{drive.linkCTA}
+										</a>
+									</b>
+								</>
+							)}
+						</Txt>
+					);
+				},
+			},
+			{
+				field: 'description',
+				key: 'extra',
+				// Space as empty string would use the field name as label
+				label: ' ',
+				render: (_description: string, drive: Target) => {
+					if (isUsbbootDrive(drive)) {
+						return this.renderProgress(drive.progress);
+					} else if (isDrivelistDrive(drive)) {
+						return this.renderStatuses(
+							getDriveImageCompatibilityStatuses(drive, this.state.image),
+						);
+					}
+				},
+			},
+		];
+	}
+
+	private driveShouldBeDisabled(drive: Target, image: any) {
+		return (
+			isUsbbootDrive(drive) ||
+			isDriverlessDrive(drive) ||
+			!isDriveValid(drive, image)
+		);
+	}
+
+	private getDisplayedTargets(targets: Target[]): Target[] {
+		return targets.filter((drive) => {
+			return (
+				isUsbbootDrive(drive) ||
+				isDriverlessDrive(drive) ||
+				isDriveSelected(drive.device) ||
+				this.state.showSystemDrives ||
+				!drive.isSystem
+			);
+		});
+	}
+
+	private getDisabledTargets(drives: Target[], image: any): string[] {
+		return drives
+			.filter((drive) => this.driveShouldBeDisabled(drive, image))
+			.map((drive) => drive.displayName);
+	}
+
+	private renderProgress(progress: number) {
+		return (
+			<Flex flexDirection="column">
+				<Txt fontSize={12}>Initializing device</Txt>
+				<InitProgress value={progress} />
+			</Flex>
+		);
+	}
+
+	private renderStatuses(statuses: TargetStatus[]) {
+		return (
+			// the column render fn expects a single Element
+			<>
+				{statuses.map((status) => {
+					const badgeShade = badgeShadeFromStatus(status.message);
+					return (
+						<Badge key={status.message} shade={badgeShade}>
+							{status.message}
+						</Badge>
+					);
+				})}
+			</>
+		);
+	}
+
+	private installMissingDrivers(drive: DriverlessDrive) {
+		if (drive.link) {
+			logEvent('Open driver link modal', {
+				url: drive.link,
+			});
+			this.setState({ missingDriversModal: { drive } });
+		}
+	}
+
+	componentDidMount() {
+		this.unsubscribe = store.subscribe(() => {
+			const drives = getDrives();
+			const image = getImage();
+			this.setState({
+				drives,
+				image,
+				selectedList: getSelectedDrives(),
+			});
+		});
+	}
+
+	componentWillUnmount() {
+		this.unsubscribe?.();
+	}
+
+	render() {
+		const { cancel, done, ...props } = this.props;
+		const { selectedList, drives, image, missingDriversModal } = this.state;
+
+		const displayedTargets = this.getDisplayedTargets(drives);
+		const disabledTargets = this.getDisabledTargets(drives, image);
+		const numberOfSystemDrives = drives.filter(
+			(drive) => isDrivelistDrive(drive) && drive.isSystem,
+		).length;
+		const numberOfDisplayedSystemDrives = displayedTargets.filter(
+			(drive) => isDrivelistDrive(drive) && drive.isSystem,
+		).length;
+		const numberOfHiddenSystemDrives =
+			numberOfSystemDrives - numberOfDisplayedSystemDrives;
+		const hasStatus = hasListDriveImageCompatibilityStatus(selectedList, image);
+
+		return (
+			<Modal
+				titleElement={
+					<Flex alignItems="baseline" mb={18}>
+						<Txt fontSize={24} align="left">
+							Select target
+						</Txt>
+						<Txt
+							fontSize={11}
+							ml={12}
+							color="#5b82a7"
+							style={{ fontWeight: 600 }}
+						>
+							{drives.length} found
+						</Txt>
+					</Flex>
+				}
+				titleDetails={<Txt fontSize={11}>{getDrives().length} found</Txt>}
+				cancel={cancel}
+				done={() => done(selectedList)}
+				action={`Select (${selectedList.length})`}
+				primaryButtonProps={{
+					primary: !hasStatus,
+					warning: hasStatus,
+					disabled: !hasAvailableDrives(),
+				}}
+				{...props}
+			>
+				<Flex width="100%" height="90%">
+					{!hasAvailableDrives() ? (
+						<Flex
+							flexDirection="column"
+							justifyContent="center"
+							alignItems="center"
+							width="100%"
+						>
+							<TargetSVGIcon width="40px" height="90px" />
+							<b>Plug a target drive</b>
+						</Flex>
+					) : (
+						<ScrollableFlex flexDirection="column" width="100%">
+							<TargetsTable
+								refFn={(t: Table<Target>) => {
+									if (t !== null) {
+										t.setRowSelection(selectedList);
+									}
+								}}
+								columns={this.tableColumns}
+								data={displayedTargets}
+								disabledRows={disabledTargets}
+								rowKey="displayName"
+								onCheck={(rows: Target[]) => {
+									this.setState({
+										selectedList: rows.filter(isDrivelistDrive),
+									});
+								}}
+								onRowClick={(row: Target) => {
+									if (
+										!isDrivelistDrive(row) ||
+										this.driveShouldBeDisabled(row, image)
+									) {
+										return;
+									}
+									const newList = [...selectedList];
+									const selectedIndex = selectedList.findIndex(
+										(target) => target.device === row.device,
+									);
+									if (selectedIndex === -1) {
+										newList.push(row);
+									} else {
+										// Deselect if selected
+										newList.splice(selectedIndex, 1);
+									}
+									this.setState({
+										selectedList: newList,
+									});
+								}}
+							/>
+							{numberOfHiddenSystemDrives > 0 && (
+								<Link
+									mt={15}
+									mb={15}
+									onClick={() => this.setState({ showSystemDrives: true })}
+								>
+									<Flex alignItems="center">
+										<ChevronDownSvg height="1em" fill="currentColor" />
+										<Txt ml={8}>Show {numberOfHiddenSystemDrives} hidden</Txt>
+									</Flex>
+								</Link>
+							)}
+						</ScrollableFlex>
+					)}
+				</Flex>
+
+				{missingDriversModal.drive !== undefined && (
+					<Modal
+						width={400}
+						title={missingDriversModal.drive.linkTitle}
+						cancel={() => this.setState({ missingDriversModal: {} })}
+						done={() => {
+							try {
+								if (missingDriversModal.drive !== undefined) {
+									openExternal(missingDriversModal.drive.link);
+								}
+							} catch (error) {
+								logException(error);
+							} finally {
+								this.setState({ missingDriversModal: {} });
+							}
+						}}
+						action="Yes, continue"
+						cancelButtonProps={{
+							children: 'Cancel',
+						}}
+						children={
+							missingDriversModal.drive.linkMessage ||
+							`Etcher will open ${missingDriversModal.drive.link} in your browser`
+						}
+					/>
+				)}
+			</Modal>
+		);
+	}
+}

lib/gui/app/css/main.css

@@ -15,52 +15,48 @@
  */
 
 @font-face {
-	font-family: 'SourceSansPro';
-	src: url('./fonts/SourceSansPro-Regular.ttf') format('truetype');
-	font-weight: 500;
-	font-style: normal;
+  font-family: "SourceSansPro";
+  src: url("./fonts/SourceSansPro-Regular.ttf") format("truetype");
+  font-weight: 500;
+  font-style: normal;
+  font-display: block;
 }
 
 @font-face {
-	font-family: 'SourceSansPro';
-	src: url('./fonts/SourceSansPro-SemiBold.ttf') format('truetype');
-	font-weight: 600;
-	font-style: normal;
+  font-family: "SourceSansPro";
+  src: url("./fonts/SourceSansPro-SemiBold.ttf") format("truetype");
+  font-weight: 600;
+  font-style: normal;
+  font-display: block;
 }
 
 html,
 body {
-	margin: 0;
-	overflow: hidden;
+  margin: 0;
+  overflow: hidden;
 
-	/* Prevent white flash when running application */
-	background-color: #4d5057;
+  /* Prevent white flash when running application */
+  background-color: #4d5057;
 
-	/* Prevent WebView bounce effect in OS X */
-	height: 100%;
-	width: 100%;
+  /* Prevent WebView bounce effect in OS X */
+  height: 100%;
+  width: 100%;
 }
 
 /* Prevent text selection */
 body {
-	-webkit-user-select: none;
-	-webkit-overflow-scrolling: touch;
+  -webkit-user-select: none;
+  -webkit-overflow-scrolling: touch;
 }
 
 /* Prevent blue outline */
 a:focus,
 input:focus,
 button:focus,
-[tabindex]:focus,
-input[type='checkbox'] + div {
-	outline: none !important;
-	box-shadow: none !important;
+[tabindex]:focus {
+  outline: none !important;
 }
 
 .disabled {
-	opacity: 0.4;
-}
-
-#rendition-tooltip-root > div {
-	font-family: 'SourceSansPro', sans-serif;
+  opacity: 0.4;
 }

lib/gui/app/i18n.ts

@@ -1,44 +0,0 @@
-import * as i18next from 'i18next';
-import { initReactI18next } from 'react-i18next';
-import zh_CN_translation from './i18n/zh-CN';
-import zh_TW_translation from './i18n/zh-TW';
-import en_translation from './i18n/en';
-
-export function langParser() {
-	if (process.env.LANG !== undefined) {
-		// Bypass mocha, where lang-detect don't works
-		return 'en';
-	}
-
-	const lang = Intl.DateTimeFormat().resolvedOptions().locale;
-
-	switch (lang.substr(0, 2)) {
-		case 'zh':
-			if (lang === 'zh-CN' || lang === 'zh-SG') {
-				return 'zh-CN';
-			} // Simplified Chinese
-			else {
-				return 'zh-TW';
-			} // Traditional Chinese
-		default:
-			return lang.substr(0, 2);
-	}
-}
-
-i18next.use(initReactI18next).init({
-	lng: langParser(),
-	fallbackLng: 'en',
-	nonExplicitSupportedLngs: true,
-	interpolation: {
-		escapeValue: false,
-	},
-	resources: {
-		'zh-CN': zh_CN_translation,
-		'zh-TW': zh_TW_translation,
-		en: en_translation,
-	},
-});
-
-export const supportedLocales = ['en', 'zh'];
-
-export default i18next;

lib/gui/app/i18n/README.md

@@ -1,23 +0,0 @@
-# i18n
-
-## How it was done
-
-Using the open-source lib [i18next](https://www.i18next.com/).
-
-## How to add your own language
-
-1. Go to `lib/gui/app/i18n` and add a file named `xx.ts` (use the codes mentioned
-   in [the link](https://www.science.co.il/language/Locale-codes.php), and we support styles as `fr`, `de`, `es-ES`
-   and `pt-BR`)
-   .
-2. Copy the content from an existing translation and start to translate.
-3. Once done, go to `lib/gui/app/i18n.ts` and add a line of `import xx_translation from './i18n/xx'` after the
-   already-added imports and add `xx: xx_translation` in the `resources` section of `i18next.init()` function.
-4. Now go to `lib/shared/catalina-sudo/` and copy the `sudo-askpass.osascript-en.js`, change it to
-   be `sudo-askpass.osascript-xx.js` and edit
-   the `'balenaEtcher needs privileged access in order to flash disks.\n\nType your password to allow this.'` line and
-   those `Ok`s and `Cancel`s to your own language.
-5. If, your language has several variations when they are used in several countries/regions, such as `zh-CN` and `zh-TW`
-   , or `pt-BR` and `pt-PT`, edit
-   the `langParser()` in the `lib/gui/app/i18n.ts` file to meet your need.
-6. Make a commit, and then a pull request on GitHub.

lib/gui/app/i18n/en.ts

@@ -1,162 +0,0 @@
-const translation = {
-	translation: {
-		continue: 'Continue',
-		ok: 'OK',
-		cancel: 'Cancel',
-		skip: 'Skip',
-		sure: "Yes, I'm sure",
-		warning: 'WARNING! ',
-		attention: 'Attention',
-		failed: 'Failed',
-		completed: 'Completed',
-		yesContinue: 'Yes, continue',
-		reallyExit: 'Are you sure you want to close Etcher?',
-		yesExit: 'Yes, quit',
-		progress: {
-			starting: 'Starting...',
-			decompressing: 'Decompressing...',
-			flashing: 'Flashing...',
-			finishing: 'Finishing...',
-			verifying: 'Validating...',
-			failing: 'Failed',
-		},
-		message: {
-			sizeNotRecommended: 'Not recommended',
-			tooSmall: 'Too small',
-			locked: 'Locked',
-			system: 'System drive',
-			containsImage: 'Source drive',
-			largeDrive: 'Large drive',
-			sourceLarger: 'The selected source is {{byte}} larger than this drive.',
-			flashSucceed_one: 'Successful target',
-			flashSucceed_other: 'Successful targets',
-			flashFail_one: 'Failed target',
-			flashFail_other: 'Failed targets',
-			toDrive: 'to {{description}} ({{name}})',
-			toTarget_one: 'to {{num}} target',
-			toTarget_other: 'to {{num}} targets',
-			andFailTarget_one: 'and failed to be flashed to {{num}} target',
-			andFailTarget_other: 'and failed to be flashed to {{num}} targets',
-			succeedTo: '{{name}} was successfully flashed {{target}}',
-			exitWhileFlashing:
-				'You are currently flashing a drive. Closing Etcher may leave your drive in an unusable state.',
-			looksLikeWindowsImage:
-				'It looks like you are trying to burn a Windows image.\n\nUnlike other images, Windows images require special processing to be made bootable. We suggest you use a tool specially designed for this purpose, such as <a href="https://rufus.akeo.ie">Rufus</a> (Windows), <a href="https://github.com/slacka/WoeUSB">WoeUSB</a> (Linux), or Boot Camp Assistant (macOS).',
-			image: 'image',
-			drive: 'drive',
-			missingPartitionTable:
-				'It looks like this is not a bootable {{type}}.\n\nThe {{type}} does not appear to contain a partition table, and might not be recognized or bootable by your device.',
-			largeDriveSize:
-				"This is a large drive! Make sure it doesn't contain files that you want to keep.",
-			systemDrive:
-				'Selecting your system drive is dangerous and will erase your drive!',
-			sourceDrive: 'Contains the image you chose to flash',
-			noSpace:
-				'Not enough space on the drive. Please insert larger one and try again.',
-			genericFlashError:
-				'Something went wrong. If it is a compressed image, please check that the archive is not corrupted.\n{{error}}',
-			validation:
-				'The write has been completed successfully but Etcher detected potential corruption issues when reading the image back from the drive. \n\nPlease consider writing the image to a different drive.',
-			openError:
-				'Something went wrong while opening {{source}}.\n\nError: {{error}}',
-			flashError: 'Something went wrong while writing {{image}} {{targets}}.',
-			unplug:
-				"Looks like Etcher lost access to the drive. Did it get unplugged accidentally?\n\nSometimes this error is caused by faulty readers that don't provide stable access to the drive.",
-			cannotWrite:
-				'Looks like Etcher is not able to write to this location of the drive. This error is usually caused by a faulty drive, reader, or port. \n\nPlease try again with another drive, reader, or port.',
-			childWriterDied:
-				'The writer process ended unexpectedly. Please try again, and contact the Etcher team if the problem persists.',
-			badProtocol: 'Only http:// and https:// URLs are supported.',
-		},
-		target: {
-			selectTarget: 'Select target',
-			plugTarget: 'Plug a target drive',
-			targets: 'Targets',
-			change: 'Change',
-		},
-		source: {
-			useSourceURL: 'Use Image URL',
-			auth: 'Authentication',
-			username: 'Enter username',
-			password: 'Enter password',
-			unsupportedProtocol: 'Unsupported protocol',
-			windowsImage: 'Possible Windows image detected',
-			partitionTable: 'Missing partition table',
-			errorOpen: 'Error opening source',
-			fromFile: 'Flash from file',
-			fromURL: 'Flash from URL',
-			clone: 'Clone drive',
-			image: 'Image',
-			name: 'Name: ',
-			path: 'Path: ',
-			selectSource: 'Select source',
-			plugSource: 'Plug a source drive',
-			osImages: 'OS Images',
-			allFiles: 'All',
-			enterValidURL: 'Enter a valid URL',
-		},
-		drives: {
-			name: 'Name',
-			size: 'Size',
-			location: 'Location',
-			find: '{{length}} found',
-			select: 'Select {{select}}',
-			showHidden: 'Show {{num}} hidden',
-			systemDriveDanger:
-				'Selecting your system drive is dangerous and will erase your drive!',
-			openInBrowser: '`Etcher will open {{link}} in your browser`',
-			changeTarget: 'Change target',
-			largeDriveWarning: 'You are about to erase an unusually large drive',
-			largeDriveWarningMsg:
-				'Are you sure the selected drive is not a storage drive?',
-			systemDriveWarning: "You are about to erase your computer's drives",
-			systemDriveWarningMsg:
-				'Are you sure you want to flash your system drive?',
-		},
-		flash: {
-			another: 'Flash another',
-			target: 'Target',
-			location: 'Location',
-			error: 'Error',
-			flash: 'Flash',
-			flashNow: 'Flash!',
-			skip: 'Validation has been skipped',
-			moreInfo: 'more info',
-			speedTip:
-				'The speed is calculated by dividing the image size by the flashing time.\nDisk images with ext partitions flash faster as we are able to skip unused parts.',
-			speed: 'Effective speed: {{speed}} MB/s',
-			speedShort: '{{speed}} MB/s',
-			eta: 'ETA: {{eta}}',
-			failedTarget: 'Failed targets',
-			failedRetry: 'Retry failed targets',
-			flashFailed: 'Flash Failed.',
-			flashCompleted: 'Flash Completed!',
-		},
-		settings: {
-			errorReporting:
-				'Anonymously report errors and usage statistics to balena.io',
-			autoUpdate: 'Auto-updates enabled',
-			settings: 'Settings',
-			systemInformation: 'System Information',
-			trimExtPartitions:
-				'Trim unallocated space on raw images (in ext-type partitions)',
-		},
-		menu: {
-			edit: 'Edit',
-			view: 'View',
-			devTool: 'Toggle Developer Tools',
-			window: 'Window',
-			help: 'Help',
-			pro: 'Etcher Pro',
-			website: 'Etcher Website',
-			issue: 'Report an issue',
-			about: 'About Etcher',
-			hide: 'Hide Etcher',
-			hideOthers: 'Hide Others',
-			unhide: 'Unhide All',
-			quit: 'Quit Etcher',
-		},
-	},
-};
-
-export default translation;

lib/gui/app/i18n/zh-CN.ts

@@ -1,152 +0,0 @@
-const translation = {
-	translation: {
-		ok: '好',
-		cancel: '取消',
-		continue: '继续',
-		skip: '跳过',
-		sure: '我确定',
-		warning: '请注意！',
-		attention: '请注意',
-		failed: '失败',
-		completed: '完毕',
-		yesExit: '是的，可以退出',
-		reallyExit: '真的要现在退出 Etcher 吗？',
-		yesContinue: '是的，继续',
-		progress: {
-			starting: '正在启动……',
-			decompressing: '正在解压……',
-			flashing: '正在烧录……',
-			finishing: '正在结束……',
-			verifying: '正在验证……',
-			failing: '失败……',
-		},
-		message: {
-			sizeNotRecommended: '大小不推荐',
-			tooSmall: '空间太小',
-			locked: '被锁定',
-			system: '系统盘',
-			containsImage: '存放源镜像',
-			largeDrive: '很大的磁盘',
-			sourceLarger: '所选的镜像比目标盘大了 {{byte}} 比特。',
-			flashSucceed_one: '烧录成功',
-			flashSucceed_other: '烧录成功',
-			flashFail_one: '烧录失败',
-			flashFail_other: '烧录失败',
-			toDrive: '到 {{description}} ({{name}})',
-			toTarget_one: '到 {{num}} 个目标',
-			toTarget_other: '到 {{num}} 个目标',
-			andFailTarget_one: '并烧录失败了 {{num}} 个目标',
-			andFailTarget_other: '并烧录失败了 {{num}} 个目标',
-			succeedTo: '{{name}} 被成功烧录 {{target}}',
-			exitWhileFlashing:
-				'您当前正在刷机。 关闭 Etcher 可能会导致您的磁盘无法使用。',
-			looksLikeWindowsImage:
-				'看起来您正在尝试刻录 Windows 镜像。\n\n与其他镜像不同，Windows 镜像需要特殊处理才能使其可启动。 我们建议您使用专门为此目的设计的工具，例如 <a href="https://rufus.akeo.ie">Rufus</a> (Windows)、<a href="https://github. com/slacka/WoeUSB">WoeUSB</a> (Linux) 或 Boot Camp 助理 (macOS)。',
-			image: '镜像',
-			drive: '磁盘',
-			missingPartitionTable:
-				'看起来这不是一个可启动的{{type}}。\n\n这个{{type}}似乎不包含分区表，因此您的设备可能无法识别或无法正确启动。',
-			largeDriveSize: '这是个很大的磁盘！请检查并确认它不包含对您很重要的信息',
-			systemDrive: '选择系统盘很危险，因为这将会删除你的系统',
-			sourceDrive: '源镜像位于这个分区中',
-			noSpace: '磁盘空间不足。 请插入另一个较大的磁盘并重试。',
-			genericFlashError:
-				'出了点问题。如果源镜像曾被压缩过，请检查它是否已损坏。\n{{error}}',
-			validation:
-				'写入已成功完成，但 Etcher 在从磁盘读取镜像时检测到潜在的损坏问题。 \n\n请考虑将镜像写入其他磁盘。',
-			openError: '打开 {{source}} 时出错。\n\n错误信息： {{error}}',
-			flashError: '烧录 {{image}} {{targets}} 失败。',
-			unplug:
-				'看起来 Etcher 失去了对磁盘的连接。 它是不是被意外拔掉了？\n\n有时这个错误是因为读卡器出了故障。',
-			cannotWrite:
-				'看起来 Etcher 无法写入磁盘的这个位置。 此错误通常是由故障的磁盘、读取器或端口引起的。 \n\n请使用其他磁盘、读卡器或端口重试。',
-			childWriterDied:
-				'写入进程意外崩溃。请再试一次，如果问题仍然存在，请联系 Etcher 团队。',
-			badProtocol: '仅支持 http:// 和 https:// 开头的网址。',
-		},
-		target: {
-			selectTarget: '选择目标磁盘',
-			plugTarget: '请插入目标磁盘',
-			targets: '个目标',
-			change: '更改',
-		},
-		menu: {
-			edit: '编辑',
-			view: '视图',
-			devTool: '打开开发者工具',
-			window: '窗口',
-			help: '帮助',
-			pro: 'Etcher 专业版',
-			website: 'Etcher 的官网',
-			issue: '提交一个 issue',
-			about: '关于 Etcher',
-			hide: '隐藏 Etcher',
-			hideOthers: '隐藏其它窗口',
-			unhide: '取消隐藏',
-			quit: '退出 Etcher',
-		},
-		source: {
-			useSourceURL: '使用镜像网络地址',
-			auth: '验证',
-			username: '输入用户名',
-			password: '输入密码',
-			unsupportedProtocol: '不支持的协议',
-			windowsImage: '这可能是 Windows 系统镜像',
-			partitionTable: '找不到分区表',
-			errorOpen: '打开源镜像时出错',
-			fromFile: '从文件烧录',
-			fromURL: '从在线地址烧录',
-			clone: '克隆磁盘',
-			image: '镜像信息',
-			name: '名称：',
-			path: '路径：',
-			selectSource: '选择源',
-			plugSource: '请插入源磁盘',
-			osImages: '系统镜像格式',
-			allFiles: '任何文件格式',
-			enterValidURL: '请输入一个正确的地址',
-		},
-		drives: {
-			name: '名称',
-			size: '大小',
-			location: '位置',
-			find: '找到 {{length}} 个',
-			select: '选定 {{select}}',
-			showHidden: '显示 {{num}} 个隐藏的磁盘',
-			systemDriveDanger: '选择系统盘很危险，因为这将会删除你的系统！',
-			openInBrowser: 'Etcher 会在浏览器中打开 {{link}}',
-			changeTarget: '改变目标',
-			largeDriveWarning: '您即将擦除一个非常大的磁盘',
-			largeDriveWarningMsg: '您确定所选磁盘不是存储磁盘吗？',
-			systemDriveWarning: '您将要擦除系统盘',
-			systemDriveWarningMsg: '您确定要烧录到系统盘吗？',
-		},
-		flash: {
-			another: '烧录另一目标',
-			target: '目标',
-			location: '位置',
-			error: '错误',
-			flash: '烧录',
-			flashNow: '现在烧录！',
-			skip: '跳过了验证',
-			moreInfo: '更多信息',
-			speedTip:
-				'通过将镜像大小除以烧录时间来计算速度。\n由于我们能够跳过未使用的部分，因此具有EXT分区的磁盘镜像烧录速度更快。',
-			speed: '速度：{{speed}} MB/秒',
-			speedShort: '{{speed}} MB/秒',
-			eta: '预计还需要：{{eta}}',
-			failedTarget: '失败的烧录目标',
-			failedRetry: '重试烧录失败目标',
-			flashFailed: '烧录失败。',
-			flashCompleted: '烧录成功！',
-		},
-		settings: {
-			errorReporting: '匿名地向 balena.io 报告运行错误和使用统计',
-			autoUpdate: '自动更新',
-			settings: '软件设置',
-			systemInformation: '系统信息',
-		},
-	},
-};
-
-export default translation;

lib/gui/app/i18n/zh-TW.ts

@@ -1,154 +0,0 @@
-const translation = {
-	translation: {
-		continue: '繼續',
-		ok: '好',
-		cancel: '取消',
-		skip: '跳過',
-		sure: '我確定',
-		warning: '請注意！',
-		attention: '請注意',
-		failed: '失敗',
-		completed: '完成',
-		yesContinue: '是的，繼續',
-		reallyExit: '真的要現在結束 Etcher 嗎？',
-		yesExit: '是的，可以結束',
-		progress: {
-			starting: '正在啟動……',
-			decompressing: '正在解壓縮……',
-			flashing: '正在燒錄……',
-			finishing: '正在結束……',
-			verifying: '正在驗證……',
-			failing: '失敗……',
-		},
-		message: {
-			sizeNotRecommended: '大小不建議',
-			tooSmall: '空間太小',
-			locked: '被鎖定',
-			system: '系統',
-			containsImage: '存放來源映像檔',
-			largeDrive: '很大的磁碟',
-			sourceLarger: '所選的映像檔比目標磁碟大了 {{byte}} 位元組。',
-			flashSucceed_one: '燒錄成功',
-			flashSucceed_other: '燒錄成功',
-			flashFail_one: '燒錄失敗',
-			flashFail_other: '燒錄失敗',
-			toDrive: '到 {{description}} ({{name}})',
-			toTarget_one: '到 {{num}} 個目標',
-			toTarget_other: '到 {{num}} 個目標',
-			andFailTarget_one: '並燒錄失敗了 {{num}} 個目標',
-			andFailTarget_other: '並燒錄失敗了 {{num}} 個目標',
-			succeedTo: '{{name}} 被成功燒錄 {{target}}',
-			exitWhileFlashing:
-				'您目前正在刷寫。關閉 Etcher 可能會導致您的磁碟無法使用。',
-			looksLikeWindowsImage:
-				'看起來您正在嘗試燒錄 Windows 映像檔。\n\n與其他映像檔不同，Windows 映像檔需要特殊處理才能使其可啟動。我們建議您使用專門為此目的設計的工具，例如 <a href="https://rufus.akeo.ie">Rufus</a> (Windows)、<a href="https://github. com/slacka/WoeUSB">WoeUSB</a> (Linux) 或 Boot Camp 助理 (macOS)。',
-			image: '映像檔',
-			drive: '磁碟',
-			missingPartitionTable:
-				'看起來這不是一個可啟動的{{type}}。\n\n這個{{type}}似乎不包含分割表，因此您的設備可能無法識別或無法正確啟動。',
-			largeDriveSize:
-				'這是個很大容量的磁碟！請檢查並確認它不包含對您來說存放很重要的資料',
-			systemDrive: '選擇系統分割區很危險，因為這將會刪除你的系統',
-			sourceDrive: '來源映像檔位於這個分割區中',
-			noSpace: '磁碟空間不足。請插入另一個較大的磁碟並重試。',
-			genericFlashError:
-				'出了點問題。如果來源映像檔曾被壓縮過，請檢查它是否已損壞。\n{{error}}',
-			validation:
-				'寫入已成功完成，但 Etcher 在從磁碟讀取映像檔時檢測到潛在的損壞問題。\n\n請考慮將映像檔寫入其他磁碟。',
-			openError: '打開 {{source}} 時發生錯誤。\n\n錯誤訊息： {{error}}',
-			flashError: '燒錄 {{image}} {{targets}} 失敗。',
-			unplug:
-				'看起來 Etcher 失去了對磁碟的連接。是不是被意外拔掉了？\n\n有時這個錯誤是因為讀卡器出了故障。',
-			cannotWrite:
-				'看起來 Etcher 無法寫入磁碟的這個位置。此錯誤通常是由故障的磁碟、讀取器或連接埠引起的。\n\n請使用其他磁碟、讀卡器或連接埠重試。',
-			childWriterDied:
-				'寫入處理程序意外崩潰。請再試一次，如果問題仍然存在，請聯絡 Etcher 團隊。',
-			badProtocol: '僅支援 http:// 和 https:// 開頭的網址。',
-		},
-		target: {
-			selectTarget: '選擇目標磁碟',
-			plugTarget: '請插入目標磁碟',
-			targets: '個目標',
-			change: '更改',
-		},
-		source: {
-			useSourceURL: '使用映像檔網址',
-			auth: '驗證',
-			username: '輸入使用者名稱',
-			password: '輸入密碼',
-			unsupportedProtocol: '不支持的通訊協定',
-			windowsImage: '這可能是 Windows 系統映像檔',
-			partitionTable: '找不到分割表',
-			errorOpen: '打開來源映像檔時出錯',
-			fromFile: '從檔案燒錄',
-			fromURL: '從網址燒錄',
-			clone: '再製磁碟',
-			image: '映像檔訊息',
-			name: '名稱：',
-			path: '路徑：',
-			selectSource: '選擇來源',
-			plugSource: '請插入來源磁碟',
-			osImages: '系統映像檔格式',
-			allFiles: '任何檔案格式',
-			enterValidURL: '請輸入正確的網址',
-		},
-		drives: {
-			name: '名稱',
-			size: '大小',
-			location: '位置',
-			find: '找到 {{length}} 個',
-			select: '選取 {{select}}',
-			showHidden: '顯示 {{num}} 個隱藏的磁碟',
-			systemDriveDanger: '選擇系統分割區很危險，因為這將會刪除你的系統！',
-			openInBrowser: 'Etcher 會在瀏覽器中打開 {{link}}',
-			changeTarget: '更改目標',
-			largeDriveWarning: '您即將格式化一個非常大的磁碟',
-			largeDriveWarningMsg: '您確定所選磁碟不是儲存資料的磁碟嗎？',
-			systemDriveWarning: '您將要格式化系統分割區',
-			systemDriveWarningMsg: '您確定要燒錄到系統分割區嗎？',
-		},
-		flash: {
-			another: '燒錄另一目標',
-			target: '目標',
-			location: '位置',
-			error: '錯誤',
-			flash: '燒錄',
-			flashNow: '現在燒錄！',
-			skip: '跳過了驗證',
-			moreInfo: '更多資訊',
-			speedTip:
-				'透過將映像檔大小除以燒錄時間來計算速度。\n由於我們能夠跳過未使用的部分，因此具有 ext 分割區的磁碟映像檔燒錄速度更快。',
-			speed: '速度：{{speed}} MB/秒',
-			speedShort: '{{speed}} MB/秒',
-			eta: '預計還需要：{{eta}}',
-			failedTarget: '目標燒錄失敗',
-			failedRetry: '重試燒錄失敗的目標',
-			flashFailed: '燒錄失敗。',
-			flashCompleted: '燒錄成功！',
-		},
-		settings: {
-			errorReporting: '匿名向 balena.io 回報程式錯誤和使用統計資料',
-			autoUpdate: '自動更新',
-			settings: '軟體設定',
-			systemInformation: '系統資訊',
-			trimExtPartitions: '修改原始映像檔上未分配的空間（在 ext 類型分割區中）',
-		},
-		menu: {
-			edit: '編輯',
-			view: '預覽',
-			devTool: '打開開發者工具',
-			window: '視窗',
-			help: '協助',
-			pro: 'Etcher 專業版',
-			website: 'Etcher 的官網',
-			issue: '提交 issue',
-			about: '關於 Etcher',
-			hide: '隱藏 Etcher',
-			hideOthers: '隱藏其它視窗',
-			unhide: '取消隱藏',
-			quit: '結束 Etcher',
-		},
-	},
-};
-
-export default translation;

lib/gui/app/index.html

@@ -2,9 +2,11 @@
 <html>
   <head>
     <meta charset="UTF-8">
-    <title>balenaEtcher</title>
+    <title>Etcher</title>
+    <link rel="stylesheet" type="text/css" href="index.css">
   </head>
   <body>
     <main id="main"></main>
+    <script src="gui.js"></script>
   </body>
 </html>

lib/gui/app/models/available-drives.ts

@@ -14,20 +14,21 @@
  * limitations under the License.
  */
 
-import type { DrivelistDrive } from '../../../shared/drive-constraints';
+import * as _ from 'lodash';
+
 import { Actions, store } from './store';
 
 export function hasAvailableDrives() {
-	return getDrives().length > 0;
+	return !_.isEmpty(getDrives());
 }
 
 export function setDrives(drives: any[]) {
 	store.dispatch({
-		type: Actions.SET_AVAILABLE_TARGETS,
+		type: Actions.SET_AVAILABLE_DRIVES,
 		data: drives,
 	});
 }
 
-export function getDrives(): DrivelistDrive[] {
+export function getDrives(): any[] {
 	return store.getState().toJS().availableDrives;
 }

lib/gui/app/models/flash-state.ts

@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-import * as electron from 'electron';
-import type * as sdk from 'etcher-sdk';
+import * as sdk from 'etcher-sdk';
 import * as _ from 'lodash';
-import type { DrivelistDrive } from '../../../shared/drive-constraints';
+
 import { bytesToMegabytes } from '../../../shared/units';
 import { Actions, store } from './store';
 
@@ -46,8 +45,6 @@ export function isFlashing(): boolean {
  * start a flash process.
  */
 export function setFlashingFlag() {
-	// see https://github.com/balenablocks/balena-electron-env/blob/4fce9c461f294d4a768db8f247eea6f75d7b08b0/README.md#remote-methods
-	electron.ipcRenderer.send('disable-screensaver');
 	store.dispatch({
 		type: Actions.SET_FLASHING_FLAG,
 		data: {},
@@ -69,9 +66,6 @@ export function unsetFlashingFlag(results: {
 		type: Actions.UNSET_FLASHING_FLAG,
 		data: results,
 	});
-	// see https://github.com/balenablocks/balena-electron-env/blob/4fce9c461f294d4a768db8f247eea6f75d7b08b0/README.md#remote-methods
-
-	electron.ipcRenderer.send('enable-screensaver');
 }
 
 export function setDevicePaths(devicePaths: string[]) {
@@ -81,29 +75,14 @@ export function setDevicePaths(devicePaths: string[]) {
 	});
 }
 
-export function addFailedDeviceError({
-	device,
-	error,
-}: {
-	device: DrivelistDrive;
-	error: Error;
-}) {
-	const failedDeviceErrorsMap = new Map(
-		store.getState().toJS().failedDeviceErrors,
+export function addFailedDevicePath(devicePath: string) {
+	const failedDevicePathsSet = new Set(
+		store.getState().toJS().failedDevicePaths,
 	);
-	if (failedDeviceErrorsMap.has(device.device)) {
-		// Only store the first error
-		return;
-	}
-	failedDeviceErrorsMap.set(device.device, {
-		description: device.description,
-		device: device.device,
-		devicePath: device.devicePath,
-		...error,
-	});
+	failedDevicePathsSet.add(devicePath);
 	store.dispatch({
-		type: Actions.SET_FAILED_DEVICE_ERRORS,
-		data: Array.from(failedDeviceErrorsMap),
+		type: Actions.SET_FAILED_DEVICE_PATHS,
+		data: Array.from(failedDevicePathsSet),
 	});
 }
 

lib/gui/app/models/leds.ts

@@ -14,19 +14,39 @@
  * limitations under the License.
  */
 
+import { Drive as DrivelistDrive } from 'drivelist';
 import * as _ from 'lodash';
-import type { AnimationFunction, Color } from 'sys-class-rgb-led';
-import { Animator, RGBLed } from 'sys-class-rgb-led';
+import { AnimationFunction, Color, RGBLed } from 'sys-class-rgb-led';
 
-import type { DrivelistDrive } from '../../../shared/drive-constraints';
 import { isSourceDrive } from '../../../shared/drive-constraints';
-import { getDrives } from './available-drives';
-import { getSelectedDrives } from './selection-state';
 import * as settings from './settings';
-import { observe, store } from './store';
+import { DEFAULT_STATE, observe } from './store';
 
 const leds: Map<string, RGBLed> = new Map();
-const animator = new Animator([], 10);
+
+function setLeds(
+	drivesPaths: Set<string>,
+	colorOrAnimation: Color | AnimationFunction,
+	frequency?: number,
+) {
+	for (const path of drivesPaths) {
+		const led = leds.get(path);
+		if (led) {
+			if (Array.isArray(colorOrAnimation)) {
+				led.setStaticColor(colorOrAnimation);
+			} else {
+				led.setAnimation(colorOrAnimation, frequency);
+			}
+		}
+	}
+}
+
+const red: Color = [1, 0, 0];
+const green: Color = [0, 1, 0];
+const blue: Color = [0, 0, 1];
+const white: Color = [1, 1, 1];
+const black: Color = [0, 0, 0];
+const purple: Color = [0.5, 0, 0.5];
 
 function createAnimationFunction(
 	intensityFunction: (t: number) => number,
@@ -34,39 +54,21 @@ function createAnimationFunction(
 ): AnimationFunction {
 	return (t: number): Color => {
 		const intensity = intensityFunction(t);
-		return color.map((v: number) => v * intensity) as Color;
+		return color.map((v) => v * intensity) as Color;
 	};
 }
 
 function blink(t: number) {
-	return Math.floor(t) % 2;
+	return Math.floor(t / 1000) % 2;
 }
 
-function one() {
-	return 1;
+function breathe(t: number) {
+	return (1 + Math.sin(t / 1000)) / 2;
 }
 
-type LEDColors = {
-	green: Color;
-	purple: Color;
-	red: Color;
-	blue: Color;
-	white: Color;
-	black: Color;
-};
-
-type LEDAnimationFunctions = {
-	blinkGreen: AnimationFunction;
-	blinkPurple: AnimationFunction;
-	staticRed: AnimationFunction;
-	staticGreen: AnimationFunction;
-	staticBlue: AnimationFunction;
-	staticWhite: AnimationFunction;
-	staticBlack: AnimationFunction;
-};
-
-let ledColors: LEDColors;
-let ledAnimationFunctions: LEDAnimationFunctions;
+const breatheBlue = createAnimationFunction(breathe, blue);
+const blinkGreen = createAnimationFunction(blink, green);
+const blinkPurple = createAnimationFunction(blink, purple);
 
 interface LedsState {
 	step: 'main' | 'flashing' | 'verifying' | 'finish';
@@ -76,17 +78,6 @@ interface LedsState {
 	failedDrives: string[];
 }
 
-function setLeds(animation: AnimationFunction, drivesPaths: Set<string>) {
-	const rgbLeds: RGBLed[] = [];
-	for (const path of drivesPaths) {
-		const led = leds.get(path);
-		if (led) {
-			rgbLeds.push(led);
-		}
-	}
-	return { animation, rgbLeds };
-}
-
 // Source slot (1st slot): behaves as a target unless it is chosen as source
 //  No drive: black
 //  Drive plugged: blue - on
@@ -117,7 +108,6 @@ export function updateLeds({
 	// Remove selected devices from plugged set
 	for (const d of selectedOk) {
 		plugged.delete(d);
-		unplugged.delete(d);
 	}
 
 	// Remove plugged devices from unplugged set
@@ -130,98 +120,79 @@ export function updateLeds({
 		selectedOk.delete(d);
 	}
 
-	const mapping: Array<{
-		animation: AnimationFunction;
-		rgbLeds: RGBLed[];
-	}> = [];
 	// Handle source slot
 	if (sourceDrive !== undefined) {
-		if (plugged.has(sourceDrive)) {
+		if (unplugged.has(sourceDrive)) {
+			unplugged.delete(sourceDrive);
+			// TODO
+			setLeds(new Set([sourceDrive]), breatheBlue, 2);
+		} else if (plugged.has(sourceDrive)) {
 			plugged.delete(sourceDrive);
-			mapping.push(
-				setLeds(ledAnimationFunctions.staticBlue, new Set([sourceDrive])),
-			);
+			setLeds(new Set([sourceDrive]), blue);
 		}
 	}
 	if (step === 'main') {
-		mapping.push(
-			setLeds(
-				ledAnimationFunctions.staticBlack,
-				new Set([...unplugged, ...plugged]),
-			),
-			setLeds(
-				ledAnimationFunctions.staticWhite,
-				new Set([...selectedOk, ...selectedFailed]),
-			),
-		);
+		setLeds(unplugged, black);
+		setLeds(plugged, black);
+		setLeds(selectedOk, white);
+		setLeds(selectedFailed, white);
 	} else if (step === 'flashing') {
-		mapping.push(
-			setLeds(
-				ledAnimationFunctions.staticBlack,
-				new Set([...unplugged, ...plugged]),
-			),
-			setLeds(ledAnimationFunctions.blinkPurple, selectedOk),
-			setLeds(ledAnimationFunctions.staticRed, selectedFailed),
-		);
+		setLeds(unplugged, black);
+		setLeds(plugged, black);
+		setLeds(selectedOk, blinkPurple, 2);
+		setLeds(selectedFailed, red);
 	} else if (step === 'verifying') {
-		mapping.push(
-			setLeds(
-				ledAnimationFunctions.staticBlack,
-				new Set([...unplugged, ...plugged]),
-			),
-			setLeds(ledAnimationFunctions.blinkGreen, selectedOk),
-			setLeds(ledAnimationFunctions.staticRed, selectedFailed),
-		);
+		setLeds(unplugged, black);
+		setLeds(plugged, black);
+		setLeds(selectedOk, blinkGreen, 2);
+		setLeds(selectedFailed, red);
 	} else if (step === 'finish') {
-		mapping.push(
-			setLeds(
-				ledAnimationFunctions.staticBlack,
-				new Set([...unplugged, ...plugged]),
-			),
-			setLeds(ledAnimationFunctions.staticGreen, selectedOk),
-			setLeds(ledAnimationFunctions.staticRed, selectedFailed),
-		);
+		setLeds(unplugged, black);
+		setLeds(plugged, black);
+		setLeds(selectedOk, green);
+		setLeds(selectedFailed, red);
 	}
-	animator.mapping = mapping;
+}
+
+interface DeviceFromState {
+	devicePath?: string;
+	device: string;
 }
 
 let ledsState: LedsState | undefined;
 
-function stateObserver() {
-	const s = store.getState().toJS();
+function stateObserver(state: typeof DEFAULT_STATE) {
+	const s = state.toJS();
 	let step: 'main' | 'flashing' | 'verifying' | 'finish';
 	if (s.isFlashing) {
 		step = s.flashState.type;
 	} else {
 		step = s.lastAverageFlashingSpeed == null ? 'main' : 'finish';
 	}
-	const availableDrives = getDrives().filter(
-		(d: DrivelistDrive) => d.devicePath,
+	const availableDrives = s.availableDrives.filter(
+		(d: DeviceFromState) => d.devicePath,
 	);
 	const sourceDrivePath = availableDrives.filter((d: DrivelistDrive) =>
 		isSourceDrive(d, s.selection.image),
 	)[0]?.devicePath;
 	const availableDrivesPaths = availableDrives.map(
-		(d: DrivelistDrive) => d.devicePath,
+		(d: DeviceFromState) => d.devicePath,
 	);
 	let selectedDrivesPaths: string[];
 	if (step === 'main') {
-		selectedDrivesPaths = getSelectedDrives()
-			.filter((drive) => drive.devicePath !== null)
-			.map((drive) => drive.devicePath) as string[];
+		selectedDrivesPaths = availableDrives
+			.filter((d: DrivelistDrive) => s.selection.devices.includes(d.device))
+			.map((d: DrivelistDrive) => d.devicePath);
 	} else {
 		selectedDrivesPaths = s.devicePaths;
 	}
-	const failedDevicePaths = s.failedDeviceErrors.map(
-		([, { devicePath }]: [string, { devicePath: string }]) => devicePath,
-	);
 	const newLedsState = {
 		step,
 		sourceDrive: sourceDrivePath,
 		availableDrives: availableDrivesPaths,
 		selectedDrives: selectedDrivesPaths,
-		failedDrives: failedDevicePaths,
-	} as LedsState;
+		failedDrives: s.failedDevicePaths,
+	};
 	if (!_.isEqual(newLedsState, ledsState)) {
 		updateLeds(newLedsState);
 		ledsState = newLedsState;
@@ -244,16 +215,6 @@ export async function init(): Promise<void> {
 		for (const [drivePath, ledsNames] of Object.entries(ledsMapping)) {
 			leds.set('/dev/disk/by-path/' + drivePath, new RGBLed(ledsNames));
 		}
-		ledColors = (await settings.get('ledColors')) || {};
-		ledAnimationFunctions = {
-			blinkGreen: createAnimationFunction(blink, ledColors['green']),
-			blinkPurple: createAnimationFunction(blink, ledColors['purple']),
-			staticRed: createAnimationFunction(one, ledColors['red']),
-			staticGreen: createAnimationFunction(one, ledColors['green']),
-			staticBlue: createAnimationFunction(one, ledColors['blue']),
-			staticWhite: createAnimationFunction(one, ledColors['white']),
-			staticBlack: createAnimationFunction(one, ledColors['black']),
-		};
 		observe(_.debounce(stateObserver, 1000, { maxWait: 1000 }));
 	}
 }

lib/gui/app/models/selection-state.ts

@@ -1,4 +1,3 @@
-import type { DrivelistDrive } from '../../../shared/drive-constraints';
 /*
  * Copyright 2016 balena.io
  *
@@ -15,7 +14,7 @@ import type { DrivelistDrive } from '../../../shared/drive-constraints';
  * limitations under the License.
  */
 
-import type { SourceMetadata } from '../../../shared/typings/source-selector';
+import * as _ from 'lodash';
 
 import * as availableDrives from './available-drives';
 import { Actions, store } from './store';
@@ -25,7 +24,7 @@ import { Actions, store } from './store';
  */
 export function selectDrive(driveDevice: string) {
 	store.dispatch({
-		type: Actions.SELECT_TARGET,
+		type: Actions.SELECT_DRIVE,
 		data: driveDevice,
 	});
 }
@@ -41,10 +40,10 @@ export function toggleDrive(driveDevice: string) {
 	}
 }
 
-export function selectSource(source: SourceMetadata) {
+export function selectImage(image: any) {
 	store.dispatch({
-		type: Actions.SELECT_SOURCE,
-		data: source,
+		type: Actions.SELECT_IMAGE,
+		data: image,
 	});
 }
 
@@ -58,18 +57,50 @@ export function getSelectedDevices(): string[] {
 /**
  * @summary Get all selected drive objects
  */
-export function getSelectedDrives(): DrivelistDrive[] {
-	const selectedDevices = getSelectedDevices();
-	return availableDrives
-		.getDrives()
-		.filter((drive) => selectedDevices.includes(drive.device));
+export function getSelectedDrives(): any[] {
+	const drives = availableDrives.getDrives();
+	return _.map(getSelectedDevices(), (device) => {
+		return _.find(drives, { device });
+	});
 }
 
 /**
  * @summary Get the selected image
  */
-export function getImage(): SourceMetadata | undefined {
-	return store.getState().toJS().selection.image;
+export function getImage() {
+	return _.get(store.getState().toJS(), ['selection', 'image']);
+}
+
+export function getImagePath(): string {
+	return _.get(store.getState().toJS(), ['selection', 'image', 'path']);
+}
+
+export function getImageSize(): number {
+	return _.get(store.getState().toJS(), ['selection', 'image', 'size']);
+}
+
+export function getImageUrl(): string {
+	return _.get(store.getState().toJS(), ['selection', 'image', 'url']);
+}
+
+export function getImageName(): string {
+	return _.get(store.getState().toJS(), ['selection', 'image', 'name']);
+}
+
+export function getImageLogo(): string {
+	return _.get(store.getState().toJS(), ['selection', 'image', 'logo']);
+}
+
+export function getImageSupportUrl(): string {
+	return _.get(store.getState().toJS(), ['selection', 'image', 'supportUrl']);
+}
+
+export function getImageRecommendedDriveSize(): number {
+	return _.get(store.getState().toJS(), [
+		'selection',
+		'image',
+		'recommendedDriveSize',
+	]);
 }
 
 /**
@@ -83,7 +114,7 @@ export function hasDrive(): boolean {
  * @summary Check if there is a selected image
  */
 export function hasImage(): boolean {
-	return getImage() !== undefined;
+	return Boolean(getImage());
 }
 
 /**
@@ -91,20 +122,20 @@ export function hasImage(): boolean {
  */
 export function deselectDrive(driveDevice: string) {
 	store.dispatch({
-		type: Actions.DESELECT_TARGET,
+		type: Actions.DESELECT_DRIVE,
 		data: driveDevice,
 	});
 }
 
 export function deselectImage() {
 	store.dispatch({
-		type: Actions.DESELECT_SOURCE,
+		type: Actions.DESELECT_IMAGE,
 		data: {},
 	});
 }
 
 export function deselectAllDrives() {
-	getSelectedDevices().forEach(deselectDrive);
+	_.each(getSelectedDevices(), deselectDrive);
 }
 
 /**
@@ -124,5 +155,5 @@ export function isDriveSelected(driveDevice: string) {
 	}
 
 	const selectedDriveDevices = getSelectedDevices();
-	return selectedDriveDevices.includes(driveDevice);
+	return _.includes(selectedDriveDevices, driveDevice);
 }

lib/gui/app/models/settings.ts

@@ -26,9 +26,6 @@ const debug = _debug('etcher:models:settings');
 
 const JSON_INDENT = 2;
 
-export const DEFAULT_WIDTH = 800;
-export const DEFAULT_HEIGHT = 480;
-
 /**
  * @summary Userdata directory path
  * @description
@@ -38,19 +35,20 @@ export const DEFAULT_HEIGHT = 480;
  * - `~/Library/Application Support/etcher` on macOS
  * See https://electronjs.org/docs/api/app#appgetpathname
  *
- * NOTE: We use the remote property when this module
- * is loaded in the Electron's renderer process
+ * NOTE: The ternary is due to this module being loaded both,
+ * Electron's main process and renderer process
  */
-function getConfigPath() {
-	const app = electron.app || require('@electron/remote').app;
-	return join(app.getPath('userData'), 'config.json');
-}
+const USER_DATA_DIR = electron.app
+	? electron.app.getPath('userData')
+	: electron.remote.app.getPath('userData');
+
+const CONFIG_PATH = join(USER_DATA_DIR, 'config.json');
 
 async function readConfigFile(filename: string): Promise<_.Dictionary<any>> {
 	let contents = '{}';
 	try {
 		contents = await fs.readFile(filename, { encoding: 'utf8' });
-	} catch (error: any) {
+	} catch (error) {
 		// noop
 	}
 	try {
@@ -63,7 +61,7 @@ async function readConfigFile(filename: string): Promise<_.Dictionary<any>> {
 
 // exported for tests
 export async function readAll() {
-	return await readConfigFile(getConfigPath());
+	return await readConfigFile(CONFIG_PATH);
 }
 
 // exported for tests
@@ -76,7 +74,9 @@ export async function writeConfigFile(
 
 const DEFAULT_SETTINGS: _.Dictionary<any> = {
 	errorReporting: true,
-	updatesEnabled: ['appimage', 'nsis', 'dmg'].includes(packageJSON.packageType),
+	unmountOnSuccess: true,
+	validateWriteOnSuccess: true,
+	updatesEnabled: !_.includes(['rpm', 'deb'], packageJSON.packageType),
 	desktopNotifications: true,
 	autoBlockmapping: true,
 	decompressFirst: true,
@@ -102,8 +102,8 @@ export async function set(
 	const previousValue = settings[key];
 	settings[key] = value;
 	try {
-		await writeConfigFileFn(getConfigPath(), settings);
-	} catch (error: any) {
+		await writeConfigFileFn(CONFIG_PATH, settings);
+	} catch (error) {
 		// Revert to previous value if persisting settings failed
 		settings[key] = previousValue;
 		throw error;

lib/gui/app/models/store.ts

@@ -16,7 +16,6 @@
 
 import * as Immutable from 'immutable';
 import * as _ from 'lodash';
-import { basename } from 'path';
 import * as redux from 'redux';
 import { v4 as uuidV4 } from 'uuid';
 
@@ -63,7 +62,7 @@ export const DEFAULT_STATE = Immutable.fromJS({
 	},
 	isFlashing: false,
 	devicePaths: [],
-	failedDeviceErrors: [],
+	failedDevicePaths: [],
 	flashResults: {},
 	flashState: {
 		active: 0,
@@ -80,16 +79,16 @@ export const DEFAULT_STATE = Immutable.fromJS({
  */
 export enum Actions {
 	SET_DEVICE_PATHS,
-	SET_FAILED_DEVICE_ERRORS,
-	SET_AVAILABLE_TARGETS,
+	SET_FAILED_DEVICE_PATHS,
+	SET_AVAILABLE_DRIVES,
 	SET_FLASH_STATE,
 	RESET_FLASH_STATE,
 	SET_FLASHING_FLAG,
 	UNSET_FLASHING_FLAG,
-	SELECT_TARGET,
-	SELECT_SOURCE,
-	DESELECT_TARGET,
-	DESELECT_SOURCE,
+	SELECT_DRIVE,
+	SELECT_IMAGE,
+	DESELECT_DRIVE,
+	DESELECT_IMAGE,
 	SET_APPLICATION_SESSION_UUID,
 	SET_FLASHING_WORKFLOW_UUID,
 }
@@ -117,7 +116,7 @@ function storeReducer(
 	action: Action,
 ): typeof DEFAULT_STATE {
 	switch (action.type) {
-		case Actions.SET_AVAILABLE_TARGETS: {
+		case Actions.SET_AVAILABLE_DRIVES: {
 			// Type: action.data : Array<DriveObject>
 
 			if (!action.data) {
@@ -134,16 +133,11 @@ function storeReducer(
 				});
 			}
 
-			// Drives order is a list of devicePaths
-			const drivesOrder = settings.getSync('drivesOrder') ?? [];
-
 			drives = _.sortBy(drives, [
 				// System drives last
 				(d) => !!d.isSystem,
 				// Devices with no devicePath first (usbboot)
 				(d) => !!d.devicePath,
-				// Sort as defined in the drivesOrder setting if there is one (only for Linux with udev)
-				(d) => drivesOrder.indexOf(basename(d.devicePath || '')),
 				// Then sort by devicePath (only available on Linux with udev) or device
 				(d) => d.devicePath || d.device,
 			]);
@@ -164,7 +158,7 @@ function storeReducer(
 					) {
 						// Deselect this drive gone from availableDrives
 						return storeReducer(accState, {
-							type: Actions.DESELECT_TARGET,
+							type: Actions.DESELECT_DRIVE,
 							data: device,
 						});
 					}
@@ -175,7 +169,7 @@ function storeReducer(
 			);
 
 			const shouldAutoselectAll = Boolean(
-				settings.getSync('autoSelectAllDrives'),
+				settings.getSync('disableExplicitDriveSelection'),
 			);
 			const AUTOSELECT_DRIVE_COUNT = 1;
 			const nonStaleSelectedDevices = nonStaleNewState
@@ -197,24 +191,29 @@ function storeReducer(
 					drives,
 					(accState, drive) => {
 						if (
-							constraints.isDriveValid(drive, image) &&
-							!drive.isReadOnly &&
-							constraints.isDriveSizeRecommended(drive, image) &&
-							// We don't want to auto-select large drives except if autoSelectAllDrives is true
-							(!constraints.isDriveSizeLarge(drive) || shouldAutoselectAll) &&
-							// We don't want to auto-select system drives
-							!constraints.isSystemDrive(drive)
+							_.every([
+								constraints.isDriveValid(drive, image),
+								constraints.isDriveSizeRecommended(drive, image),
+
+								// We don't want to auto-select large drives
+								!constraints.isDriveSizeLarge(drive),
+
+								// We don't want to auto-select system drives,
+								// even when "unsafe mode" is enabled
+								!constraints.isSystemDrive(drive),
+							]) ||
+							(shouldAutoselectAll && constraints.isDriveValid(drive, image))
 						) {
 							// Auto-select this drive
 							return storeReducer(accState, {
-								type: Actions.SELECT_TARGET,
+								type: Actions.SELECT_DRIVE,
 								data: drive.device,
 							});
 						}
 
 						// Deselect this drive in case it still is selected
 						return storeReducer(accState, {
-							type: Actions.DESELECT_TARGET,
+							type: Actions.DESELECT_DRIVE,
 							data: drive.device,
 						});
 					},
@@ -270,7 +269,7 @@ function storeReducer(
 				.set('flashState', DEFAULT_STATE.get('flashState'))
 				.set('flashResults', DEFAULT_STATE.get('flashResults'))
 				.set('devicePaths', DEFAULT_STATE.get('devicePaths'))
-				.set('failedDeviceErrors', DEFAULT_STATE.get('failedDeviceErrors'))
+				.set('failedDevicePaths', DEFAULT_STATE.get('failedDevicePaths'))
 				.set(
 					'lastAverageFlashingSpeed',
 					DEFAULT_STATE.get('lastAverageFlashingSpeed'),
@@ -296,7 +295,6 @@ function storeReducer(
 
 			_.defaults(action.data, {
 				cancelled: false,
-				skip: false,
 			});
 
 			if (!_.isBoolean(action.data.cancelled)) {
@@ -337,19 +335,13 @@ function storeReducer(
 				);
 			}
 
-			if (action.data.skip) {
-				return state
-					.set('isFlashing', false)
-					.set('flashResults', Immutable.fromJS(action.data));
-			}
-
 			return state
 				.set('isFlashing', false)
 				.set('flashResults', Immutable.fromJS(action.data))
 				.set('flashState', DEFAULT_STATE.get('flashState'));
 		}
 
-		case Actions.SELECT_TARGET: {
+		case Actions.SELECT_DRIVE: {
 			// Type: action.data : String
 
 			const device = action.data;
@@ -399,12 +391,10 @@ function storeReducer(
 		// with image-stream / supported-formats, and have *one*
 		// place where all the image extension / format handling
 		// takes place, to avoid having to check 2+ locations with different logic
-		case Actions.SELECT_SOURCE: {
+		case Actions.SELECT_IMAGE: {
 			// Type: action.data : ImageObject
 
-			if (!action.data.drive) {
-				verifyNoNilFields(action.data, selectImageNoNilFields, 'image');
-			}
+			verifyNoNilFields(action.data, selectImageNoNilFields, 'image');
 
 			if (!_.isString(action.data.path)) {
 				throw errors.createError({
@@ -466,7 +456,7 @@ function storeReducer(
 						!constraints.isDriveSizeRecommended(drive, action.data)
 					) {
 						return storeReducer(accState, {
-							type: Actions.DESELECT_TARGET,
+							type: Actions.DESELECT_DRIVE,
 							data: device,
 						});
 					}
@@ -477,7 +467,7 @@ function storeReducer(
 			).setIn(['selection', 'image'], Immutable.fromJS(action.data));
 		}
 
-		case Actions.DESELECT_TARGET: {
+		case Actions.DESELECT_DRIVE: {
 			// Type: action.data : String
 
 			if (!action.data) {
@@ -501,7 +491,7 @@ function storeReducer(
 			);
 		}
 
-		case Actions.DESELECT_SOURCE: {
+		case Actions.DESELECT_IMAGE: {
 			return state.deleteIn(['selection', 'image']);
 		}
 
@@ -517,8 +507,8 @@ function storeReducer(
 			return state.set('devicePaths', action.data);
 		}
 
-		case Actions.SET_FAILED_DEVICE_ERRORS: {
-			return state.set('failedDeviceErrors', action.data);
+		case Actions.SET_FAILED_DEVICE_PATHS: {
+			return state.set('failedDevicePaths', action.data);
 		}
 
 		default: {

lib/gui/app/modules/analytics.ts

@@ -14,192 +14,85 @@
  * limitations under the License.
  */
 
-import { findLastIndex, once } from 'lodash';
-import type { Client } from 'analytics-client';
-import { createClient, createNoopClient } from 'analytics-client';
-import * as SentryRenderer from '@sentry/electron/renderer';
+import * as _ from 'lodash';
+import * as resinCorvus from 'resin-corvus/browser';
+
+import * as packageJSON from '../../../../package.json';
+import { getConfig } from '../../../shared/utils';
 import * as settings from '../models/settings';
 import { store } from '../models/store';
-import { version } from '../../../../package.json';
 
-type AnalyticsPayload = _.Dictionary<any>;
+const DEFAULT_PROBABILITY = 0.1;
 
-const clearUserPath = (filename: string): string => {
-	const generatedFile = filename.split('generated').reverse()[0];
-	return generatedFile !== filename ? `generated${generatedFile}` : filename;
-};
-
-export const anonymizeSentryData = (
-	event: SentryRenderer.Event,
-): SentryRenderer.Event => {
-	event.exception?.values?.forEach((exception) => {
-		exception.stacktrace?.frames?.forEach((frame) => {
-			if (frame.filename) {
-				frame.filename = clearUserPath(frame.filename);
-			}
-		});
+async function installCorvus(): Promise<void> {
+	const sentryToken =
+		(await settings.get('analyticsSentryToken')) ||
+		_.get(packageJSON, ['analytics', 'sentry', 'token']);
+	const mixpanelToken =
+		(await settings.get('analyticsMixpanelToken')) ||
+		_.get(packageJSON, ['analytics', 'mixpanel', 'token']);
+	resinCorvus.install({
+		services: {
+			sentry: sentryToken,
+			mixpanel: mixpanelToken,
+		},
+		options: {
+			release: packageJSON.version,
+			shouldReport: () => {
+				return settings.getSync('errorReporting');
+			},
+			mixpanelDeferred: true,
+		},
 	});
+}
 
-	event.breadcrumbs?.forEach((breadcrumb) => {
-		if (breadcrumb.data?.url) {
-			breadcrumb.data.url = clearUserPath(breadcrumb.data.url);
-		}
-	});
+let mixpanelSample = DEFAULT_PROBABILITY;
 
-	if (event.request?.url) {
-		event.request.url = clearUserPath(event.request.url);
-	}
-
-	return event;
-};
-
-const extractPathRegex = /(.*)(^|\s)(file:\/\/)?(\w:)?([\\/].+)/;
-const etcherSegmentMarkers = ['app.asar', 'Resources'];
-
-export const anonymizePath = (input: string) => {
-	// First, extract a part of the value that matches a path pattern.
-	const match = extractPathRegex.exec(input);
-	if (match === null) {
-		return input;
-	}
-	const mainPart = match[5];
-	const space = match[2];
-	const beginning = match[1];
-	const uriPrefix = match[3] || '';
-
-	// We have to deal with both Windows and POSIX here.
-	// The path starts with its separator (we work with absolute paths).
-	const sep = mainPart[0];
-	const segments = mainPart.split(sep);
-
-	// Moving from the end, find the first marker and cut the path from there.
-	const startCutIndex = findLastIndex(segments, (segment) =>
-		etcherSegmentMarkers.includes(segment),
-	);
-	return (
-		beginning +
-		space +
-		uriPrefix +
-		'[PERSONAL PATH]' +
-		sep +
-		segments.splice(startCutIndex).join(sep)
-	);
-};
-
-const safeAnonymizePath = (input: string) => {
-	try {
-		return anonymizePath(input);
-	} catch (e) {
-		return '[ANONYMIZE PATH FAILED]';
-	}
-};
-
-const sensitiveEtcherProperties = [
-	'error.description',
-	'error.message',
-	'error.stack',
-	'image',
-	'image.path',
-	'path',
-];
-
-export const anonymizeAnalyticsPayload = (
-	data: AnalyticsPayload,
-): AnalyticsPayload => {
-	for (const prop of sensitiveEtcherProperties) {
-		const value = data[prop];
-		if (value != null) {
-			data[prop] = safeAnonymizePath(value.toString());
-		}
-	}
-	return data;
-};
-
-let analyticsClient: Client;
 /**
  * @summary Init analytics configurations
  */
-export const initAnalytics = once(() => {
-	const dsn =
-		settings.getSync('analyticsSentryToken') || process.env.SENTRY_TOKEN;
-	SentryRenderer.init({
-		dsn,
-		beforeSend: anonymizeSentryData,
-		debug: process.env.ETCHER_SENTRY_DEBUG === 'true',
-	});
-
-	const projectName =
-		settings.getSync('analyticsAmplitudeToken') || process.env.AMPLITUDE_TOKEN;
-
-	const clientConfig = {
-		projectName,
-		endpoint: 'data.balena-cloud.com',
-		componentName: 'etcher',
-		componentVersion: version,
-	};
-	analyticsClient = projectName
-		? createClient(clientConfig)
-		: createNoopClient();
-});
-
-const getCircularReplacer = () => {
-	const seen = new WeakSet();
-	return (_key: any, value: any) => {
-		if (typeof value === 'object' && value !== null) {
-			if (seen.has(value)) {
-				return;
-			}
-			seen.add(value);
-		}
-		return value;
-	};
-};
-
-function flattenObject(obj: any) {
-	const toReturn: AnalyticsPayload = {};
-
-	for (const i in obj) {
-		if (!Object.prototype.hasOwnProperty.call(obj, i)) {
-			continue;
-		}
-
-		if (Array.isArray(obj[i])) {
-			toReturn[i] = obj[i];
-			continue;
-		}
-
-		if (typeof obj[i] === 'object' && obj[i] !== null) {
-			const flatObject = flattenObject(obj[i]);
-			for (const x in flatObject) {
-				if (!Object.prototype.hasOwnProperty.call(flatObject, x)) {
-					continue;
-				}
-
-				toReturn[i.toLowerCase() + '.' + x.toLowerCase()] = flatObject[x];
-			}
-		} else {
-			toReturn[i] = obj[i];
+async function initConfig() {
+	await installCorvus();
+	let validatedConfig = null;
+	try {
+		const configUrl = await settings.get('configUrl');
+		const config = await getConfig(configUrl);
+		const mixpanel = _.get(config, ['analytics', 'mixpanel'], {});
+		mixpanelSample = mixpanel.probability || DEFAULT_PROBABILITY;
+		if (isClientEligible(mixpanelSample)) {
+			validatedConfig = validateMixpanelConfig(mixpanel);
 		}
+	} catch (err) {
+		resinCorvus.logException(err);
 	}
-	return toReturn;
-}
-
-function formatEvent(data: any): AnalyticsPayload {
-	const event = JSON.parse(JSON.stringify(data, getCircularReplacer()));
-	return anonymizeAnalyticsPayload(flattenObject(event));
-}
-
-function reportAnalytics(message: string, data: AnalyticsPayload = {}) {
-	const { applicationSessionUuid, flashingWorkflowUuid } = store
-		.getState()
-		.toJS();
-
-	const event = formatEvent({
-		...data,
-		applicationSessionUuid,
-		flashingWorkflowUuid,
+	resinCorvus.setConfigs({
+		mixpanel: validatedConfig,
 	});
-	analyticsClient.track(message, event);
+}
+
+initConfig();
+
+/**
+ * @summary Check that the client is eligible for analytics
+ */
+function isClientEligible(probability: number) {
+	return Math.random() < probability;
+}
+
+/**
+ * @summary Check that config has at least HTTP_PROTOCOL and api_host
+ */
+function validateMixpanelConfig(config: {
+	api_host?: string;
+	HTTP_PROTOCOL?: string;
+}) {
+	const mixpanelConfig = {
+		api_host: 'https://api.mixpanel.com',
+	};
+	if (config.HTTP_PROTOCOL !== undefined && config.api_host !== undefined) {
+		mixpanelConfig.api_host = `${config.HTTP_PROTOCOL}://${config.api_host}`;
+	}
+	return mixpanelConfig;
 }
 
 /**
@@ -208,12 +101,17 @@ function reportAnalytics(message: string, data: AnalyticsPayload = {}) {
  * @description
  * This function sends the debug message to product analytics services.
  */
-export async function logEvent(message: string, data: AnalyticsPayload = {}) {
-	const shouldReportAnalytics = await settings.get('errorReporting');
-	if (shouldReportAnalytics) {
-		initAnalytics();
-		reportAnalytics(message, data);
-	}
+export function logEvent(message: string, data: _.Dictionary<any> = {}) {
+	const {
+		applicationSessionUuid,
+		flashingWorkflowUuid,
+	} = store.getState().toJS();
+	resinCorvus.logEvent(message, {
+		...data,
+		sample: mixpanelSample,
+		applicationSessionUuid,
+		flashingWorkflowUuid,
+	});
 }
 
 /**
@@ -222,11 +120,4 @@ export async function logEvent(message: string, data: AnalyticsPayload = {}) {
  * @description
  * This function logs an exception to error reporting services.
  */
-export function logException(error: any) {
-	const shouldReportErrors = settings.getSync('errorReporting');
-	console.error(error);
-	if (shouldReportErrors) {
-		initAnalytics();
-		SentryRenderer.captureException(error);
-	}
-}
+export const logException = resinCorvus.logException;

lib/gui/app/modules/api.ts

@@ -1,251 +0,0 @@
-/** This function will :
- * 	- start the ipc server (api)
- *  - spawn the child process (privileged or not)
- *  - wait for the child process to connect to the api
- *  - return a promise that will resolve with the emit function for the api
- *
- * //TODO:
- *  - this should be refactored to reverse the control flow:
- *    - the child process should be the server
- *    - this should be the client
- *  - replace the current node-ipc api with a websocket api
- *  - centralise the api for both the writer and the scanner instead of having two instances running
- */
-
-import WebSocket from 'ws'; // (no types for wrapper, this is expected)
-import { spawn, exec } from 'child_process';
-import * as os from 'os';
-import * as packageJSON from '../../../../package.json';
-import * as permissions from '../../../shared/permissions';
-import * as errors from '../../../shared/errors';
-
-const THREADS_PER_CPU = 16;
-const connectionRetryDelay = 1000;
-const connectionRetryAttempts = 10;
-
-async function writerArgv(): Promise<string[]> {
-	let entryPoint = await window.etcher.getEtcherUtilPath();
-	// AppImages run over FUSE, so the files inside the mount point
-	// can only be accessed by the user that mounted the AppImage.
-	// This means we can't re-spawn Etcher as root from the same
-	// mount-point, and as a workaround, we re-mount the original
-	// AppImage as root.
-	if (os.platform() === 'linux' && process.env.APPIMAGE && process.env.APPDIR) {
-		entryPoint = entryPoint.replace(process.env.APPDIR, '');
-		return [
-			process.env.APPIMAGE,
-			'-e',
-			`require(\`\${process.env.APPDIR}${entryPoint}\`)`,
-		];
-	} else {
-		return [entryPoint];
-	}
-}
-
-async function spawnChild(
-	withPrivileges: boolean,
-	etcherServerId: string,
-	etcherServerAddress: string,
-	etcherServerPort: string,
-) {
-	const argv = await writerArgv();
-	const env: any = {
-		ETCHER_SERVER_ADDRESS: etcherServerAddress,
-		ETCHER_SERVER_ID: etcherServerId,
-		ETCHER_SERVER_PORT: etcherServerPort,
-		UV_THREADPOOL_SIZE: (os.cpus().length * THREADS_PER_CPU).toString(),
-		// This environment variable prevents the AppImages
-		// desktop integration script from presenting the
-		// "installation" dialog
-		SKIP: '1',
-		...(process.platform === 'win32' ? {} : process.env),
-	};
-
-	if (withPrivileges) {
-		console.log('... with privileges ...');
-		return permissions.elevateCommand(argv, {
-			applicationName: packageJSON.displayName,
-			env,
-		});
-	} else {
-		if (process.platform === 'win32') {
-			// we need to ensure we reset the env as a previous elevation process might have kept them in a wrong state
-			const envCommand = [];
-			for (const key in env) {
-				if (Object.prototype.hasOwnProperty.call(env, key)) {
-					envCommand.push(`set ${key}=${env[key]}`);
-				}
-			}
-			await exec(envCommand.join(' && '));
-		}
-		const spawned = await spawn(argv[0], argv.slice(1), {
-			env,
-		});
-		return { cancelled: false, spawned };
-	}
-}
-
-type ChildApi = {
-	emit: (type: string, payload: any) => void;
-	registerHandler: (event: string, handler: any) => void;
-	failed: boolean;
-};
-
-async function connectToChildProcess(
-	etcherServerAddress: string,
-	etcherServerPort: string,
-	etcherServerId: string,
-): Promise<ChildApi | { failed: boolean }> {
-	return new Promise((resolve, reject) => {
-		// TODO: default to IPC connections https://github.com/websockets/ws/blob/master/doc/ws.md#ipc-connections
-		// TOOD: use the path as cheap authentication
-		console.log(etcherServerId);
-
-		const url = `ws://${etcherServerAddress}:${etcherServerPort}`;
-
-		const ws = new WebSocket(url);
-
-		let heartbeat: any;
-
-		const startHeartbeat = (emit: any) => {
-			console.log('start heartbeat');
-			heartbeat = setInterval(() => {
-				emit('heartbeat', {});
-			}, 1000);
-		};
-
-		const stopHeartbeat = () => {
-			console.log('stop heartbeat');
-			clearInterval(heartbeat);
-		};
-
-		ws.on('error', (error: any) => {
-			if (error.code === 'ECONNREFUSED') {
-				resolve({
-					failed: true,
-				});
-			} else {
-				stopHeartbeat();
-				reject({
-					failed: true,
-				});
-			}
-		});
-
-		ws.on('open', () => {
-			const emit = (type: string, payload: any) => {
-				ws.send(JSON.stringify({ type, payload }));
-			};
-
-			emit('ready', {});
-
-			// parse and route messages
-			const messagesHandler: any = {
-				log: (message: any) => {
-					console.log(`CHILD LOG: ${message}`);
-				},
-
-				error: (error: any) => {
-					const errorObject = errors.fromJSON(error);
-					console.error('CHILD ERROR', errorObject);
-					stopHeartbeat();
-				},
-
-				// once api is ready (means child process is connected) we pass the emit function to the caller
-				ready: () => {
-					console.log('CHILD READY');
-
-					startHeartbeat(emit);
-
-					resolve({
-						failed: false,
-						emit,
-						registerHandler,
-					});
-				},
-			};
-
-			ws.on('message', (jsonData: any) => {
-				const data = JSON.parse(jsonData);
-				const message = messagesHandler[data.type];
-				if (message) {
-					message(data.payload);
-				} else {
-					throw new Error(`Unknown message type: ${data.type}`);
-				}
-			});
-
-			// api to register more handlers with callbacks
-			const registerHandler = (event: string, handler: any) => {
-				messagesHandler[event] = handler;
-			};
-		});
-	});
-}
-
-async function spawnChildAndConnect({
-	withPrivileges,
-}: {
-	withPrivileges: boolean;
-}): Promise<ChildApi> {
-	const etcherServerAddress = process.env.ETCHER_SERVER_ADDRESS ?? '127.0.0.1'; // localhost
-	const etcherServerPort =
-		process.env.ETCHER_SERVER_PORT ?? withPrivileges ? '3435' : '3434';
-	const etcherServerId =
-		process.env.ETCHER_SERVER_ID ??
-		`etcher-${Math.random().toString(36).substring(7)}`;
-
-	console.log(
-		`Spawning ${
-			withPrivileges ? 'priviledged' : 'unpriviledged'
-		} sidecar on port ${etcherServerPort}`,
-	);
-
-	// spawn the child process, which will act as the ws server
-	// ETCHER_NO_SPAWN_UTIL can be set to launch a GUI only version of etcher, in that case you'll probably want to set other ENV to match your setup
-	if (!process.env.ETCHER_NO_SPAWN_UTIL) {
-		try {
-			const result = await spawnChild(
-				withPrivileges,
-				etcherServerId,
-				etcherServerAddress,
-				etcherServerPort,
-			);
-			if (result.cancelled) {
-				throw new Error('Spwaning the child process was cancelled');
-			}
-		} catch (error) {
-			console.error('Error spawning child process', error);
-			throw new Error('Error spawning the child process');
-		}
-	}
-
-	// try to connect to the ws server, retrying if necessary, until the connection is established
-	try {
-		let retry = 0;
-		while (retry < connectionRetryAttempts) {
-			const { emit, registerHandler, failed } = await connectToChildProcess(
-				etcherServerAddress,
-				etcherServerPort,
-				etcherServerId,
-			);
-			if (failed) {
-				retry++;
-				console.log(
-					`Retrying to connect to child process in ${connectionRetryDelay}... ${retry} / ${connectionRetryAttempts}`,
-				);
-				await new Promise((resolve) =>
-					setTimeout(resolve, connectionRetryDelay),
-				);
-				continue;
-			}
-			return { failed, emit, registerHandler };
-		}
-		throw new Error('Connection to etcher-util timed out');
-	} catch (error) {
-		console.error('Error connecting to child process', error);
-		throw new Error('Connection to etcher-util failed');
-	}
-}
-
-export { spawnChildAndConnect };

lib/gui/app/modules/drive-scanner.ts

@@ -15,30 +15,25 @@
  */
 
 import * as sdk from 'etcher-sdk';
-import type { Adapter } from 'etcher-sdk/build/scanner/adapters';
-import {
-	BlockDeviceAdapter,
-	UsbbootDeviceAdapter,
-} from 'etcher-sdk/build/scanner/adapters';
 import { geteuid, platform } from 'process';
 
-const adapters: Adapter[] = [
-	new BlockDeviceAdapter({
+const adapters: sdk.scanner.adapters.Adapter[] = [
+	new sdk.scanner.adapters.BlockDeviceAdapter({
 		includeSystemDrives: () => true,
 	}),
 ];
 
 // Can't use permissions.isElevated() here as it returns a promise and we need to set
 // module.exports = scanner right now.
-if (platform !== 'linux' || (geteuid && geteuid() === 0)) {
-	adapters.push(new UsbbootDeviceAdapter());
+if (platform !== 'linux' || geteuid() === 0) {
+	adapters.push(new sdk.scanner.adapters.UsbbootDeviceAdapter());
 }
 
-if (platform === 'win32') {
-	const {
-		DriverlessDeviceAdapter: driverless,
-	} = require('etcher-sdk/build/scanner/adapters/driverless');
-	adapters.push(new driverless());
+if (
+	platform === 'win32' &&
+	sdk.scanner.adapters.DriverlessDeviceAdapter !== undefined
+) {
+	adapters.push(new sdk.scanner.adapters.DriverlessDeviceAdapter());
 }
 
 export const scanner = new sdk.scanner.Scanner(adapters);

lib/gui/app/modules/image-writer.ts

@@ -14,17 +14,41 @@
  * limitations under the License.
  */
 
-import type { Drive as DrivelistDrive } from 'drivelist';
-import type * as sdk from 'etcher-sdk';
-import type { Dictionary } from 'lodash';
+import { Drive as DrivelistDrive } from 'drivelist';
+import * as electron from 'electron';
+import * as sdk from 'etcher-sdk';
+import * as _ from 'lodash';
+import * as ipc from 'node-ipc';
+import * as os from 'os';
+import * as path from 'path';
+
+import * as packageJSON from '../../../../package.json';
 import * as errors from '../../../shared/errors';
-import type { SourceMetadata } from '../../../shared/typings/source-selector';
+import * as permissions from '../../../shared/permissions';
+import { SourceOptions } from '../components/source-selector/source-selector';
 import * as flashState from '../models/flash-state';
 import * as selectionState from '../models/selection-state';
 import * as settings from '../models/settings';
 import * as analytics from '../modules/analytics';
 import * as windowProgress from '../os/window-progress';
-import { spawnChildAndConnect } from './api';
+
+const THREADS_PER_CPU = 16;
+
+// There might be multiple Etcher instances running at
+// the same time, therefore we must ensure each IPC
+// server/client has a different name.
+const IPC_SERVER_ID = `etcher-server-${process.pid}`;
+const IPC_CLIENT_ID = `etcher-client-${process.pid}`;
+
+ipc.config.id = IPC_SERVER_ID;
+ipc.config.socketRoot = path.join(
+	process.env.XDG_RUNTIME_DIR || os.tmpdir(),
+	path.sep,
+);
+
+// NOTE: Ensure this isn't disabled, as it will cause
+// the stdout maxBuffer size to be exceeded when flashing
+ipc.config.silent = true;
 
 /**
  * @summary Handle a flash error and log it to analytics
@@ -56,91 +80,162 @@ function handleErrorLogging(
 	}
 }
 
-let cancelEmitter: (type: string) => void | undefined;
+function terminateServer() {
+	// Turns out we need to destroy all sockets for
+	// the server to actually close. Otherwise, it
+	// just stops receiving any further connections,
+	// but remains open if there are active ones.
+	// @ts-ignore (no Server.sockets in @types/node-ipc)
+	for (const socket of ipc.server.sockets) {
+		socket.destroy();
+	}
+	ipc.server.stop();
+}
 
-interface FlashResults {
-	skip?: boolean;
-	cancelled?: boolean;
-	results?: {
-		bytesWritten: number;
-		devices: {
-			failed: number;
-			successful: number;
-		};
-		errors: Error[];
+function writerArgv(): string[] {
+	let entryPoint = path.join(
+		electron.remote.app.getAppPath(),
+		'generated',
+		'child-writer.js',
+	);
+	// AppImages run over FUSE, so the files inside the mount point
+	// can only be accessed by the user that mounted the AppImage.
+	// This means we can't re-spawn Etcher as root from the same
+	// mount-point, and as a workaround, we re-mount the original
+	// AppImage as root.
+	if (os.platform() === 'linux' && process.env.APPIMAGE && process.env.APPDIR) {
+		entryPoint = entryPoint.replace(process.env.APPDIR, '');
+		return [
+			process.env.APPIMAGE,
+			'-e',
+			`require(\`\${process.env.APPDIR}${entryPoint}\`)`,
+		];
+	} else {
+		return [process.argv[0], entryPoint];
+	}
+}
+
+function writerEnv() {
+	return {
+		IPC_SERVER_ID,
+		IPC_CLIENT_ID,
+		IPC_SOCKET_ROOT: ipc.config.socketRoot,
+		ELECTRON_RUN_AS_NODE: '1',
+		UV_THREADPOOL_SIZE: (os.cpus().length * THREADS_PER_CPU).toString(),
+		// This environment variable prevents the AppImages
+		// desktop integration script from presenting the
+		// "installation" dialog
+		SKIP: '1',
+		...(process.platform === 'win32' ? {} : process.env),
 	};
 }
 
+interface FlashResults {
+	cancelled?: boolean;
+}
+
+/**
+ * @summary Perform write operation
+ */
 async function performWrite(
-	image: SourceMetadata,
+	image: string,
 	drives: DrivelistDrive[],
 	onProgress: sdk.multiWrite.OnProgressFunction,
-): Promise<{ cancelled?: boolean }> {
-	const { autoBlockmapping, decompressFirst } = await settings.getAll();
-
-	// Spawn the child process with privileges and wait for the connection to be made
-	const { emit, registerHandler } = await spawnChildAndConnect({
-		withPrivileges: true,
-	});
-
+	source: SourceOptions,
+): Promise<FlashResults> {
+	let cancelled = false;
+	ipc.serve();
+	const {
+		unmountOnSuccess,
+		validateWriteOnSuccess,
+		autoBlockmapping,
+		decompressFirst,
+	} = await settings.getAll();
 	return await new Promise((resolve, reject) => {
-		// if the connection failed, reject the promise
+		ipc.server.on('error', (error) => {
+			terminateServer();
+			const errorObject = errors.fromJSON(error);
+			reject(errorObject);
+		});
+
+		ipc.server.on('log', (message) => {
+			console.log(message);
+		});
 
 		const flashResults: FlashResults = {};
-
 		const analyticsData = {
 			image,
 			drives,
 			driveCount: drives.length,
 			uuid: flashState.getFlashUuid(),
 			flashInstanceUuid: flashState.getFlashUuid(),
+			unmountOnSuccess,
+			validateWriteOnSuccess,
 		};
 
-		const onFail = ({ device, error }: { device: any; error: any }) => {
-			console.log('fail event');
-			console.log(device);
-			console.log(error);
+		ipc.server.on('fail', ({ device, error }) => {
 			if (device.devicePath) {
-				flashState.addFailedDeviceError({ device, error });
+				flashState.addFailedDevicePath(device.devicePath);
 			}
 			handleErrorLogging(error, analyticsData);
-			finish();
-		};
+		});
 
-		const onDone = (payload: any) => {
-			console.log('CHILD: flash done', payload);
-			payload.results.errors = payload.results.errors.map(
-				(data: Dictionary<any> & { message: string }) => {
-					return errors.fromJSON(data);
-				},
-			);
-			flashResults.results = payload.results;
-			finish();
-		};
+		ipc.server.on('done', (event) => {
+			event.results.errors = _.map(event.results.errors, (data) => {
+				return errors.fromJSON(data);
+			});
+			_.merge(flashResults, event);
+		});
 
-		const onAbort = () => {
-			console.log('CHILD: flash aborted');
-			flashResults.cancelled = true;
-			finish();
-		};
+		ipc.server.on('abort', () => {
+			terminateServer();
+			cancelled = true;
+		});
 
-		const onSkip = () => {
-			console.log('CHILD: validation skipped');
-			flashResults.skip = true;
-			finish();
-		};
+		ipc.server.on('state', onProgress);
 
-		const finish = () => {
+		ipc.server.on('ready', (_data, socket) => {
+			ipc.server.emit(socket, 'write', {
+				imagePath: image,
+				destinations: drives,
+				source,
+				SourceType: source.SourceType.name,
+				validateWriteOnSuccess,
+				autoBlockmapping,
+				unmountOnSuccess,
+				decompressFirst,
+			});
+		});
+
+		const argv = writerArgv();
+
+		ipc.server.on('start', async () => {
+			console.log(`Elevating command: ${_.join(argv, ' ')}`);
+			const env = writerEnv();
+			try {
+				const results = await permissions.elevateCommand(argv, {
+					applicationName: packageJSON.displayName,
+					environment: env,
+				});
+				flashResults.cancelled = cancelled || results.cancelled;
+			} catch (error) {
+				// This happens when the child is killed using SIGKILL
+				const SIGKILL_EXIT_CODE = 137;
+				if (error.code === SIGKILL_EXIT_CODE) {
+					error.code = 'ECHILDDIED';
+				}
+				reject(error);
+			} finally {
+				console.log('Terminating IPC server');
+				terminateServer();
+			}
 			console.log('Flash results', flashResults);
 
-			// The flash wasn't cancelled and we didn't get a 'done' event
-			// Catch unexpected situation
+			// This likely means the child died halfway through
 			if (
 				!flashResults.cancelled &&
-				!flashResults.skip &&
-				flashResults.results === undefined
+				!_.get(flashResults, ['results', 'bytesWritten'])
 			) {
-				console.log(flashResults);
 				reject(
 					errors.createUserError({
 						title: 'The writer process ended unexpectedly',
@@ -148,40 +243,24 @@ async function performWrite(
 							'Please try again, and contact the Etcher team if the problem persists',
 					}),
 				);
+				return;
 			}
-
 			resolve(flashResults);
-		};
+		});
 
-		registerHandler('state', onProgress);
-		registerHandler('fail', onFail);
-		registerHandler('done', onDone);
-		registerHandler('abort', onAbort);
-		registerHandler('skip', onSkip);
-
-		cancelEmitter = (cancelStatus: string) => emit('cancel', cancelStatus);
-
-		// Now that we know we're connected we can instruct the child process to start the write
-		const parameters = {
-			image,
-			destinations: drives,
-			SourceType: image.SourceType,
-			autoBlockmapping,
-			decompressFirst,
-		};
-		console.log('params', parameters);
-		emit('write', parameters);
+		// Clear the update lock timer to prevent longer
+		// flashing timing it out, and releasing the lock
+		ipc.server.start();
 	});
-
-	// The process continue in the event handler
 }
 
 /**
  * @summary Flash an image to drives
  */
 export async function flash(
-	image: SourceMetadata,
+	image: string,
 	drives: DrivelistDrive[],
+	source: SourceOptions,
 	// This function is a parameter so it can be mocked in tests
 	write = performWrite,
 ): Promise<void> {
@@ -189,8 +268,7 @@ export async function flash(
 		throw new Error('There is already a flash in progress');
 	}
 
-	await flashState.setFlashingFlag();
-
+	flashState.setFlashingFlag();
 	flashState.setDevicePaths(
 		drives.map((d) => d.devicePath).filter((p) => p != null) as string[],
 	);
@@ -202,26 +280,25 @@ export async function flash(
 		uuid: flashState.getFlashUuid(),
 		status: 'started',
 		flashInstanceUuid: flashState.getFlashUuid(),
+		unmountOnSuccess: await settings.get('unmountOnSuccess'),
+		validateWriteOnSuccess: await settings.get('validateWriteOnSuccess'),
 	};
 
 	analytics.logEvent('Flash', analyticsData);
 
-	// start api and call the flasher
 	try {
-		const result = await write(image, drives, flashState.setProgressState);
-		console.log('got results', result);
-		await flashState.unsetFlashingFlag(result);
-		console.log('removed flashing flag');
-	} catch (error: any) {
-		await flashState.unsetFlashingFlag({
-			cancelled: false,
-			errorCode: error.code,
-		});
-
+		const result = await write(
+			image,
+			drives,
+			flashState.setProgressState,
+			source,
+		);
+		flashState.unsetFlashingFlag(result);
+	} catch (error) {
+		flashState.unsetFlashingFlag({ cancelled: false, errorCode: error.code });
 		windowProgress.clear();
-
-		const { results = {} } = flashState.getFlashResults();
-
+		let { results } = flashState.getFlashResults();
+		results = results || {};
 		const eventData = {
 			...analyticsData,
 			errors: results.errors,
@@ -232,9 +309,7 @@ export async function flash(
 		analytics.logEvent('Write failed', eventData);
 		throw error;
 	}
-
 	windowProgress.clear();
-
 	if (flashState.wasLastFlashCancelled()) {
 		const eventData = {
 			...analyticsData,
@@ -242,7 +317,7 @@ export async function flash(
 		};
 		analytics.logEvent('Elevation cancelled', eventData);
 	} else {
-		const { results = {} } = flashState.getFlashResults();
+		const { results } = flashState.getFlashResults();
 		const eventData = {
 			...analyticsData,
 			errors: results.errors,
@@ -257,22 +332,30 @@ export async function flash(
 
 /**
  * @summary Cancel write operation
- * //TODO: find a better solution to handle cancellation
  */
-export async function cancel(type: string) {
-	const status = type.toLowerCase();
+export async function cancel() {
 	const drives = selectionState.getSelectedDevices();
 	const analyticsData = {
-		image: selectionState.getImage()?.path,
+		image: selectionState.getImagePath(),
 		drives,
 		driveCount: drives.length,
 		uuid: flashState.getFlashUuid(),
 		flashInstanceUuid: flashState.getFlashUuid(),
-		status,
+		unmountOnSuccess: await settings.get('unmountOnSuccess'),
+		validateWriteOnSuccess: await settings.get('validateWriteOnSuccess'),
+		status: 'cancel',
 	};
 	analytics.logEvent('Cancel', analyticsData);
 
-	if (cancelEmitter) {
-		cancelEmitter(status);
+	// Re-enable lock release on inactivity
+
+	try {
+		// @ts-ignore (no Server.sockets in @types/node-ipc)
+		const [socket] = ipc.server.sockets;
+		if (socket !== undefined) {
+			ipc.server.emit(socket, 'cancel');
+		}
+	} catch (error) {
+		analytics.logException(error);
 	}
 }

lib/gui/app/modules/progress-status.ts

@@ -14,8 +14,7 @@
  * limitations under the License.
  */
 
-import prettyBytes from 'pretty-bytes';
-import * as i18next from 'i18next';
+import { bytesToClosestUnit } from '../../../shared/units';
 
 export interface FlashState {
 	active: number;
@@ -34,48 +33,37 @@ export function fromFlashState({
 	status: string;
 	position?: string;
 } {
-	console.log(i18next.t('progress.starting'));
-
 	if (type === undefined) {
-		return { status: i18next.t('progress.starting') };
+		return { status: 'Starting...' };
 	} else if (type === 'decompressing') {
 		if (percentage == null) {
-			return { status: i18next.t('progress.decompressing') };
+			return { status: 'Decompressing...' };
 		} else {
-			return {
-				position: `${percentage}%`,
-				status: i18next.t('progress.decompressing'),
-			};
+			return { position: `${percentage}%`, status: 'Decompressing...' };
 		}
 	} else if (type === 'flashing') {
 		if (percentage != null) {
 			if (percentage < 100) {
-				return {
-					position: `${percentage}%`,
-					status: i18next.t('progress.flashing'),
-				};
+				return { position: `${percentage}%`, status: 'Flashing...' };
 			} else {
-				return { status: i18next.t('progress.finishing') };
+				return { status: 'Finishing...' };
 			}
 		} else {
 			return {
-				status: i18next.t('progress.flashing'),
-				position: `${position ? prettyBytes(position) : ''}`,
+				status: 'Flashing...',
+				position: `${bytesToClosestUnit(position)}`,
 			};
 		}
 	} else if (type === 'verifying') {
 		if (percentage == null) {
-			return { status: i18next.t('progress.verifying') };
+			return { status: 'Validating...' };
 		} else if (percentage < 100) {
-			return {
-				position: `${percentage}%`,
-				status: i18next.t('progress.verifying'),
-			};
+			return { position: `${percentage}%`, status: 'Validating...' };
 		} else {
-			return { status: i18next.t('progress.finishing') };
+			return { status: 'Finishing...' };
 		}
 	}
-	return { status: i18next.t('progress.failing') };
+	return { status: 'Failed' };
 }
 
 export function titleFromFlashState(

lib/gui/app/os/dialog.ts

@@ -15,13 +15,11 @@
  */
 
 import * as electron from 'electron';
-import * as remote from '@electron/remote';
 import * as _ from 'lodash';
 
 import * as errors from '../../../shared/errors';
 import * as settings from '../../../gui/app/models/settings';
 import { SUPPORTED_EXTENSIONS } from '../../../shared/supported-formats';
-import * as i18next from 'i18next';
 
 async function mountSourceDrive() {
 	// sourceDrivePath is the name of the link in /dev/disk/by-path
@@ -29,7 +27,7 @@ async function mountSourceDrive() {
 	if (sourceDrivePath) {
 		try {
 			await electron.ipcRenderer.invoke('mount-drive', sourceDrivePath);
-		} catch (error: any) {
+		} catch (error) {
 			// noop
 		}
 	}
@@ -55,18 +53,19 @@ export async function selectImage(): Promise<string | undefined> {
 		properties: ['openFile', 'treatPackageAsDirectory'],
 		filters: [
 			{
-				name: i18next.t('source.osImages'),
+				name: 'OS Images',
 				extensions: SUPPORTED_EXTENSIONS,
 			},
 			{
-				name: i18next.t('source.allFiles'),
+				name: 'All',
 				extensions: ['*'],
 			},
 		],
 	};
-	const currentWindow = remote.getCurrentWindow();
-	const [file] = (await remote.dialog.showOpenDialog(currentWindow, options))
-		.filePaths;
+	const currentWindow = electron.remote.getCurrentWindow();
+	const [file] = (
+		await electron.remote.dialog.showOpenDialog(currentWindow, options)
+	).filePaths;
 	return file;
 }
 
@@ -80,8 +79,8 @@ export async function showWarning(options: {
 	description: string;
 }): Promise<boolean> {
 	_.defaults(options, {
-		confirmationLabel: i18next.t('ok'),
-		rejectionLabel: i18next.t('cancel'),
+		confirmationLabel: 'OK',
+		rejectionLabel: 'Cancel',
 	});
 
 	const BUTTONS = [options.confirmationLabel, options.rejectionLabel];
@@ -92,14 +91,14 @@ export async function showWarning(options: {
 	);
 	const BUTTON_REJECTION_INDEX = _.indexOf(BUTTONS, options.rejectionLabel);
 
-	const { response } = await remote.dialog.showMessageBox(
-		remote.getCurrentWindow(),
+	const { response } = await electron.remote.dialog.showMessageBox(
+		electron.remote.getCurrentWindow(),
 		{
 			type: 'warning',
 			buttons: BUTTONS,
 			defaultId: BUTTON_REJECTION_INDEX,
 			cancelId: BUTTON_REJECTION_INDEX,
-			title: i18next.t('attention'),
+			title: 'Attention',
 			message: options.title,
 			detail: options.description,
 		},
@@ -113,5 +112,5 @@ export async function showWarning(options: {
 export function showError(error: Error) {
 	const title = errors.getTitle(error);
 	const message = errors.getDescription(error);
-	remote.dialog.showErrorBox(title, message);
+	electron.remote.dialog.showErrorBox(title, message);
 }

lib/gui/app/os/notification.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import * as remote from '@electron/remote';
+import * as electron from 'electron';
 
 import * as settings from '../models/settings';
 
@@ -28,8 +28,8 @@ export async function send(title: string, body: string, icon: string) {
 	}
 
 	// `app.dock` is only defined in OS X
-	if (remote.app.dock) {
-		remote.app.dock.bounce();
+	if (electron.remote.app.dock) {
+		electron.remote.app.dock.bounce();
 	}
 
 	return new window.Notification(title, { body, icon });

lib/gui/app/os/window-progress.ts

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-import * as remote from '@electron/remote';
+import * as electron from 'electron';
 
 import { percentageToFloat } from '../../../shared/utils';
-import type { FlashState } from '../modules/progress-status';
-import { titleFromFlashState } from '../modules/progress-status';
+import { FlashState, titleFromFlashState } from '../modules/progress-status';
 
 /**
  * @summary The title of the main window upon program launch
@@ -41,7 +40,7 @@ function getWindowTitle(state?: FlashState) {
  * @description
  * We expose this property to `this` for testability purposes.
  */
-export const currentWindow = remote.getCurrentWindow();
+export const currentWindow = electron.remote.getCurrentWindow();
 
 /**
  * @summary Set operating system window progress

lib/gui/app/os/windows-network-drives.ts

@@ -15,7 +15,6 @@
  */
 
 import { exec } from 'child_process';
-import { withTmpFile } from 'etcher-sdk/build/tmp';
 import { readFile } from 'fs';
 import { chain, trim } from 'lodash';
 import { platform } from 'os';
@@ -23,6 +22,8 @@ import { join } from 'path';
 import { env } from 'process';
 import { promisify } from 'util';
 
+import { withTmpFile } from '../../../shared/tmp';
+
 const readFileAsync = promisify(readFile);
 
 const execAsync = promisify(exec);
@@ -40,11 +41,11 @@ async function getWmicNetworkDrivesOutput(): Promise<string> {
 	// So we just redirect to a file and read it afterwards as we know it will be ucs2 encoded.
 	const options = {
 		// Close the file once it's created
-		keepOpen: false,
+		discardDescriptor: true,
 		// Wmic fails with "Invalid global switch" when the "/output:" switch filename contains a dash ("-")
 		prefix: 'tmp',
 	};
-	return withTmpFile(options, async ({ path }) => {
+	return withTmpFile(options, async (path) => {
 		const command = [
 			join(env.SystemRoot as string, 'System32', 'Wbem', 'wmic'),
 			'path',

lib/gui/app/pages/main/DriveSelector.tsx

@@ -14,28 +14,22 @@
  * limitations under the License.
  */
 
+import { scanner } from 'etcher-sdk';
 import * as React from 'react';
-import { Flex, Txt } from 'rendition';
-
-import type { DriveSelectorProps } from '../drive-selector/drive-selector';
-import { DriveSelector } from '../drive-selector/drive-selector';
+import { Flex } from 'rendition';
+import { TargetSelector } from '../../components/target-selector/target-selector-button';
+import { TargetSelectorModal } from '../../components/target-selector/target-selector-modal';
 import {
 	isDriveSelected,
 	getImage,
 	getSelectedDrives,
 	deselectDrive,
 	selectDrive,
-	deselectAllDrives,
 } from '../../models/selection-state';
+import * as settings from '../../models/settings';
 import { observe } from '../../models/store';
 import * as analytics from '../../modules/analytics';
-import { TargetSelectorButton } from './target-selector-button';
-
-import TgtSvg from '../../../assets/tgt.svg';
 import DriveSvg from '../../../assets/drive.svg';
-import { warning } from '../../../../shared/messages';
-import type { DrivelistDrive } from '../../../../shared/drive-constraints';
-import * as i18next from 'i18next';
 
 export const getDriveListLabel = () => {
 	return getSelectedDrives()
@@ -45,31 +39,20 @@ export const getDriveListLabel = () => {
 		.join('\n');
 };
 
+const shouldShowDrivesButton = () => {
+	return !settings.getSync('disableExplicitDriveSelection');
+};
+
 const getDriveSelectionStateSlice = () => ({
+	showDrivesButton: shouldShowDrivesButton(),
 	driveListLabel: getDriveListLabel(),
 	targets: getSelectedDrives(),
 	image: getImage(),
 });
 
-export const TargetSelectorModal = (
-	props: Omit<
-		DriveSelectorProps,
-		'titleLabel' | 'emptyListLabel' | 'multipleSelection' | 'emptyListIcon'
-	>,
-) => (
-	<DriveSelector
-		multipleSelection={true}
-		titleLabel={i18next.t('target.selectTarget')}
-		emptyListLabel={i18next.t('target.plugTarget')}
-		emptyListIcon={<TgtSvg width="40px" />}
-		showWarnings={true}
-		selectedList={getSelectedDrives()}
-		updateSelectedList={getSelectedDrives}
-		{...props}
-	/>
-);
-
-export const selectAllTargets = (modalTargets: DrivelistDrive[]) => {
+export const selectAllTargets = (
+	modalTargets: scanner.adapters.DrivelistDrive[],
+) => {
 	const selectedDrivesFromState = getSelectedDrives();
 	const deselected = selectedDrivesFromState.filter(
 		(drive) =>
@@ -96,25 +79,25 @@ export const selectAllTargets = (modalTargets: DrivelistDrive[]) => {
 	});
 };
 
-interface TargetSelectorProps {
+interface DriveSelectorProps {
 	disabled: boolean;
 	hasDrive: boolean;
 	flashing: boolean;
-	hideAnalyticsAlert: () => void;
 }
 
-export const TargetSelector = ({
+export const DriveSelector = ({
 	disabled,
 	hasDrive,
 	flashing,
-	hideAnalyticsAlert,
-}: TargetSelectorProps) => {
+}: DriveSelectorProps) => {
 	// TODO: inject these from redux-connector
-	const [{ driveListLabel, targets }, setStateSlice] = React.useState(
-		getDriveSelectionStateSlice(),
+	const [
+		{ showDrivesButton, driveListLabel, targets, image },
+		setStateSlice,
+	] = React.useState(getDriveSelectionStateSlice());
+	const [showTargetSelectorModal, setShowTargetSelectorModal] = React.useState(
+		false,
 	);
-	const [showTargetSelectorModal, setShowTargetSelectorModal] =
-		React.useState(false);
 
 	React.useEffect(() => {
 		return observe(() => {
@@ -122,7 +105,6 @@ export const TargetSelector = ({
 		});
 	}, []);
 
-	const hasSystemDrives = targets.some((target) => target.isSystem);
 	return (
 		<Flex flexDirection="column" alignItems="center">
 			<DriveSvg
@@ -133,13 +115,12 @@ export const TargetSelector = ({
 				}}
 			/>
 
-			<TargetSelectorButton
+			<TargetSelector
 				disabled={disabled}
-				show={!hasDrive}
+				show={!hasDrive && showDrivesButton}
 				tooltip={driveListLabel}
 				openDriveSelector={() => {
 					setShowTargetSelectorModal(true);
-					hideAnalyticsAlert();
 				}}
 				reselectDrive={() => {
 					analytics.logEvent('Reselect drive');
@@ -147,48 +128,17 @@ export const TargetSelector = ({
 				}}
 				flashing={flashing}
 				targets={targets}
+				image={image}
 			/>
 
-			{hasSystemDrives ? (
-				<Txt
-					color="#fca321"
-					style={{
-						position: 'absolute',
-						bottom: '25px',
-					}}
-				>
-					Warning: {warning.systemDrive()}
-				</Txt>
-			) : null}
-
 			{showTargetSelectorModal && (
 				<TargetSelectorModal
-					write={true}
-					cancel={(originalList) => {
-						if (originalList.length) {
-							selectAllTargets(originalList);
-						} else {
-							deselectAllDrives();
-						}
-						setShowTargetSelectorModal(false);
-					}}
+					cancel={() => setShowTargetSelectorModal(false)}
 					done={(modalTargets) => {
-						if (modalTargets.length === 0) {
-							deselectAllDrives();
-						}
+						selectAllTargets(modalTargets);
 						setShowTargetSelectorModal(false);
 					}}
-					onSelect={(drive) => {
-						if (
-							getSelectedDrives().find(
-								(selectedDrive) => selectedDrive.device === drive.device,
-							)
-						) {
-							return deselectDrive(drive.device);
-						}
-						selectDrive(drive.device);
-					}}
-				/>
+				></TargetSelectorModal>
 			)}
 		</Flex>
 	);

lib/gui/app/pages/main/Flash.tsx

@@ -18,29 +18,44 @@ import CircleSvg from '@fortawesome/fontawesome-free/svgs/solid/circle.svg';
 import * as _ from 'lodash';
 import * as path from 'path';
 import * as React from 'react';
-import { Flex, Modal as SmallModal, Txt } from 'rendition';
+import { Flex, Modal, Txt } from 'rendition';
 
 import * as constraints from '../../../../shared/drive-constraints';
 import * as messages from '../../../../shared/messages';
 import { ProgressButton } from '../../components/progress-button/progress-button';
+import { SourceOptions } from '../../components/source-selector/source-selector';
+import { TargetSelectorModal } from '../../components/target-selector/target-selector-modal';
 import * as availableDrives from '../../models/available-drives';
 import * as flashState from '../../models/flash-state';
 import * as selection from '../../models/selection-state';
 import * as analytics from '../../modules/analytics';
+import { scanner as driveScanner } from '../../modules/drive-scanner';
 import * as imageWriter from '../../modules/image-writer';
 import * as notification from '../../os/notification';
-import {
-	selectAllTargets,
-	TargetSelectorModal,
-} from '../../components/target-selector/target-selector';
+import { selectAllTargets } from './DriveSelector';
 
 import FlashSvg from '../../../assets/flash.svg';
-import DriveStatusWarningModal from '../../components/drive-status-warning-modal/drive-status-warning-modal';
-import * as i18next from 'i18next';
 
 const COMPLETED_PERCENTAGE = 100;
 const SPEED_PRECISION = 2;
 
+const getWarningMessages = (drives: any, image: any) => {
+	const warningMessages = [];
+	for (const drive of drives) {
+		if (constraints.isDriveSizeLarge(drive)) {
+			warningMessages.push(messages.warning.largeDriveSize(drive));
+		} else if (!constraints.isDriveSizeRecommended(drive, image)) {
+			warningMessages.push(
+				messages.warning.unrecommendedDriveSize(image, drive),
+			);
+		}
+
+		// TODO(Shou): we should consider adding the same warning dialog for system drives and remove unsafe mode
+	}
+
+	return warningMessages;
+};
+
 const getErrorMessageFromCode = (errorCode: string) => {
 	// TODO: All these error codes to messages translations
 	// should go away if the writer emitted user friendly
@@ -59,62 +74,48 @@ const getErrorMessageFromCode = (errorCode: string) => {
 	return '';
 };
 
-function notifySuccess(
-	iconPath: string,
-	basename: string,
-	drives: any,
-	devices: { successful: number; failed: number },
-) {
-	notification.send(
-		'Flash complete!',
-		messages.info.flashComplete(basename, drives, devices),
-		iconPath,
-	);
-}
-
-function notifyFailure(iconPath: string, basename: string, drives: any) {
-	notification.send(
-		'Oops! Looks like the flash failed.',
-		messages.error.flashFailure(basename, drives),
-		iconPath,
-	);
-}
-
 async function flashImageToDrive(
 	isFlashing: boolean,
 	goToSuccess: () => void,
+	sourceOptions: SourceOptions,
 ): Promise<string> {
 	const devices = selection.getSelectedDevices();
 	const image: any = selection.getImage();
-	const drives = availableDrives.getDrives().filter((drive: any) => {
-		return devices.includes(drive.device);
+	const drives = _.filter(availableDrives.getDrives(), (drive: any) => {
+		return _.includes(devices, drive.device);
 	});
 
 	if (drives.length === 0 || isFlashing) {
 		return '';
 	}
 
+	// Stop scanning drives when flashing
+	// otherwise Windows throws EPERM
+	driveScanner.stop();
+
 	const iconPath = path.join('media', 'icon.png');
 	const basename = path.basename(image.path);
 	try {
-		await imageWriter.flash(image, drives);
+		await imageWriter.flash(image.path, drives, sourceOptions);
 		if (!flashState.wasLastFlashCancelled()) {
-			const {
-				results = { devices: { successful: 0, failed: 0 } },
-				skip,
-				cancelled,
-			} = flashState.getFlashResults();
-			if (!skip && !cancelled) {
-				if (results?.devices?.successful > 0) {
-					notifySuccess(iconPath, basename, drives, results.devices);
-				} else {
-					notifyFailure(iconPath, basename, drives);
-				}
-			}
+			const flashResults: any = flashState.getFlashResults();
+			notification.send(
+				'Flash complete!',
+				messages.info.flashComplete(
+					basename,
+					drives as any,
+					flashResults.results.devices,
+				),
+				iconPath,
+			);
 			goToSuccess();
 		}
-	} catch (error: any) {
-		notifyFailure(iconPath, basename, drives);
+	} catch (error) {
+		notification.send(
+			'Oops! Looks like the flash failed.',
+			messages.error.flashFailure(path.basename(image.path), drives),
+			iconPath,
+		);
 		let errorMessage = getErrorMessageFromCode(error.code);
 		if (!errorMessage) {
 			error.image = basename;
@@ -124,13 +125,14 @@ async function flashImageToDrive(
 		return errorMessage;
 	} finally {
 		availableDrives.setDrives([]);
+		driveScanner.start();
 	}
 
 	return '';
 }
 
 const formatSeconds = (totalSeconds: number) => {
-	if (typeof totalSeconds !== 'number' || !Number.isFinite(totalSeconds)) {
+	if (!totalSeconds && !_.isNumber(totalSeconds)) {
 		return '';
 	}
 	const minutes = Math.floor(totalSeconds / 60);
@@ -142,6 +144,7 @@ const formatSeconds = (totalSeconds: number) => {
 interface FlashStepProps {
 	shouldFlashStepBeDisabled: boolean;
 	goToSuccess: () => void;
+	source: SourceOptions;
 	isFlashing: boolean;
 	style?: React.CSSProperties;
 	// TODO: factorize
@@ -151,19 +154,12 @@ interface FlashStepProps {
 	failed: number;
 	speed?: number;
 	eta?: number;
-	width: string;
-}
-
-export interface DriveWithWarnings extends constraints.DrivelistDrive {
-	statuses: constraints.DriveStatus[];
 }
 
 interface FlashStepState {
-	warningMessage: boolean;
+	warningMessages: string[];
 	errorMessage: string;
 	showDriveSelectorModal: boolean;
-	systemDrives: boolean;
-	drivesWithWarnings: DriveWithWarnings[];
 }
 
 export class FlashStep extends React.PureComponent<
@@ -173,16 +169,14 @@ export class FlashStep extends React.PureComponent<
 	constructor(props: FlashStepProps) {
 		super(props);
 		this.state = {
-			warningMessage: false,
+			warningMessages: [],
 			errorMessage: '',
 			showDriveSelectorModal: false,
-			systemDrives: false,
-			drivesWithWarnings: [],
 		};
 	}
 
 	private async handleWarningResponse(shouldContinue: boolean) {
-		this.setState({ warningMessage: false });
+		this.setState({ warningMessages: [] });
 		if (!shouldContinue) {
 			this.setState({ showDriveSelectorModal: true });
 			return;
@@ -191,6 +185,7 @@ export class FlashStep extends React.PureComponent<
 			errorMessage: await flashImageToDrive(
 				this.props.isFlashing,
 				this.props.goToSuccess,
+				this.props.source,
 			),
 		});
 	}
@@ -205,49 +200,35 @@ export class FlashStep extends React.PureComponent<
 		}
 	}
 
-	private hasListWarnings(drives: any[]) {
+	private hasListWarnings(drives: any[], image: any) {
 		if (drives.length === 0 || flashState.isFlashing()) {
 			return;
 		}
-		return drives.filter((drive) => drive.isSystem).length > 0;
+		return constraints.hasListDriveImageCompatibilityStatus(drives, image);
 	}
 
 	private async tryFlash() {
-		const drives = selection.getSelectedDrives().map((drive) => {
-			return {
-				...drive,
-				statuses: constraints.getDriveImageCompatibilityStatuses(
-					drive,
-					undefined,
-					true,
-				),
-			};
-		});
+		const devices = selection.getSelectedDevices();
+		const image = selection.getImage();
+		const drives = _.filter(
+			availableDrives.getDrives(),
+			(drive: { device: string }) => {
+				return _.includes(devices, drive.device);
+			},
+		);
 		if (drives.length === 0 || this.props.isFlashing) {
 			return;
 		}
-		const hasDangerStatus = drives.some((drive) => drive.statuses.length > 0);
+		const hasDangerStatus = this.hasListWarnings(drives, image);
 		if (hasDangerStatus) {
-			const systemDrives = drives.some((drive) =>
-				drive.statuses.includes(constraints.statuses.system),
-			);
-			this.setState({
-				systemDrives,
-				drivesWithWarnings: drives.filter((driveWithWarnings) => {
-					return (
-						driveWithWarnings.isSystem ||
-						(!systemDrives &&
-							driveWithWarnings.statuses.includes(constraints.statuses.large))
-					);
-				}),
-				warningMessage: true,
-			});
+			this.setState({ warningMessages: getWarningMessages(drives, image) });
 			return;
 		}
 		this.setState({
 			errorMessage: await flashImageToDrive(
 				this.props.isFlashing,
 				this.props.goToSuccess,
+				this.props.source,
 			),
 		});
 	}
@@ -258,7 +239,6 @@ export class FlashStep extends React.PureComponent<
 				<Flex
 					flexDirection="column"
 					alignItems="start"
-					width={this.props.width}
 					style={this.props.style}
 				>
 					<FlashSvg
@@ -276,8 +256,13 @@ export class FlashStep extends React.PureComponent<
 						position={this.props.position}
 						disabled={this.props.shouldFlashStepBeDisabled}
 						cancel={imageWriter.cancel}
-						warning={this.hasListWarnings(selection.getSelectedDrives())}
-						callback={() => this.tryFlash()}
+						warning={this.hasListWarnings(
+							selection.getSelectedDrives(),
+							selection.getImage(),
+						)}
+						callback={() => {
+							this.tryFlash();
+						}}
 					/>
 
 					{!_.isNil(this.props.speed) &&
@@ -288,17 +273,11 @@ export class FlashStep extends React.PureComponent<
 								color="#7e8085"
 								width="100%"
 							>
-								<Txt>
-									{i18next.t('flash.speedShort', {
-										speed: this.props.speed.toFixed(SPEED_PRECISION),
-									})}
-								</Txt>
+								{!_.isNil(this.props.speed) && (
+									<Txt>{this.props.speed.toFixed(SPEED_PRECISION)} MB/s</Txt>
+								)}
 								{!_.isNil(this.props.eta) && (
-									<Txt>
-										{i18next.t('flash.eta', {
-											eta: formatSeconds(this.props.eta),
-										})}
-									</Txt>
+									<Txt>ETA: {formatSeconds(this.props.eta)}</Txt>
 								)}
 							</Flex>
 						)}
@@ -312,17 +291,28 @@ export class FlashStep extends React.PureComponent<
 					)}
 				</Flex>
 
-				{this.state.warningMessage && (
-					<DriveStatusWarningModal
-						done={() => this.handleWarningResponse(true)}
+				{this.state.warningMessages.length > 0 && (
+					<Modal
+						width={400}
+						titleElement={'Attention'}
 						cancel={() => this.handleWarningResponse(false)}
-						isSystem={this.state.systemDrives}
-						drivesWithWarnings={this.state.drivesWithWarnings}
-					/>
+						done={() => this.handleWarningResponse(true)}
+						cancelButtonProps={{
+							children: 'Change',
+						}}
+						action={'Continue'}
+						primaryButtonProps={{ primary: false, warning: true }}
+					>
+						{_.map(this.state.warningMessages, (message, key) => (
+							<Txt key={key} whitespace="pre-line" mt={2}>
+								{message}
+							</Txt>
+						))}
+					</Modal>
 				)}
 
 				{this.state.errorMessage && (
-					<SmallModal
+					<Modal
 						width={400}
 						titleElement={'Attention'}
 						cancel={() => this.handleFlashErrorResponse(false)}
@@ -330,21 +320,20 @@ export class FlashStep extends React.PureComponent<
 						action={'Retry'}
 					>
 						<Txt>
-							{this.state.errorMessage.split('\n').map((message, key) => (
+							{_.map(this.state.errorMessage.split('\n'), (message, key) => (
 								<p key={key}>{message}</p>
 							))}
 						</Txt>
-					</SmallModal>
+					</Modal>
 				)}
 				{this.state.showDriveSelectorModal && (
 					<TargetSelectorModal
-						write={true}
 						cancel={() => this.setState({ showDriveSelectorModal: false })}
 						done={(modalTargets) => {
 							selectAllTargets(modalTargets);
 							this.setState({ showDriveSelectorModal: false });
 						}}
-					/>
+					></TargetSelectorModal>
 				)}
 			</>
 		);

lib/gui/app/pages/main/MainPage.tsx

@@ -14,21 +14,24 @@
  * limitations under the License.
  */
 
-import CogSvg from '@fortawesome/fontawesome-free/svgs/solid/gear.svg';
-import CloseSvg from '@fortawesome/fontawesome-free/svgs/solid/x.svg';
-import QuestionCircleSvg from '@fortawesome/fontawesome-free/svgs/solid/circle-question.svg';
+import CogSvg from '@fortawesome/fontawesome-free/svgs/solid/cog.svg';
+import QuestionCircleSvg from '@fortawesome/fontawesome-free/svgs/solid/question-circle.svg';
 
+import { sourceDestination } from 'etcher-sdk';
+import * as _ from 'lodash';
 import * as path from 'path';
-import prettyBytes from 'pretty-bytes';
 import * as React from 'react';
-import { Alert, Flex, Link } from 'rendition';
+import { Flex } from 'rendition';
 import styled from 'styled-components';
 
 import FinishPage from '../../components/finish/finish';
 import { ReducedFlashingInfos } from '../../components/reduced-flashing-infos/reduced-flashing-infos';
+import { SafeWebview } from '../../components/safe-webview/safe-webview';
 import { SettingsModal } from '../../components/settings/settings';
-import { SourceSelector } from '../../components/source-selector/source-selector';
-import type { SourceMetadata } from '../../../../shared/typings/source-selector';
+import {
+	SourceOptions,
+	SourceSelector,
+} from '../../components/source-selector/source-selector';
 import * as flashState from '../../models/flash-state';
 import * as selectionState from '../../models/selection-state';
 import * as settings from '../../models/settings';
@@ -36,19 +39,15 @@ import { observe } from '../../models/store';
 import { open as openExternal } from '../../os/open-external/services/open-external';
 import {
 	IconButton as BaseIcon,
-	IconButton,
 	ThemedProvider,
 } from '../../styled-components';
 
-import {
-	TargetSelector,
-	getDriveListLabel,
-} from '../../components/target-selector/target-selector';
+import { bytesToClosestUnit } from '../../../../shared/units';
+
+import { DriveSelector, getDriveListLabel } from './DriveSelector';
 import { FlashStep } from './Flash';
 
 import EtcherSvg from '../../../assets/etcher.svg';
-import { SafeWebview } from '../../components/safe-webview/safe-webview';
-import { theme } from '../../theme';
 
 const Icon = styled(BaseIcon)`
 	margin-right: 20px;
@@ -68,16 +67,14 @@ function getDrivesTitle() {
 	return `${drives.length} Targets`;
 }
 
-function getImageBasename(image?: SourceMetadata) {
-	if (image === undefined) {
+function getImageBasename() {
+	if (!selectionState.hasImage()) {
 		return '';
 	}
 
-	if (image.drive) {
-		return image.drive.description;
-	}
-	const imageBasename = path.basename(image.path);
-	return image.name || imageBasename;
+	const selectionImageName = selectionState.getImageName();
+	const imageBasename = path.basename(selectionState.getImagePath());
+	return selectionImageName || imageBasename;
 }
 
 const StepBorder = styled.div<{
@@ -100,15 +97,13 @@ const StepBorder = styled.div<{
 	margin-left: ${(props) => (props.right ? '-120px' : undefined)};
 `;
 
-const ANALYTICS_ALERT_VISIBILITY_KEY = 'analytics_alert_visible';
-
 interface MainPageStateFromStore {
 	isFlashing: boolean;
 	hasImage: boolean;
 	hasDrive: boolean;
-	imageLogo?: string;
-	imageSize?: number;
-	imageName?: string;
+	imageLogo: string;
+	imageSize: number;
+	imageName: string;
 	driveTitle: string;
 	driveLabel: string;
 }
@@ -117,35 +112,36 @@ interface MainPageState {
 	current: 'main' | 'success';
 	isWebviewShowing: boolean;
 	hideSettings: boolean;
+	source: SourceOptions;
 	featuredProjectURL?: string;
-	analyticsAlertIsVisible: boolean;
 }
 
 export class MainPage extends React.Component<
-	object,
+	{},
 	MainPageState & MainPageStateFromStore
 > {
-	constructor(props: object) {
+	constructor(props: {}) {
 		super(props);
 		this.state = {
 			current: 'main',
 			isWebviewShowing: false,
 			hideSettings: true,
-			analyticsAlertIsVisible:
-				localStorage.getItem(ANALYTICS_ALERT_VISIBILITY_KEY) !== 'false',
+			source: {
+				imagePath: '',
+				SourceType: sourceDestination.File,
+			},
 			...this.stateHelper(),
 		};
 	}
 
 	private stateHelper(): MainPageStateFromStore {
-		const image = selectionState.getImage();
 		return {
 			isFlashing: flashState.isFlashing(),
 			hasImage: selectionState.hasImage(),
 			hasDrive: selectionState.hasDrive(),
-			imageLogo: image?.logo,
-			imageSize: image?.size,
-			imageName: getImageBasename(selectionState.getImage()),
+			imageLogo: selectionState.getImageLogo(),
+			imageSize: selectionState.getImageSize(),
+			imageName: getImageBasename(),
 			driveTitle: getDrivesTitle(),
 			driveLabel: getDriveListLabel(),
 		};
@@ -154,20 +150,13 @@ export class MainPage extends React.Component<
 	private async getFeaturedProjectURL() {
 		const url = new URL(
 			(await settings.get('featuredProjectEndpoint')) ||
-				'https://efp.balena.io/index.html',
+				'https://assets.balena.io/etcher-featured/index.html',
 		);
 		url.searchParams.append('borderRight', 'false');
 		url.searchParams.append('darkBackground', 'true');
 		return url.toString();
 	}
 
-	private hideAnalyticsAlert = () => {
-		if (this.state.analyticsAlertIsVisible) {
-			localStorage.setItem(ANALYTICS_ALERT_VISIBILITY_KEY, 'false');
-			this.setState({ analyticsAlertIsVisible: false });
-		}
-	};
-
 	public async componentDidMount() {
 		observe(() => {
 			this.setState(this.stateHelper());
@@ -175,17 +164,6 @@ export class MainPage extends React.Component<
 		this.setState({ featuredProjectURL: await this.getFeaturedProjectURL() });
 	}
 
-	public componentDidUpdate(
-		_prevProps: object,
-		prevState: Readonly<MainPageState & MainPageStateFromStore>,
-	) {
-		if (this.state.analyticsAlertIsVisible) {
-			if (prevState.hideSettings !== this.state.hideSettings) {
-				this.setState({ analyticsAlertIsVisible: false });
-			}
-		}
-	}
-
 	private renderMain() {
 		const state = flashState.getFlashState();
 		const shouldDriveStepBeDisabled = !this.state.hasImage;
@@ -194,28 +172,90 @@ export class MainPage extends React.Component<
 		const notFlashingOrSplitView =
 			!this.state.isFlashing || !this.state.isWebviewShowing;
 		return (
-			<Flex
-				m={`110px ${this.state.isWebviewShowing ? 35 : 55}px 18px ${this.state.isWebviewShowing ? 35 : 55}px`}
-				flexDirection="column"
-			>
+			<>
 				<Flex
 					justifyContent="space-between"
-					mb={this.state.analyticsAlertIsVisible ? '0px' : '92px'}
+					alignItems="center"
+					paddingTop="14px"
+					style={{
+						// Allow window to be dragged from header
+						// @ts-ignore
+						'-webkit-app-region': 'drag',
+						position: 'relative',
+						zIndex: 1,
+					}}
+				>
+					<Flex width="100%" />
+					<Flex width="100%" alignItems="center" justifyContent="center">
+						<EtcherSvg
+							width="123px"
+							height="22px"
+							style={{
+								cursor: 'pointer',
+							}}
+							onClick={() =>
+								openExternal('https://www.balena.io/etcher?ref=etcher_footer')
+							}
+							tabIndex={100}
+						/>
+					</Flex>
+
+					<Flex width="100%" alignItems="center" justifyContent="flex-end">
+						<Icon
+							icon={<CogSvg height="1em" fill="currentColor" />}
+							plain
+							tabIndex={5}
+							onClick={() => this.setState({ hideSettings: false })}
+							style={{
+								// Make touch events click instead of dragging
+								'-webkit-app-region': 'no-drag',
+							}}
+						/>
+						{!settings.getSync('disableExternalLinks') && (
+							<Icon
+								icon={<QuestionCircleSvg height="1em" fill="currentColor" />}
+								onClick={() =>
+									openExternal(
+										selectionState.getImageSupportUrl() ||
+											'https://github.com/balena-io/etcher/blob/master/SUPPORT.md',
+									)
+								}
+								tabIndex={6}
+								style={{
+									// Make touch events click instead of dragging
+									'-webkit-app-region': 'no-drag',
+								}}
+							/>
+						)}
+					</Flex>
+				</Flex>
+				{this.state.hideSettings ? null : (
+					<SettingsModal
+						toggleModal={(value: boolean) => {
+							this.setState({ hideSettings: !value });
+						}}
+					/>
+				)}
+
+				<Flex
+					m={`110px ${this.state.isWebviewShowing ? 35 : 55}px`}
+					justifyContent="space-between"
 				>
 					{notFlashingOrSplitView && (
 						<>
 							<SourceSelector
 								flashing={this.state.isFlashing}
-								hideAnalyticsAlert={this.hideAnalyticsAlert}
+								afterSelected={(source: SourceOptions) =>
+									this.setState({ source })
+								}
 							/>
 							<Flex>
 								<StepBorder disabled={shouldDriveStepBeDisabled} left />
 							</Flex>
-							<TargetSelector
+							<DriveSelector
 								disabled={shouldDriveStepBeDisabled}
 								hasDrive={this.state.hasDrive}
 								flashing={this.state.isFlashing}
-								hideAnalyticsAlert={this.hideAnalyticsAlert}
 							/>
 							<Flex>
 								<StepBorder disabled={shouldFlashStepBeDisabled} right />
@@ -239,8 +279,8 @@ export class MainPage extends React.Component<
 								imageLogo={this.state.imageLogo}
 								imageName={this.state.imageName}
 								imageSize={
-									typeof this.state.imageSize === 'number'
-										? prettyBytes(this.state.imageSize)
+									_.isNumber(this.state.imageSize)
+										? (bytesToClosestUnit(this.state.imageSize) as string)
 										: ''
 								}
 								driveTitle={this.state.driveTitle}
@@ -271,9 +311,9 @@ export class MainPage extends React.Component<
 					)}
 
 					<FlashStep
-						width={this.state.isWebviewShowing ? '220px' : '200px'}
 						goToSuccess={() => this.setState({ current: 'success' })}
 						shouldFlashStepBeDisabled={shouldFlashStepBeDisabled}
+						source={this.state.source}
 						isFlashing={this.state.isFlashing}
 						step={state.type}
 						percentage={state.percentage}
@@ -284,119 +324,35 @@ export class MainPage extends React.Component<
 						style={{ zIndex: 1 }}
 					/>
 				</Flex>
-				{this.state.analyticsAlertIsVisible && (
-					<Alert mt="18px" style={{ boxShadow: 'none', fontSize: '12px' }}>
-						<Flex alignItems="center" justifyContent="space-between">
-							<Flex flexDirection="column">
-								<div>
-									Etcher collects a limited amount of anonymous data to help us
-									improve user experience. You can opt out in the{' '}
-									<Link onClick={() => this.setState({ hideSettings: false })}>
-										settings
-									</Link>
-									.
-								</div>
-								<div>
-									For more information about how we use this data, see our{' '}
-									<Link
-										onClick={(e) => {
-											e.stopPropagation();
-											openExternal('https://www.balena.io/privacy-policy');
-										}}
-									>
-										privacy policy
-									</Link>
-									.
-								</div>
-							</Flex>
-							{/* TODO: can we use onDismiss instead? */}
-							<IconButton onClick={this.hideAnalyticsAlert}>
-								<CloseSvg height="0.75rem" fill={theme.colors.text.main} />
-							</IconButton>
-						</Flex>
-					</Alert>
-				)}
-			</Flex>
+			</>
 		);
 	}
 
 	private renderSuccess() {
 		return (
-			<FinishPage
-				goToMain={() => {
-					flashState.resetState();
-					this.setState({ current: 'main' });
-				}}
-			/>
+			<Flex flexDirection="column" alignItems="center" height="100%">
+				<FinishPage
+					goToMain={() => {
+						flashState.resetState();
+						this.setState({ current: 'main' });
+					}}
+				/>
+				<SafeWebview
+					src="https://www.balena.io/etcher/success-banner/"
+					style={{
+						width: '100%',
+						height: '320px',
+						position: 'absolute',
+						bottom: 0,
+					}}
+				/>
+			</Flex>
 		);
 	}
 
 	public render() {
 		return (
 			<ThemedProvider style={{ height: '100%', width: '100%' }}>
-				<Flex
-					justifyContent="space-between"
-					alignItems="center"
-					paddingTop="14px"
-					style={{
-						// Allow window to be dragged from header
-						// @ts-ignore
-						WebkitAppRegion: 'drag',
-						position: 'relative',
-						zIndex: 2,
-					}}
-				>
-					<Flex width="100%" />
-					<Flex width="100%" alignItems="center" justifyContent="center">
-						<EtcherSvg
-							width="123px"
-							height="22px"
-							style={{
-								cursor: 'pointer',
-							}}
-							onClick={() =>
-								openExternal('https://www.balena.io/etcher?ref=etcher_footer')
-							}
-							tabIndex={100}
-						/>
-					</Flex>
-
-					<Flex width="100%" alignItems="center" justifyContent="flex-end">
-						<Icon
-							icon={<CogSvg height="1em" fill="currentColor" />}
-							plain
-							tabIndex={5}
-							onClick={() => this.setState({ hideSettings: false })}
-							style={{
-								// Make touch events click instead of dragging
-								WebkitAppRegion: 'no-drag',
-							}}
-						/>
-						{!settings.getSync('disableExternalLinks') && (
-							<Icon
-								icon={<QuestionCircleSvg height="1em" fill="currentColor" />}
-								onClick={() =>
-									openExternal(
-										selectionState.getImage()?.supportUrl ||
-											'https://github.com/balena-io/etcher/blob/master/docs/SUPPORT.md',
-									)
-								}
-								tabIndex={6}
-								style={{
-									// Make touch events click instead of dragging
-									WebkitAppRegion: 'no-drag',
-								}}
-							/>
-						)}
-					</Flex>
-				</Flex>
-				{this.state.hideSettings ? null : (
-					<SettingsModal
-						toggleModal={(value: boolean) => {
-							this.setState({ hideSettings: !value });
-						}}
-					/>
-				)}
 				{this.state.current === 'main'
 					? this.renderMain()
 					: this.renderSuccess()}

lib/gui/app/preload.ts

@@ -1,12 +0,0 @@
-// See the Electron documentation for details on how to use preload scripts:
-// https://www.electronjs.org/docs/latest/tutorial/process-model#preload-scripts
-
-import * as webapi from '../webapi';
-
-declare global {
-	interface Window {
-		etcher: typeof webapi;
-	}
-}
-
-window['etcher'] = webapi;

lib/gui/app/renderer.ts

@@ -1,9 +0,0 @@
-// @ts-nocheck
-import { main } from './app';
-import './i18n';
-import { langParser } from './i18n';
-import { ipcRenderer } from 'electron';
-
-ipcRenderer.send('change-lng', langParser());
-
-main();

lib/gui/app/styled-components.tsx

@@ -15,26 +15,34 @@
  */
 
 import * as React from 'react';
-import type {
-	FlexProps,
-	ButtonProps,
-	TableProps as BaseTableProps,
-} from 'rendition';
 import {
-	Alert as AlertBase,
 	Flex,
+	FlexProps,
 	Button,
+	ButtonProps,
 	Modal as ModalBase,
 	Provider,
-	Table as BaseTable,
 	Txt,
+	Theme as renditionTheme,
 } from 'rendition';
-import styled, { css } from 'styled-components';
+import styled from 'styled-components';
 
 import { colors, theme } from './theme';
 
+const defaultTheme = {
+	...renditionTheme,
+	...theme,
+	layer: {
+		extend: () => `
+			> div:first-child {
+				background-color: transparent;
+			}
+		`,
+	},
+};
+
 export const ThemedProvider = (props: any) => (
-	<Provider theme={theme} {...props}></Provider>
+	<Provider theme={defaultTheme} {...props}></Provider>
 );
 
 export const BaseButton = styled(Button)`
@@ -60,7 +68,6 @@ export const StepButton = styled((props: ButtonProps) => (
 	<BaseButton {...props}></BaseButton>
 ))`
 	color: #ffffff;
-	font-size: 14px;
 `;
 
 export const ChangeButton = styled(Button)`
@@ -86,7 +93,7 @@ export const StepNameButton = styled(BaseButton)`
 	justify-content: center;
 	align-items: center;
 	width: 100%;
-	font-weight: normal;
+	font-weight: bold;
 	color: ${colors.dark.foreground};
 
 	&:enabled {
@@ -112,92 +119,65 @@ export const DetailsText = (props: FlexProps) => (
 	/>
 );
 
-const modalFooterShadowCss = css`
-	overflow: auto;
-	background:
-		0,
-		linear-gradient(rgba(255, 255, 255, 0), white 70%) 0 100%,
-		0,
-		linear-gradient(rgba(255, 255, 255, 0), rgba(221, 225, 240, 0.5) 70%) 0 100%;
-	background-repeat: no-repeat;
-	background-size:
-		100% 40px,
-		100% 40px,
-		100% 8px,
-		100% 8px;
-
-	background-repeat: no-repeat;
-	background-color: white;
-	background-size:
-		100% 40px,
-		100% 40px,
-		100% 8px,
-		100% 8px;
-	background-attachment: local, local, scroll, scroll;
-`;
-
-export const Modal = styled(({ style, children, ...props }) => {
+export const Modal = styled(({ style, ...props }) => {
 	return (
-		<ModalBase
-			position="top"
-			width="97vw"
-			cancelButtonProps={{
-				style: {
-					marginRight: '20px',
-					border: 'solid 1px #2a506f',
+		<Provider
+			theme={{
+				...defaultTheme,
+				header: {
+					height: '50px',
+				},
+				layer: {
+					extend: () => `
+					${defaultTheme.layer.extend()}
+
+					> div:last-child {
+						top: 0;
+					}
+				`,
 				},
 			}}
-			style={{
-				height: '87.5vh',
-				...style,
-			}}
-			{...props}
 		>
-			<ScrollableFlex flexDirection="column" width="100%" height="90%">
-				{children.length ? children.map((c: any) => <>{c}</>) : children}
-			</ScrollableFlex>
-		</ModalBase>
+			<ModalBase
+				position="top"
+				width="96vw"
+				cancelButtonProps={{
+					style: {
+						marginRight: '20px',
+						border: 'solid 1px #2a506f',
+					},
+				}}
+				style={{
+					height: '86.5vh',
+					...style,
+				}}
+				{...props}
+			/>
+		</Provider>
 	);
 })`
 	> div {
-		padding: 0;
-		height: 99%;
+		padding: 24px 30px;
+		height: calc(100% - 80px);
 
-		> div:first-child {
-			height: 81%;
-			padding: 24px 30px 0;
+		::-webkit-scrollbar {
+			display: none;
 		}
 
 		> h3 {
 			margin: 0;
-			padding: 24px 30px 0;
-			height: 14.3%;
-		}
-
-		> div:first-child {
-			height: 81%;
-			padding: 24px 30px 0;
-		}
-
-		> div:nth-child(2) {
-			height: 61%;
-			padding: 0 30px;
-			${modalFooterShadowCss}
 		}
 
 		> div:last-child {
-			margin: 0;
-			flex-direction: ${(props) =>
-				props.reverseFooterButtons ? 'row-reverse' : 'row'};
 			border-radius: 0 0 7px 7px;
 			height: 80px;
 			background-color: #fff;
 			justify-content: center;
+			position: absolute;
+			bottom: 0;
+			left: 0;
 			width: 100%;
-		}
-
-		::-webkit-scrollbar {
-			display: none;
+			box-shadow: 0 -2px 10px 0 rgba(221, 225, 240, 0.5), 0 -1px 0 0 #dde1f0;
 		}
 	}
 `;
@@ -214,122 +194,3 @@ export const ScrollableFlex = styled(Flex)`
 		overflow-x: visible;
 	}
 `;
-
-export const Alert = styled((props) => (
-	<AlertBase warning emphasized {...props}></AlertBase>
-))`
-	position: fixed;
-	top: -40px;
-	left: 50%;
-	transform: translate(-50%, 0px);
-	height: 30px;
-	min-width: 50%;
-	padding: 0px;
-	justify-content: center;
-	align-items: center;
-	font-size: 14px;
-	background-color: #fca321;
-	text-align: center;
-
-	* {
-		color: #ffffff;
-	}
-
-	> div:first-child {
-		display: none;
-	}
-`;
-
-export interface GenericTableProps<T> extends BaseTableProps<T> {
-	refFn: (t: BaseTable<T>) => void;
-	data: T[];
-	checkedRowsNumber?: number;
-	multipleSelection: boolean;
-	showWarnings?: boolean;
-}
-
-function GenericTable<T>(
-	props: GenericTableProps<T>,
-): React.ReactElement<GenericTableProps<T>> {
-	return (
-		<div>
-			<BaseTable<T> ref={props.refFn} {...props} />
-		</div>
-	);
-}
-
-function StyledTable<T>() {
-	return styled((props: GenericTableProps<T>) => (
-		<GenericTable<T> {...props} />
-	))`
-		[data-display='table-head']
-			> [data-display='table-row']
-			> [data-display='table-cell'] {
-			position: sticky;
-			background-color: #f8f9fd;
-			top: 0;
-			z-index: 1;
-
-			input[type='checkbox'] + div {
-				display: ${(props) => (props.multipleSelection ? 'flex' : 'none')};
-
-				${(props) =>
-					props.multipleSelection &&
-					props.checkedRowsNumber !== 0 &&
-					props.checkedRowsNumber !== props.data.length
-						? `
-						font-weight: 600;
-						color: ${colors.primary.foreground};
-						background: ${colors.primary.background};
-
-						::after {
-							content: '–';
-						}
-						`
-						: ''}
-				}
-			}
-		}
-
-		[data-display='table-head'] > [data-display='table-row'],
-		[data-display='table-body'] > [data-display='table-row'] {
-			> [data-display='table-cell']:first-child {
-				padding-left: 15px;
-			}
-
-			> [data-display='table-cell']:last-child {
-				padding-right: 0;
-			}
-		}
-
-		[data-display='table-body'] > [data-display='table-row'] {
-			&:nth-of-type(2n) {
-				background: transparent;
-			}
-
-			&[data-highlight='true'] {
-				&.system {
-					background-color: ${(props) => (props.showWarnings ? '#fff5e6' : '#e8f5fc')};
-				}
-
-				> [data-display='table-cell']:first-child {
-					box-shadow: none;
-				}
-			}
-		}
-
-		&& [data-display='table-row'] > [data-display='table-cell'] {
-			padding: 6px 8px;
-			color: #2a506f;
-		}
-
-		input[type='checkbox'] + div {
-			border-radius: ${(props) => (props.multipleSelection ? '4px' : '50%')};
-		}
-	`;
-}
-
-export const Table = <T extends object>(props: GenericTableProps<T>) => {
-	const TypedStyledFunctional = StyledTable<T>();
-	return <TypedStyledFunctional {...props} />;
-};

lib/gui/app/theme.ts

@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-import * as _ from 'lodash';
-import { Theme } from 'rendition';
-
 export const colors = {
 	dark: {
 		foreground: '#fff',
@@ -70,12 +67,9 @@ export const colors = {
 
 const font = 'SourceSansPro';
 
-export const theme = _.merge({}, Theme, {
+export const theme = {
 	colors,
 	font,
-	header: {
-		height: '40px',
-	},
 	global: {
 		font: {
 			family: font,
@@ -96,31 +90,22 @@ export const theme = _.merge({}, Theme, {
 			opacity: 1,
 		},
 		extend: () => `
-			width: 200px;
-			font-size: 16px;
-
 			&& {
 				width: 200px;
 				height: 48px;
-			}
+				font-size: 16px;
 
-			:disabled {
-				background-color: ${colors.dark.disabled.background};
-				color: ${colors.dark.disabled.foreground};
-				opacity: 1;
-
-				:hover {
+				:disabled {
 					background-color: ${colors.dark.disabled.background};
 					color: ${colors.dark.disabled.foreground};
+					opacity: 1;
+
+					:hover {
+						background-color: ${colors.dark.disabled.background};
+						color: ${colors.dark.disabled.foreground};
+					}
 				}
 			}
 		`,
 	},
-	layer: {
-		extend: () => `
-			> div:first-child {
-				background-color: transparent;
-			}
-		`,
-	},
-});
+};

lib/gui/app/utils/etcher-pro-specific.ts

@@ -1,73 +0,0 @@
-/*
- * Copyright 2022 balena.io
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import type { Dictionary } from 'lodash';
-
-type BalenaTag = {
-	id: number;
-	name: string;
-	value: string;
-};
-
-export class EtcherPro {
-	private supervisorAddr: string;
-	private supervisorKey: string;
-	private tags: Dictionary<string> | undefined;
-	public uuid: string;
-
-	constructor(supervisorAddr: string, supervisorKey: string) {
-		this.supervisorAddr = supervisorAddr;
-		this.supervisorKey = supervisorKey;
-		this.uuid = (process.env.BALENA_DEVICE_UUID ?? 'NO-UUID').substring(0, 7);
-		this.tags = undefined;
-		this.get_tags().then((tags) => (this.tags = tags));
-	}
-
-	async get_tags(): Promise<Dictionary<string>> {
-		const result = await fetch(
-			this.supervisorAddr + '/v2/device/tags?apikey=' + this.supervisorKey,
-		);
-		const parsed = await result.json();
-		if (parsed['status'] === 'success') {
-			return Object.assign(
-				{},
-				...parsed['tags'].map((tag: BalenaTag) => {
-					return { [tag.name]: tag.value };
-				}),
-			);
-		} else {
-			return {};
-		}
-	}
-
-	public get_serial(): string | undefined {
-		if (this.tags) {
-			return this.tags['Serial'];
-		} else {
-			return undefined;
-		}
-	}
-}
-
-export function etcherProInfo(): EtcherPro | undefined {
-	const BALENA_SUPERVISOR_ADDRESS = process.env.BALENA_SUPERVISOR_ADDRESS;
-	const BALENA_SUPERVISOR_API_KEY = process.env.BALENA_SUPERVISOR_API_KEY;
-
-	if (BALENA_SUPERVISOR_ADDRESS && BALENA_SUPERVISOR_API_KEY) {
-		return new EtcherPro(BALENA_SUPERVISOR_ADDRESS, BALENA_SUPERVISOR_API_KEY);
-	}
-	return undefined;
-}

lib/gui/assets/src.svg

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 39 90" xmlns="http://www.w3.org/2000/svg">
-<g fill="none" fill-rule="evenodd">
-<g transform="translate(-380 -166)">
-<g transform="translate(380 166)">
-<path d="m30.88 39.87h-23.363v23.209c0 0.6909 0.56062 1.251 1.251 1.251h20.861c0.69114 0 1.251-0.55986 1.251-1.251v-23.209zm-22.363 0.9999h21.363l4e-4 22.209c0 0.13886-0.11214 0.251-0.251 0.251h-20.861l-0.057452-0.0066403c-0.11075-0.026055-0.19355-0.12572-0.19355-0.24436l-4e-4 -22.209z" fill="#2A506F" fill-rule="nonzero"/>
-<path d="m16.558 48.924h-3.967c-0.58314 0-1.055 0.47186-1.055 1.055v2.732c0 0.58235 0.47206 1.055 1.055 1.055h3.967c0.58223 0 1.054-0.47295 1.054-1.055v-2.732c0-0.58285-0.47156-1.055-1.054-1.055zm-3.967 1h3.967c0.029872 0 0.054 0.024158 0.054 0.055v2.732c0 0.030327-0.024612 0.055-0.054 0.055h-3.967c-0.030373 0-0.055-0.024658-0.055-0.055v-2.732c0-0.030858 0.024142-0.055 0.055-0.055z" fill="#2A506F" fill-rule="nonzero"/>
-<path d="m25.97 48.924h-3.967c-0.58314 0-1.055 0.47186-1.055 1.055v2.732c0 0.58235 0.47206 1.055 1.055 1.055h3.967c0.58223 0 1.054-0.47295 1.054-1.055v-2.732c0-0.58285-0.47156-1.055-1.054-1.055zm-3.967 1h3.967c0.029872 0 0.054 0.024158 0.054 0.055v2.732c0 0.030327-0.024612 0.055-0.054 0.055h-3.967c-0.030373 0-0.055-0.024658-0.055-0.055v-2.732c0-0.030858 0.024142-0.055 0.055-0.055z" fill="#2A506F" fill-rule="nonzero"/>
-<path d="m37.398 5.418v30.534c0 2.43-1.988 4.418-4.418 4.418h-27.562c-2.43 0-4.418-1.988-4.418-4.418v-30.534c0-2.43 1.988-4.418 4.418-4.418h27.562c2.43 0 4.418 1.988 4.418 4.418" fill="#2A506F"/>
-<path d="m32.98-5.6843e-14h-27.562c-2.9823 0-5.418 2.4357-5.418 5.418v30.534c0 2.9823 2.4357 5.418 5.418 5.418h27.562c2.9823 0 5.418-2.4357 5.418-5.418v-30.534c0-2.9823-2.4357-5.418-5.418-5.418zm-27.562 2h27.562c1.8777 0 3.418 1.5403 3.418 3.418v30.534c0 1.8777-1.5403 3.418-3.418 3.418h-27.562c-1.8777 0-3.418-1.5403-3.418-3.418v-30.534c0-1.8777 1.5403-3.418 3.418-3.418z" fill="#2A506F" fill-rule="nonzero"/>
-<path d="m19.147 73.551c0.24546 0 0.44961 0.17688 0.49194 0.41012l0.0080557 0.089876v14.882c0 0.27614-0.22386 0.5-0.5 0.5-0.24546 0-0.44961-0.17688-0.49194-0.41012l-0.0080557-0.089876v-14.882c0-0.27614 0.22386-0.5 0.5-0.5z" fill="#2A506F" fill-rule="nonzero"/>
-<line x1="19.147" x2="14.532" y1="88.933" y2="84.214" stroke="#2A506F" stroke-linecap="round"/>
-<line x1="19.147" x2="23.866" y1="88.933" y2="84.318" stroke="#2A506F" stroke-linecap="round"/>
-<path d="m14.007 26.177c0.51076 0 0.96749-0.071211 1.3702-0.21363s0.74649-0.33887 1.0313-0.58934 0.50339-0.54268 0.65564-0.87664 0.22837-0.69247 0.22837-1.0755c0-0.3536-0.051567-0.66546-0.1547-0.93557s-0.2431-0.50585-0.4199-0.7072-0.38798-0.37816-0.63354-0.5304-0.50585-0.2873-0.78087-0.40517l-1.3702-0.58934c-0.19645-0.078578-0.38798-0.16452-0.5746-0.25783s-0.35851-0.20136-0.51567-0.32413-0.28239-0.2652-0.3757-0.42727-0.13997-0.36097-0.13997-0.5967c0-0.442 0.16452-0.78824 0.49357-1.0387s0.76368-0.3757 1.3039-0.3757c0.45182 0 0.85699 0.081034 1.2155 0.2431s0.6851 0.38552 0.97977 0.67037l0.663-0.7956c-0.34378-0.3536-0.76123-0.6409-1.2523-0.8619s-1.0264-0.3315-1.6059-0.3315c-0.442 0-0.84717 0.063845-1.2155 0.19153s-0.68756 0.30695-0.95767 0.53777-0.48129 0.50339-0.63354 0.8177-0.22837 0.65318-0.22837 1.0166c0 0.3536 0.058934 0.66546 0.1768 0.93557s0.27011 0.50339 0.45674 0.69984 0.3978 0.36342 0.63354 0.50094 0.46656 0.25538 0.69247 0.3536l1.3849 0.60407c0.22591 0.10804 0.43709 0.21118 0.63354 0.3094s0.36588 0.20872 0.5083 0.3315 0.25538 0.27011 0.33887 0.442 0.12523 0.38061 0.12523 0.62617c0 0.47147-0.1768 0.85208-0.5304 1.1418s-0.84963 0.43464-1.4881 0.43464c-0.50094 0-0.98468-0.1105-1.4512-0.3315s-0.87173-0.51321-1.2155-0.87664l-0.73667 0.85454c0.42236 0.442 0.92329 0.79069 1.5028 1.0461s1.2081 0.38307 1.8859 0.38307zm6.2664-0.1768v-4.5968c0.24556-0.60898 0.53286-1.0362 0.8619-1.2818s0.64581-0.36834 0.9503-0.36834c0.14733 0 0.27011 0.0098223 0.36834 0.029467s0.20627 0.049111 0.32413 0.0884l0.23573-1.0608c-0.22591-0.098223-0.48129-0.14733-0.76614-0.14733-0.41254 0-0.79315 0.1326-1.1418 0.3978s-0.64581 0.62371-0.89137 1.0755h-0.0442l-0.10313-1.2965h-1.0019v7.1604h1.2081zm6.5758 0.1768c0.43218 0 0.84471-0.081034 1.2376-0.2431s0.7514-0.38552 1.0755-0.67037l-0.5304-0.81034c-0.22591 0.19645-0.47884 0.36588-0.75877 0.5083s-0.58688 0.21363-0.92084 0.21363c-0.32413 0-0.62371-0.0663-0.89874-0.1989s-0.5083-0.31922-0.69984-0.55987-0.34132-0.52795-0.44937-0.8619-0.16207-0.7072-0.16207-1.1197 0.056478-0.78824 0.16943-1.1271 0.26766-0.63108 0.4641-0.87664 0.43218-0.43464 0.7072-0.56724 0.5746-0.1989 0.89874-0.1989c0.28485 0 0.54268 0.058934 0.7735 0.1768s0.44937 0.27011 0.65564 0.45674l0.6188-0.7956c-0.25538-0.22591-0.55005-0.42236-0.884-0.58934s-0.73667-0.25047-1.2081-0.25047c-0.46165 0-0.90119 0.083489-1.3186 0.25047s-0.78333 0.41254-1.0976 0.73667-0.56478 0.71948-0.7514 1.186-0.27993 0.99942-0.27993 1.5986c0 0.58934 0.085945 1.1173 0.25783 1.5838s0.40762 0.85945 0.7072 1.1787 0.65564 0.56232 1.0682 0.7293 0.85454 0.25047 1.326 0.25047z" fill="#fff" fill-rule="nonzero"/>
-</g>
-</g>
-</g>
-</svg>

lib/gui/etcher.ts

@@ -14,41 +14,25 @@
  * limitations under the License.
  */
 
-// This allows TypeScript to pick up the magic constants that's auto-generated by Forge's Webpack
-// plugin that tells the Electron app where to look for the Webpack-bundled app code (depending on
-// whether you're running in development or production).
-declare const MAIN_WINDOW_WEBPACK_ENTRY: string;
-declare const MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY: string;
-
 import * as electron from 'electron';
-import * as remoteMain from '@electron/remote/main';
 import { autoUpdater } from 'electron-updater';
 import { promises as fs } from 'fs';
 import { platform } from 'os';
 import * as path from 'path';
 import * as semver from 'semver';
-import { once } from 'lodash';
-
-import './app/i18n';
 
 import { packageType, version } from '../../package.json';
 import * as EXIT_CODES from '../shared/exit-codes';
+import { delay, getConfig } from '../shared/utils';
 import * as settings from './app/models/settings';
+import { logException } from './app/modules/analytics';
 import { buildWindowMenu } from './menu';
-import * as i18n from 'i18next';
-import * as SentryMain from '@sentry/electron/main';
-import { anonymizeSentryData } from './app/modules/analytics';
-
-import { delay } from '../shared/utils';
 
 const customProtocol = 'etcher';
 const scheme = `${customProtocol}://`;
 const updatablePackageTypes = ['appimage', 'nsis', 'dmg'];
 const packageUpdatable = updatablePackageTypes.includes(packageType);
 let packageUpdated = false;
-let mainWindow: any = null;
-
-remoteMain.initialize();
 
 async function checkForUpdates(interval: number) {
 	// We use a while loop instead of a setInterval to preserve
@@ -58,28 +42,20 @@ async function checkForUpdates(interval: number) {
 			try {
 				const release = await autoUpdater.checkForUpdates();
 				const isOutdated =
-					semver.compare(release!.updateInfo.version, version) > 0;
-				const shouldUpdate = release!.updateInfo.stagingPercentage !== 0; // undefined (default) means 100%
+					semver.compare(release.updateInfo.version, version) > 0;
+				const shouldUpdate = release.updateInfo.stagingPercentage || 0 > 0;
 				if (shouldUpdate && isOutdated) {
 					await autoUpdater.downloadUpdate();
 					packageUpdated = true;
 				}
 			} catch (err) {
-				logMainProcessException(err);
+				logException(err);
 			}
 		}
 		await delay(interval);
 	}
 }
 
-function logMainProcessException(error: any) {
-	const shouldReportErrors = settings.getSync('errorReporting');
-	console.error(error);
-	if (shouldReportErrors) {
-		SentryMain.captureException(error);
-	}
-}
-
 async function isFile(filePath: string): Promise<boolean> {
 	try {
 		const stat = await fs.stat(filePath);
@@ -114,18 +90,6 @@ async function getCommandLineURL(argv: string[]): Promise<string | undefined> {
 	}
 }
 
-const initSentryMain = once(() => {
-	const dsn =
-		settings.getSync('analyticsSentryToken') || process.env.SENTRY_TOKEN;
-
-	SentryMain.init({
-		dsn,
-		beforeSend: anonymizeSentryData,
-		debug: process.env.ETCHER_SENTRY_DEBUG === 'true',
-	});
-	console.log(SentryMain.getCurrentScope());
-});
-
 const sourceSelectorReady = new Promise((resolve) => {
 	electron.ipcMain.on('source-selector-ready', resolve);
 });
@@ -133,7 +97,6 @@ const sourceSelectorReady = new Promise((resolve) => {
 async function selectImageURL(url?: string) {
 	// 'data:,' is the default chromedriver url that is passed as last argument when running spectron tests
 	if (url !== undefined && url !== 'data:,') {
-		url = url.replace(/\/$/, ''); // on windows the url ends with an extra slash
 		url = url.startsWith(scheme) ? url.slice(scheme.length) : url;
 		await sourceSelectorReady;
 		electron.BrowserWindow.getAllWindows().forEach((window) => {
@@ -149,20 +112,28 @@ electron.app.on('open-url', async (event, data) => {
 	await selectImageURL(data);
 });
 
+interface AutoUpdaterConfig {
+	autoDownload?: boolean;
+	autoInstallOnAppQuit?: boolean;
+	allowPrerelease?: boolean;
+	fullChangelog?: boolean;
+	allowDowngrade?: boolean;
+}
+
 async function createMainWindow() {
 	const fullscreen = Boolean(await settings.get('fullscreen'));
-	const defaultWidth = settings.DEFAULT_WIDTH;
-	const defaultHeight = settings.DEFAULT_HEIGHT;
+	const defaultWidth = 800;
+	const defaultHeight = 480;
 	let width = defaultWidth;
 	let height = defaultHeight;
 	if (fullscreen) {
 		({ width, height } = electron.screen.getPrimaryDisplay().bounds);
 	}
-	mainWindow = new electron.BrowserWindow({
+	const mainWindow = new electron.BrowserWindow({
 		width,
 		height,
 		frame: !fullscreen,
-		useContentSize: true,
+		useContentSize: false,
 		show: false,
 		resizable: false,
 		maximizable: false,
@@ -176,56 +147,61 @@ async function createMainWindow() {
 		webPreferences: {
 			backgroundThrottling: false,
 			nodeIntegration: true,
-			contextIsolation: false,
 			webviewTag: true,
 			zoomFactor: width / defaultWidth,
-			preload: MAIN_WINDOW_PRELOAD_WEBPACK_ENTRY,
+			enableRemoteModule: true,
 		},
 	});
 
 	electron.app.setAsDefaultProtocolClient(customProtocol);
 
-	// mainWindow.setFullScreen(true);
+	buildWindowMenu(mainWindow);
+	mainWindow.setFullScreen(true);
 
 	// Prevent flash of white when starting the application
-	mainWindow.once('ready-to-show', () => {
+	mainWindow.on('ready-to-show', () => {
 		console.timeEnd('ready-to-show');
-		// Electron sometimes caches the zoomFactor
-		// making it obnoxious to switch back-and-forth
-		mainWindow.webContents.setZoomFactor(width / defaultWidth);
 		mainWindow.show();
 	});
 
 	// Prevent external resources from being loaded (like images)
 	// when dropping them on the WebView.
 	// See https://github.com/electron/electron/issues/5919
-	mainWindow.webContents.on('will-navigate', (event: any) => {
+	mainWindow.webContents.on('will-navigate', (event) => {
 		event.preventDefault();
 	});
 
-	mainWindow.loadURL(MAIN_WINDOW_WEBPACK_ENTRY);
+	mainWindow.loadURL(`file://${path.join(__dirname, 'index.html')}`);
 
 	const page = mainWindow.webContents;
-	remoteMain.enable(page);
 
 	page.once('did-frame-finish-load', async () => {
-		console.log('packageUpdatable', packageUpdatable);
 		autoUpdater.on('error', (err) => {
-			logMainProcessException(err);
+			logException(err);
 		});
 		if (packageUpdatable) {
 			try {
-				const checkForUpdatesTimer = 300000;
+				const configUrl = await settings.get('configUrl');
+				const onlineConfig = await getConfig(configUrl);
+				const autoUpdaterConfig: AutoUpdaterConfig = onlineConfig?.autoUpdates
+					?.autoUpdaterConfig ?? {
+					autoDownload: false,
+				};
+				for (const [key, value] of Object.entries(autoUpdaterConfig)) {
+					autoUpdater[key as keyof AutoUpdaterConfig] = value;
+				}
+				const checkForUpdatesTimer =
+					onlineConfig?.autoUpdates?.checkForUpdatesTimer ?? 300000;
 				checkForUpdates(checkForUpdatesTimer);
 			} catch (err) {
-				logMainProcessException(err);
+				logException(err);
 			}
 		}
 	});
-
 	return mainWindow;
 }
 
+electron.app.allowRendererProcessReuse = false;
 electron.app.on('window-all-closed', electron.app.quit);
 
 // Sending a `SIGINT` (e.g: Ctrl-C) to an Electron app that registers
@@ -239,25 +215,10 @@ electron.app.on('before-quit', () => {
 	process.exit(EXIT_CODES.SUCCESS);
 });
 
-// this is replaced at build-time with the path to helper binary,
-// relative to the app resources directory.
-declare const ETCHER_UTIL_BIN_PATH: string;
-
-electron.ipcMain.handle('get-util-path', () => {
-	if (process.env.NODE_ENV === 'development') {
-		// In development there is no "app bundle" and we're working directly with
-		// artifacts from the "out" directory, where this value point to.
-		return ETCHER_UTIL_BIN_PATH;
-	}
-	// In any other case, resolve the helper relative to resources path.
-	return path.resolve(process.resourcesPath, ETCHER_UTIL_BIN_PATH);
-});
-
 async function main(): Promise<void> {
 	if (!electron.app.requestSingleInstanceLock()) {
 		electron.app.quit();
 	} else {
-		initSentryMain();
 		await electron.app.whenReady();
 		const window = await createMainWindow();
 		electron.app.on('second-instance', async (_event, argv) => {
@@ -268,44 +229,9 @@ async function main(): Promise<void> {
 			await selectImageURL(await getCommandLineURL(argv));
 		});
 		await selectImageURL(await getCommandLineURL(process.argv));
-
-		electron.ipcMain.on('change-lng', function (event, args) {
-			i18n.changeLanguage(args, () => {
-				console.log('Language changed to: ' + args);
-			});
-			if (mainWindow != null) {
-				buildWindowMenu(mainWindow);
-			} else {
-				console.log('Build menu failed. ');
-			}
-		});
-
-		electron.ipcMain.on('webview-dom-ready', (_, id) => {
-			const webview = electron.webContents.fromId(id);
-
-			// Open link in browser if it's opened as a 'foreground-tab'
-			webview!.setWindowOpenHandler((event) => {
-				const url = new URL(event.url);
-				if (
-					(url.protocol === 'http:' || url.protocol === 'https:') &&
-					event.disposition === 'foreground-tab' &&
-					// Don't open links if they're disabled by the env var
-					!settings.getSync('disableExternalLinks')
-				) {
-					electron.shell.openExternal(url.href);
-				}
-				return { action: 'deny' };
-			});
-		});
 	}
 }
 
-// Handle creating/removing shortcuts on Windows when installing/uninstalling.
-// tslint:disable-next-line:no-var-requires
-if (require('electron-squirrel-startup')) {
-	electron.app.quit();
-}
-
 main();
 
 console.time('ready-to-show');

lib/gui/menu.ts

@@ -17,8 +17,6 @@
 import * as electron from 'electron';
 import { displayName } from '../../package.json';
 
-import * as i18next from 'i18next';
-
 /**
  * @summary Builds a native application menu for a given window
  */
@@ -44,13 +42,12 @@ export function buildWindowMenu(window: electron.BrowserWindow) {
 	const menuTemplate: electron.MenuItemConstructorOptions[] = [
 		{
 			role: 'editMenu',
-			label: i18next.t('menu.edit'),
 		},
 		{
-			label: i18next.t('menu.view'),
+			label: 'View',
 			submenu: [
 				{
-					label: i18next.t('menu.devTool'),
+					label: 'Toggle Developer Tools',
 					accelerator:
 						process.platform === 'darwin' ? 'Command+Alt+I' : 'Control+Shift+I',
 					click: toggleDevTools,
@@ -59,14 +56,12 @@ export function buildWindowMenu(window: electron.BrowserWindow) {
 		},
 		{
 			role: 'windowMenu',
-			label: i18next.t('menu.window'),
 		},
 		{
 			role: 'help',
-			label: i18next.t('menu.help'),
 			submenu: [
 				{
-					label: i18next.t('menu.pro'),
+					label: 'Etcher Pro',
 					click() {
 						electron.shell.openExternal(
 							'https://etcher.io/pro?utm_source=etcher_menu&ref=etcher_menu',
@@ -74,13 +69,13 @@ export function buildWindowMenu(window: electron.BrowserWindow) {
 					},
 				},
 				{
-					label: i18next.t('menu.website'),
+					label: 'Etcher Website',
 					click() {
 						electron.shell.openExternal('https://etcher.io?ref=etcher_menu');
 					},
 				},
 				{
-					label: i18next.t('menu.issue'),
+					label: 'Report an issue',
 					click() {
 						electron.shell.openExternal(
 							'https://github.com/balena-io/etcher/issues',
@@ -97,29 +92,25 @@ export function buildWindowMenu(window: electron.BrowserWindow) {
 			submenu: [
 				{
 					role: 'about' as const,
-					label: i18next.t('menu.about'),
+					label: 'About Etcher',
 				},
 				{
 					type: 'separator' as const,
 				},
 				{
 					role: 'hide' as const,
-					label: i18next.t('menu.hide'),
 				},
 				{
 					role: 'hideOthers' as const,
-					label: i18next.t('menu.hideOthers'),
 				},
 				{
 					role: 'unhide' as const,
-					label: i18next.t('menu.unhide'),
 				},
 				{
 					type: 'separator' as const,
 				},
 				{
 					role: 'quit' as const,
-					label: i18next.t('menu.quit'),
 				},
 			],
 		});

lib/gui/modules/child-writer.ts

@@ -0,0 +1,287 @@
+/*
+ * Copyright 2017 balena.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { Drive as DrivelistDrive } from 'drivelist';
+import * as sdk from 'etcher-sdk';
+import { cleanupTmpFiles } from 'etcher-sdk/build/tmp';
+import * as ipc from 'node-ipc';
+import { totalmem } from 'os';
+
+import { toJSON } from '../../shared/errors';
+import { GENERAL_ERROR, SUCCESS } from '../../shared/exit-codes';
+import { delay } from '../../shared/utils';
+import { SourceOptions } from '../app/components/source-selector/source-selector';
+
+ipc.config.id = process.env.IPC_CLIENT_ID as string;
+ipc.config.socketRoot = process.env.IPC_SOCKET_ROOT as string;
+
+// NOTE: Ensure this isn't disabled, as it will cause
+// the stdout maxBuffer size to be exceeded when flashing
+ipc.config.silent = true;
+
+// > If set to 0, the client will NOT try to reconnect.
+// See https://github.com/RIAEvangelist/node-ipc/
+//
+// The purpose behind this change is for this process
+// to emit a "disconnect" event as soon as the GUI
+// process is closed, so we can kill this process as well.
+// @ts-ignore (0 is a valid value for stopRetrying and is not the same as false)
+ipc.config.stopRetrying = 0;
+
+const DISCONNECT_DELAY = 100;
+const IPC_SERVER_ID = process.env.IPC_SERVER_ID as string;
+
+/**
+ * @summary Send a log debug message to the IPC server
+ */
+function log(message: string) {
+	ipc.of[IPC_SERVER_ID].emit('log', message);
+}
+
+/**
+ * @summary Terminate the child writer process
+ */
+function terminate(exitCode: number) {
+	ipc.disconnect(IPC_SERVER_ID);
+	process.nextTick(() => {
+		process.exit(exitCode || SUCCESS);
+	});
+}
+
+/**
+ * @summary Handle a child writer error
+ */
+async function handleError(error: Error) {
+	ipc.of[IPC_SERVER_ID].emit('error', toJSON(error));
+	await delay(DISCONNECT_DELAY);
+	terminate(GENERAL_ERROR);
+}
+
+interface WriteResult {
+	bytesWritten: number;
+	devices: {
+		failed: number;
+		successful: number;
+	};
+	errors: Array<Error & { device: string }>;
+	sourceMetadata: sdk.sourceDestination.Metadata;
+}
+
+/**
+ * @summary writes the source to the destinations and valiates the writes
+ * @param {SourceDestination} source - source
+ * @param {SourceDestination[]} destinations - destinations
+ * @param {Boolean} verify - whether to validate the writes or not
+ * @param {Boolean} autoBlockmapping - whether to trim ext partitions before writing
+ * @param {Function} onProgress - function to call on progress
+ * @param {Function} onFail - function to call on fail
+ * @returns {Promise<{ bytesWritten, devices, errors} >}
+ */
+async function writeAndValidate({
+	source,
+	destinations,
+	verify,
+	autoBlockmapping,
+	decompressFirst,
+	onProgress,
+	onFail,
+}: {
+	source: sdk.sourceDestination.SourceDestination;
+	destinations: sdk.sourceDestination.BlockDevice[];
+	verify: boolean;
+	autoBlockmapping: boolean;
+	decompressFirst: boolean;
+	onProgress: sdk.multiWrite.OnProgressFunction;
+	onFail: sdk.multiWrite.OnFailFunction;
+}): Promise<WriteResult> {
+	const {
+		sourceMetadata,
+		failures,
+		bytesWritten,
+	} = await sdk.multiWrite.decompressThenFlash({
+		source,
+		destinations,
+		onFail,
+		onProgress,
+		verify,
+		trim: autoBlockmapping,
+		numBuffers: Math.min(
+			2 + (destinations.length - 1) * 32,
+			256,
+			Math.floor(totalmem() / 1024 ** 2 / 8),
+		),
+		decompressFirst,
+	});
+	const result: WriteResult = {
+		bytesWritten,
+		devices: {
+			failed: failures.size,
+			successful: destinations.length - failures.size,
+		},
+		errors: [],
+		sourceMetadata,
+	};
+	for (const [destination, error] of failures) {
+		const err = error as Error & { device: string };
+		err.device = (destination as sdk.sourceDestination.BlockDevice).device;
+		result.errors.push(err);
+	}
+	return result;
+}
+
+interface WriteOptions {
+	imagePath: string;
+	destinations: DrivelistDrive[];
+	unmountOnSuccess: boolean;
+	validateWriteOnSuccess: boolean;
+	autoBlockmapping: boolean;
+	decompressFirst: boolean;
+	source: SourceOptions;
+	SourceType: string;
+}
+
+ipc.connectTo(IPC_SERVER_ID, () => {
+	// Remove leftover tmp files older than 1 hour
+	cleanupTmpFiles(Date.now() - 60 * 60 * 1000);
+	process.once('uncaughtException', handleError);
+
+	// Gracefully exit on the following cases. If the parent
+	// process detects that child exit successfully but
+	// no flashing information is available, then it will
+	// assume that the child died halfway through.
+
+	process.once('SIGINT', () => {
+		terminate(SUCCESS);
+	});
+
+	process.once('SIGTERM', () => {
+		terminate(SUCCESS);
+	});
+
+	// The IPC server failed. Abort.
+	ipc.of[IPC_SERVER_ID].on('error', () => {
+		terminate(SUCCESS);
+	});
+
+	// The IPC server was disconnected. Abort.
+	ipc.of[IPC_SERVER_ID].on('disconnect', () => {
+		terminate(SUCCESS);
+	});
+
+	ipc.of[IPC_SERVER_ID].on('write', async (options: WriteOptions) => {
+		/**
+		 * @summary Progress handler
+		 * @param {Object} state - progress state
+		 * @example
+		 * writer.on('progress', onProgress)
+		 */
+		const onProgress = (state: sdk.multiWrite.MultiDestinationProgress) => {
+			ipc.of[IPC_SERVER_ID].emit('state', state);
+		};
+
+		let exitCode = SUCCESS;
+
+		/**
+		 * @summary Abort handler
+		 * @example
+		 * writer.on('abort', onAbort)
+		 */
+		const onAbort = async () => {
+			log('Abort');
+			ipc.of[IPC_SERVER_ID].emit('abort');
+			await delay(DISCONNECT_DELAY);
+			terminate(exitCode);
+		};
+
+		ipc.of[IPC_SERVER_ID].on('cancel', onAbort);
+
+		/**
+		 * @summary Failure handler (non-fatal errors)
+		 * @param {SourceDestination} destination - destination
+		 * @param {Error} error - error
+		 * @example
+		 * writer.on('fail', onFail)
+		 */
+		const onFail = (
+			destination: sdk.sourceDestination.SourceDestination,
+			error: Error,
+		) => {
+			ipc.of[IPC_SERVER_ID].emit('fail', {
+				// TODO: device should be destination
+				// @ts-ignore (destination.drive is private)
+				device: destination.drive,
+				error: toJSON(error),
+			});
+		};
+
+		const destinations = options.destinations.map((d) => d.device);
+		log(`Image: ${options.imagePath}`);
+		log(`Devices: ${destinations.join(', ')}`);
+		log(`Umount on success: ${options.unmountOnSuccess}`);
+		log(`Validate on success: ${options.validateWriteOnSuccess}`);
+		log(`Auto blockmapping: ${options.autoBlockmapping}`);
+		log(`Decompress first: ${options.decompressFirst}`);
+		const dests = options.destinations.map((destination) => {
+			return new sdk.sourceDestination.BlockDevice({
+				drive: destination,
+				unmountOnSuccess: options.unmountOnSuccess,
+				write: true,
+				direct: true,
+			});
+		});
+		const { SourceType } = options;
+		let source;
+		if (SourceType === sdk.sourceDestination.File.name) {
+			source = new sdk.sourceDestination.File({
+				path: options.imagePath,
+			});
+		} else {
+			source = new sdk.sourceDestination.Http({
+				url: options.imagePath,
+				avoidRandomAccess: true,
+			});
+		}
+		try {
+			const results = await writeAndValidate({
+				source,
+				destinations: dests,
+				verify: options.validateWriteOnSuccess,
+				autoBlockmapping: options.autoBlockmapping,
+				decompressFirst: options.decompressFirst,
+				onProgress,
+				onFail,
+			});
+			log(`Finish: ${results.bytesWritten}`);
+			results.errors = results.errors.map((error) => {
+				return toJSON(error);
+			});
+			ipc.of[IPC_SERVER_ID].emit('done', { results });
+			await delay(DISCONNECT_DELAY);
+			terminate(exitCode);
+		} catch (error) {
+			log(`Error: ${error.message}`);
+			exitCode = GENERAL_ERROR;
+			ipc.of[IPC_SERVER_ID].emit('error', toJSON(error));
+		}
+	});
+
+	ipc.of[IPC_SERVER_ID].on('connect', () => {
+		log(
+			`Successfully connected to IPC server: ${IPC_SERVER_ID}, socket root ${ipc.config.socketRoot}`,
+		);
+		ipc.of[IPC_SERVER_ID].emit('ready', {});
+	});
+});

lib/gui/webapi.ts

@@ -1,15 +0,0 @@
-//
-// Anything exported from this module will become available to the
-// renderer process via preload. They're accessible as `window.etcher.foo()`.
-//
-
-import { ipcRenderer } from 'electron';
-
-// FIXME: this is a workaround for the renderer to be able to find the etcher-util
-// binary. We should instead export a function that asks the main process to launch
-// the binary itself.
-export async function getEtcherUtilPath(): Promise<string> {
-	const utilPath = await ipcRenderer.invoke('get-util-path');
-	console.log(utilPath);
-	return utilPath;
-}

lib/shared/catalina-sudo/sudo-askpass.osascript.js

@@ -5,9 +5,9 @@ ObjC.import('stdlib')
 const app = Application.currentApplication()
 app.includeStandardAdditions = true
 
-const result = app.displayDialog('balenaEtcher needs privileged access in order to flash disks.\n\nType your password to allow this.', {
+const result = app.displayDialog('balenaEtcher wants to make changes. Type your password to allow this.', {
   defaultAnswer: '',
-  withIcon: 'caution',
+  withIcon: 'stop',
   buttons: ['Cancel', 'Ok'],
   defaultButton: 'Ok',
   hiddenAnswer: true,

lib/shared/catalina-sudo/sudo.ts

@@ -0,0 +1,61 @@
+/*
+ * Copyright 2019 balena.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { execFile } from 'child_process';
+import { app, remote } from 'electron';
+import { join } from 'path';
+import { env } from 'process';
+import { promisify } from 'util';
+
+const execFileAsync = promisify(execFile);
+
+const SUCCESSFUL_AUTH_MARKER = 'AUTHENTICATION SUCCEEDED';
+const EXPECTED_SUCCESSFUL_AUTH_MARKER = `${SUCCESSFUL_AUTH_MARKER}\n`;
+
+export async function sudo(
+	command: string,
+): Promise<{ cancelled: boolean; stdout?: string; stderr?: string }> {
+	try {
+		const { stdout, stderr } = await execFileAsync(
+			'sudo',
+			['--askpass', 'sh', '-c', `echo ${SUCCESSFUL_AUTH_MARKER} && ${command}`],
+			{
+				encoding: 'utf8',
+				env: {
+					PATH: env.PATH,
+					SUDO_ASKPASS: join(
+						(app || remote.app).getAppPath(),
+						__dirname,
+						'sudo-askpass.osascript.js',
+					),
+				},
+			},
+		);
+		return {
+			cancelled: false,
+			stdout: stdout.slice(EXPECTED_SUCCESSFUL_AUTH_MARKER.length),
+			stderr,
+		};
+	} catch (error) {
+		if (error.code === 1) {
+			if (!error.stdout.startsWith(EXPECTED_SUCCESSFUL_AUTH_MARKER)) {
+				return { cancelled: true };
+			}
+			error.stdout = error.stdout.slice(EXPECTED_SUCCESSFUL_AUTH_MARKER.length);
+		}
+		throw error;
+	}
+}

lib/shared/drive-constraints.ts

@@ -14,40 +14,41 @@
  * limitations under the License.
  */
 
-import type { Drive } from 'drivelist';
-import { isNil } from 'lodash';
+import { Drive as DrivelistDrive } from 'drivelist';
+import * as _ from 'lodash';
 import * as pathIsInside from 'path-is-inside';
+import * as prettyBytes from 'pretty-bytes';
 
 import * as messages from './messages';
-import type { SourceMetadata } from './typings/source-selector';
 
 /**
  * @summary The default unknown size for things such as images and drives
  */
 const UNKNOWN_SIZE = 0;
 
-export type DrivelistDrive = Drive & {
-	disabled: boolean;
-	name: string;
-	path: string;
-	logo: string;
-	displayName: string;
-};
+/**
+ * @summary Check if a drive is locked
+ *
+ * @description
+ * This usually points out a locked SD Card.
+ */
+export function isDriveLocked(drive: DrivelistDrive): boolean {
+	return Boolean(_.get(drive, ['isReadOnly'], false));
+}
 
 /**
  * @summary Check if a drive is a system drive
  */
 export function isSystemDrive(drive: DrivelistDrive): boolean {
-	return Boolean(drive.isSystem);
+	return Boolean(_.get(drive, ['isSystem'], false));
 }
 
-function sourceIsInsideDrive(source: string, drive: DrivelistDrive) {
-	for (const mountpoint of drive.mountpoints || []) {
-		if (pathIsInside(source, mountpoint.path)) {
-			return true;
-		}
-	}
-	return false;
+export interface Image {
+	path?: string;
+	isSizeEstimated?: boolean;
+	compressedSize?: number;
+	recommendedDriveSize?: number;
+	size?: number;
 }
 
 /**
@@ -59,14 +60,11 @@ function sourceIsInsideDrive(source: string, drive: DrivelistDrive) {
  */
 export function isSourceDrive(
 	drive: DrivelistDrive,
-	selection?: SourceMetadata,
+	image: Image = {},
 ): boolean {
-	if (selection) {
-		if (selection.drive) {
-			return selection.drive.device === drive.device;
-		}
-		if (selection.path) {
-			return sourceIsInsideDrive(selection.path, drive);
+	for (const mountpoint of drive.mountpoints || []) {
+		if (image.path !== undefined && pathIsInside(image.path, mountpoint.path)) {
+			return true;
 		}
 	}
 	return false;
@@ -76,21 +74,17 @@ export function isSourceDrive(
  * @summary Check if a drive is large enough for an image
  */
 export function isDriveLargeEnough(
-	drive: DrivelistDrive,
-	image?: SourceMetadata,
+	drive: DrivelistDrive | undefined,
+	image: Image,
 ): boolean {
-	const driveSize = drive.size || UNKNOWN_SIZE;
+	const driveSize = _.get(drive, 'size') || UNKNOWN_SIZE;
 
-	if (image === undefined) {
-		return true;
-	}
-
-	if (image.isSizeEstimated) {
+	if (_.get(image, ['isSizeEstimated'])) {
 		// If the drive size is smaller than the original image size, and
 		// the final image size is just an estimation, then we stop right
 		// here, based on the assumption that the final size will never
 		// be less than the original size.
-		if (driveSize < (image.compressedSize || UNKNOWN_SIZE)) {
+		if (driveSize < _.get(image, ['compressedSize'], UNKNOWN_SIZE)) {
 			return false;
 		}
 
@@ -101,22 +95,25 @@ export function isDriveLargeEnough(
 		return true;
 	}
 
-	return driveSize >= (image.size || UNKNOWN_SIZE);
+	return driveSize >= _.get(image, ['size'], UNKNOWN_SIZE);
 }
 
 /**
- * @summary Check if a drive is valid, i.e. large enough for an image
+ * @summary Check if a drive is disabled (i.e. not ready for selection)
  */
-export function isDriveValid(
-	drive: DrivelistDrive,
-	image?: SourceMetadata,
-	write: boolean = true,
-): boolean {
+export function isDriveDisabled(drive: DrivelistDrive): boolean {
+	return _.get(drive, ['disabled'], false);
+}
+
+/**
+ * @summary Check if a drive is valid, i.e. not locked and large enough for an image
+ */
+export function isDriveValid(drive: DrivelistDrive, image: Image): boolean {
 	return (
-		!write ||
-		(!drive.disabled &&
-			isDriveLargeEnough(drive, image) &&
-			!isSourceDrive(drive, image as SourceMetadata))
+		!isDriveLocked(drive) &&
+		isDriveLargeEnough(drive, image) &&
+		!isSourceDrive(drive, image) &&
+		!isDriveDisabled(drive)
 	);
 }
 
@@ -127,23 +124,23 @@ export function isDriveValid(
  * If the image doesn't have a recommended size, this function returns true.
  */
 export function isDriveSizeRecommended(
-	drive: DrivelistDrive,
-	image?: SourceMetadata,
+	drive: DrivelistDrive | undefined,
+	image: Image,
 ): boolean {
-	const driveSize = drive.size || UNKNOWN_SIZE;
-	return driveSize >= (image?.recommendedDriveSize || UNKNOWN_SIZE);
+	const driveSize = _.get(drive, 'size') || UNKNOWN_SIZE;
+	return driveSize >= _.get(image, ['recommendedDriveSize'], UNKNOWN_SIZE);
 }
 
 /**
- * @summary 128GB
+ * @summary 64GB
  */
-export const LARGE_DRIVE_SIZE = 128e9;
+export const LARGE_DRIVE_SIZE = 64e9;
 
 /**
  * @summary Check whether a drive's size is 'large'
  */
-export function isDriveSizeLarge(drive: DrivelistDrive): boolean {
-	const driveSize = drive.size || UNKNOWN_SIZE;
+export function isDriveSizeLarge(drive?: DrivelistDrive): boolean {
+	const driveSize = _.get(drive, 'size') || UNKNOWN_SIZE;
 	return driveSize > LARGE_DRIVE_SIZE;
 }
 
@@ -158,33 +155,6 @@ export const COMPATIBILITY_STATUS_TYPES = {
 	ERROR: 2,
 };
 
-export const statuses = {
-	locked: {
-		type: COMPATIBILITY_STATUS_TYPES.ERROR,
-		message: messages.compatibility.locked(),
-	},
-	system: {
-		type: COMPATIBILITY_STATUS_TYPES.WARNING,
-		message: messages.compatibility.system(),
-	},
-	containsImage: {
-		type: COMPATIBILITY_STATUS_TYPES.ERROR,
-		message: messages.compatibility.containsImage(),
-	},
-	large: {
-		type: COMPATIBILITY_STATUS_TYPES.WARNING,
-		message: messages.compatibility.largeDrive(),
-	},
-	small: {
-		type: COMPATIBILITY_STATUS_TYPES.ERROR,
-		message: messages.compatibility.tooSmall(),
-	},
-	sizeNotRecommended: {
-		type: COMPATIBILITY_STATUS_TYPES.WARNING,
-		message: messages.compatibility.sizeNotRecommended(),
-	},
-};
-
 /**
  * @summary Get drive/image compatibility in an object
  *
@@ -197,42 +167,56 @@ export const statuses = {
  */
 export function getDriveImageCompatibilityStatuses(
 	drive: DrivelistDrive,
-	image: SourceMetadata | undefined,
-	write: boolean,
+	image: Image = {},
 ) {
 	const statusList = [];
 
 	// Mind the order of the if-statements if you modify.
-	if (drive.isReadOnly && write) {
+	if (isDriveLocked(drive)) {
 		statusList.push({
 			type: COMPATIBILITY_STATUS_TYPES.ERROR,
 			message: messages.compatibility.locked(),
 		});
-	}
-	if (
-		!isNil(drive) &&
-		!isNil(drive.size) &&
+	} else if (
+		!_.isNil(drive) &&
+		!_.isNil(drive.size) &&
 		!isDriveLargeEnough(drive, image)
 	) {
-		statusList.push(statuses.small);
+		const imageSize = (image.isSizeEstimated
+			? image.compressedSize
+			: image.size) as number;
+		const relativeBytes = imageSize - drive.size;
+		statusList.push({
+			type: COMPATIBILITY_STATUS_TYPES.ERROR,
+			message: messages.compatibility.tooSmall(prettyBytes(relativeBytes)),
+		});
 	} else {
-		// Avoid showing "large drive" with "system drive" status
+		if (isSourceDrive(drive, image)) {
+			statusList.push({
+				type: COMPATIBILITY_STATUS_TYPES.ERROR,
+				message: messages.compatibility.containsImage(),
+			});
+		}
+
 		if (isSystemDrive(drive)) {
-			statusList.push(statuses.system);
-		} else if (isDriveSizeLarge(drive)) {
-			statusList.push(statuses.large);
+			statusList.push({
+				type: COMPATIBILITY_STATUS_TYPES.WARNING,
+				message: messages.compatibility.system(),
+			});
 		}
 
-		if (isSourceDrive(drive, image as SourceMetadata)) {
-			statusList.push(statuses.containsImage);
+		if (isDriveSizeLarge(drive)) {
+			statusList.push({
+				type: COMPATIBILITY_STATUS_TYPES.WARNING,
+				message: messages.compatibility.largeDrive(),
+			});
 		}
 
-		if (
-			image !== undefined &&
-			!isNil(drive) &&
-			!isDriveSizeRecommended(drive, image)
-		) {
-			statusList.push(statuses.sizeNotRecommended);
+		if (!_.isNil(drive) && !isDriveSizeRecommended(drive, image)) {
+			statusList.push({
+				type: COMPATIBILITY_STATUS_TYPES.WARNING,
+				message: messages.compatibility.sizeNotRecommended(),
+			});
 		}
 	}
 
@@ -248,11 +232,10 @@ export function getDriveImageCompatibilityStatuses(
  */
 export function getListDriveImageCompatibilityStatuses(
 	drives: DrivelistDrive[],
-	image: SourceMetadata | undefined,
-	write: boolean,
+	image: Image,
 ) {
-	return drives.flatMap((drive) => {
-		return getDriveImageCompatibilityStatuses(drive, image, write);
+	return _.flatMap(drives, (drive) => {
+		return getDriveImageCompatibilityStatuses(drive, image);
 	});
 }
 
@@ -264,15 +247,36 @@ export function getListDriveImageCompatibilityStatuses(
  */
 export function hasDriveImageCompatibilityStatus(
 	drive: DrivelistDrive,
-	image: SourceMetadata | undefined,
-	write: boolean,
+	image: Image,
 ) {
-	return Boolean(
-		getDriveImageCompatibilityStatuses(drive, image, write).length,
-	);
+	return Boolean(getDriveImageCompatibilityStatuses(drive, image).length);
 }
 
-export interface DriveStatus {
+/**
+ * @summary Does any drive/image pair have at least one compatibility status?
+ * @function
+ * @public
+ *
+ * @description
+ * Given an image and a drive, return whether they have a connected compatibility status object.
+ *
+ * @param {Object[]} drives - drives
+ * @param {Object} image - image
+ * @returns {Boolean}
+ *
+ * @example
+ * if (constraints.hasDriveImageCompatibilityStatus(drive, image)) {
+ *   console.log('This drive-image pair has a compatibility status message!')
+ * }
+ */
+export function hasListDriveImageCompatibilityStatus(
+	drives: DrivelistDrive[],
+	image: Image,
+) {
+	return Boolean(getListDriveImageCompatibilityStatuses(drives, image).length);
+}
+
+export interface TargetStatus {
 	message: string;
 	type: number;
 }

lib/shared/messages.ts

@@ -14,19 +14,17 @@
  * limitations under the License.
  */
 
-import type { Dictionary } from 'lodash';
-import { outdent } from 'outdent';
-import prettyBytes from 'pretty-bytes';
-import '../gui/app/i18n';
-import * as i18next from 'i18next';
+import { Dictionary } from 'lodash';
 
 export const progress: Dictionary<(quantity: number) => string> = {
 	successful: (quantity: number) => {
-		return i18next.t('message.flashSucceed', { count: quantity });
+		const plural = quantity === 1 ? '' : 's';
+		return `Successful target${plural}`;
 	},
 
 	failed: (quantity: number) => {
-		return i18next.t('message.flashFail', { count: quantity });
+		const plural = quantity === 1 ? '' : 's';
+		return `Failed target${plural}`;
 	},
 };
 
@@ -38,121 +36,118 @@ export const info = {
 	) => {
 		const targets = [];
 		if (failed + successful === 1) {
-			targets.push(
-				i18next.t('message.toDrive', {
-					description: drive.description,
-					name: drive.displayName,
-				}),
-			);
+			targets.push(`to ${drive.description} (${drive.displayName})`);
 		} else {
 			if (successful) {
-				targets.push(
-					i18next.t('message.toTarget', {
-						count: successful,
-						num: successful,
-					}),
-				);
+				const plural = successful === 1 ? '' : 's';
+				targets.push(`to ${successful} target${plural}`);
 			}
 			if (failed) {
-				targets.push(
-					i18next.t('message.andFailTarget', { count: failed, num: failed }),
-				);
+				const plural = failed === 1 ? '' : 's';
+				targets.push(`and failed to be flashed to ${failed} target${plural}`);
 			}
 		}
-		return i18next.t('message.succeedTo', {
-			name: imageBasename,
-			target: targets.join(' '),
-		});
+		return `${imageBasename} was successfully flashed ${targets.join(' ')}`;
 	},
 };
 
 export const compatibility = {
 	sizeNotRecommended: () => {
-		return i18next.t('message.sizeNotRecommended');
+		return 'Not Recommended';
 	},
 
-	tooSmall: () => {
-		return i18next.t('message.tooSmall');
+	tooSmall: (additionalSpace: string) => {
+		return `Insufficient space, additional ${additionalSpace} required`;
 	},
 
 	locked: () => {
-		return i18next.t('message.locked');
+		return 'Locked';
 	},
 
 	system: () => {
-		return i18next.t('message.system');
+		return 'System drive';
 	},
 
 	containsImage: () => {
-		return i18next.t('message.containsImage');
+		return 'Source drive';
 	},
 
 	// The drive is large and therefore likely not a medium you want to write to.
 	largeDrive: () => {
-		return i18next.t('message.largeDrive');
+		return 'Large drive';
 	},
 } as const;
 
 export const warning = {
-	tooSmall: (source: { size: number }, target: { size: number }) => {
-		return outdent({ newline: ' ' })`
-			 ${i18next.t('message.sourceLarger', {
-					byte: prettyBytes(source.size - target.size),
-				})}
-		`;
+	unrecommendedDriveSize: (
+		image: { recommendedDriveSize: number },
+		drive: { device: string; size: number },
+	) => {
+		return [
+			`This image recommends a ${image.recommendedDriveSize}`,
+			`bytes drive, however ${drive.device} is only ${drive.size} bytes.`,
+		].join(' ');
 	},
 
 	exitWhileFlashing: () => {
-		return i18next.t('message.exitWhileFlashing');
+		return [
+			'You are currently flashing a drive.',
+			'Closing Etcher may leave your drive in an unusable state.',
+		].join(' ');
 	},
 
 	looksLikeWindowsImage: () => {
-		return i18next.t('message.looksLikeWindowsImage');
+		return [
+			'It looks like you are trying to burn a Windows image.\n\n',
+			'Unlike other images, Windows images require special processing to be made bootable.',
+			'We suggest you use a tool specially designed for this purpose, such as',
+			'<a href="https://rufus.akeo.ie">Rufus</a> (Windows),',
+			'<a href="https://github.com/slacka/WoeUSB">WoeUSB</a> (Linux),',
+			'or Boot Camp Assistant (macOS).',
+		].join(' ');
 	},
 
 	missingPartitionTable: () => {
-		return i18next.t('message.missingPartitionTable', {
-			type: i18next.t('message.image'),
-		});
+		return [
+			'It looks like this is not a bootable image.\n\n',
+			'The image does not appear to contain a partition table,',
+			'and might not be recognized or bootable by your device.',
+		].join(' ');
 	},
 
-	driveMissingPartitionTable: () => {
-		return i18next.t('message.missingPartitionTable', {
-			type: i18next.t('message.drive'),
-		});
-	},
-
-	largeDriveSize: () => {
-		return i18next.t('message.largeDriveSize');
-	},
-
-	systemDrive: () => {
-		return i18next.t('message.systemDrive');
-	},
-
-	sourceDrive: () => {
-		return i18next.t('message.sourceDrive');
+	largeDriveSize: (drive: { description: string; device: string }) => {
+		return [
+			`Drive ${drive.description} (${drive.device}) is unusually large for an SD card or USB stick.`,
+			'\n\nAre you sure you want to flash this drive?',
+		].join(' ');
 	},
 };
 
 export const error = {
 	notEnoughSpaceInDrive: () => {
-		return i18next.t('message.noSpace');
+		return [
+			'Not enough space on the drive.',
+			'Please insert larger one and try again.',
+		].join(' ');
 	},
 
 	genericFlashError: (err: Error) => {
-		return i18next.t('message.genericFlashError', { error: err.message });
+		return `Something went wrong. If it is a compressed image, please check that the archive is not corrupted.\n${err.message}`;
 	},
 
 	validation: () => {
-		return i18next.t('message.validation');
+		return [
+			'The write has been completed successfully but Etcher detected potential',
+			'corruption issues when reading the image back from the drive.',
+			'\n\nPlease consider writing the image to a different drive.',
+		].join(' ');
 	},
 
-	openSource: (sourceName: string, errorMessage: string) => {
-		return i18next.t('message.openError', {
-			source: sourceName,
-			error: errorMessage,
-		});
+	openImage: (imageBasename: string, errorMessage: string) => {
+		return [
+			`Something went wrong while opening ${imageBasename}\n\n`,
+			`Error: ${errorMessage}`,
+		].join('');
 	},
 
 	flashFailure: (
@@ -161,33 +156,35 @@ export const error = {
 	) => {
 		const target =
 			drives.length === 1
-				? i18next.t('message.toDrive', {
-						description: drives[0].description,
-						name: drives[0].displayName,
-					})
-				: i18next.t('message.toTarget', {
-						count: drives.length,
-						num: drives.length,
-					});
-		return i18next.t('message.flashError', {
-			image: imageBasename,
-			targets: target,
-		});
+				? `${drives[0].description} (${drives[0].displayName})`
+				: `${drives.length} targets`;
+		return `Something went wrong while writing ${imageBasename} to ${target}.`;
 	},
 
 	driveUnplugged: () => {
-		return i18next.t('message.unplug');
+		return [
+			'Looks like Etcher lost access to the drive.',
+			'Did it get unplugged accidentally?',
+			"\n\nSometimes this error is caused by faulty readers that don't provide stable access to the drive.",
+		].join(' ');
 	},
 
 	inputOutput: () => {
-		return i18next.t('message.cannotWrite');
+		return [
+			'Looks like Etcher is not able to write to this location of the drive.',
+			'This error is usually caused by a faulty drive, reader, or port.',
+			'\n\nPlease try again with another drive, reader, or port.',
+		].join(' ');
 	},
 
 	childWriterDied: () => {
-		return i18next.t('message.childWriterDied');
+		return [
+			'The writer process ended unexpectedly.',
+			'Please try again, and contact the Etcher team if the problem persists.',
+		].join(' ');
 	},
 
 	unsupportedProtocol: () => {
-		return i18next.t('message.badProtocol');
+		return 'Only http:// and https:// URLs are supported.';
 	},
 };

lib/shared/permissions.ts

@@ -14,27 +14,39 @@
  * limitations under the License.
  */
 
-/**
- * TODO:
- * This is convoluted and needlessly complex. It should be simplified and modernized.
- * The environment variable setting and escaping should be greatly simplified by letting {linux|catalina}-sudo handle that.
- * We shouldn't need to write a script to a file and then execute it. We should be able to forwatd the command to the sudo code directly.
- */
-
-import { spawn, exec } from 'child_process';
-import { withTmpFile } from 'etcher-sdk/build/tmp';
+import * as childProcess from 'child_process';
 import { promises as fs } from 'fs';
-import { promisify } from 'util';
 import * as _ from 'lodash';
 import * as os from 'os';
 import * as semver from 'semver';
+import * as sudoPrompt from 'sudo-prompt';
+import { promisify } from 'util';
 
-import { sudo as darwinSudo } from './sudo/darwin';
-import { sudo as linuxSudo } from './sudo/linux';
-import { sudo as winSudo } from './sudo/windows';
+import { sudo as catalinaSudo } from './catalina-sudo/sudo';
 import * as errors from './errors';
+import { withTmpFile } from './tmp';
 
-const execAsync = promisify(exec);
+const execAsync = promisify(childProcess.exec);
+const execFileAsync = promisify(childProcess.execFile);
+
+function sudoExecAsync(
+	cmd: string,
+	options: { name: string },
+): Promise<{ stdout: string; stderr: string }> {
+	return new Promise((resolve, reject) => {
+		sudoPrompt.exec(
+			cmd,
+			options,
+			(error: Error | null, stdout: string, stderr: string) => {
+				if (error != null) {
+					reject(error);
+				} else {
+					resolve({ stdout, stderr });
+				}
+			},
+		);
+	});
+}
 
 /**
  * @summary The user id of the UNIX "superuser"
@@ -48,7 +60,7 @@ export async function isElevated(): Promise<boolean> {
 		// See http://stackoverflow.com/a/28268802
 		try {
 			await execAsync('fltmc');
-		} catch (error: any) {
+		} catch (error) {
 			if (error.code === os.constants.errno.EPERM) {
 				return false;
 			}
@@ -56,14 +68,14 @@ export async function isElevated(): Promise<boolean> {
 		}
 		return true;
 	}
-	return process.geteuid!() === UNIX_SUPERUSER_USER_ID;
+	return process.geteuid() === UNIX_SUPERUSER_USER_ID;
 }
 
 /**
  * @summary Check if the current process is running with elevated permissions
  */
 export function isElevatedUnixSync(): boolean {
-	return process.geteuid!() === UNIX_SUPERUSER_USER_ID;
+	return process.geteuid() === UNIX_SUPERUSER_USER_ID;
 }
 
 function escapeSh(value: any): string {
@@ -111,11 +123,10 @@ export function createLaunchScript(
 async function elevateScriptWindows(
 	path: string,
 	name: string,
-	env: any,
 ): Promise<{ cancelled: false }> {
 	// '&' needs to be escaped here (but not when written to a .cmd file)
 	const cmd = ['cmd', '/c', escapeParamCmd(path).replace(/&/g, '^&')].join(' ');
-	await winSudo(cmd, name, env);
+	await sudoExecAsync(cmd, { name });
 	return { cancelled: false };
 }
 
@@ -124,7 +135,7 @@ async function elevateScriptUnix(
 	name: string,
 ): Promise<{ cancelled: boolean }> {
 	const cmd = ['bash', escapeSh(path)].join(' ');
-	await linuxSudo(cmd, { name });
+	await sudoExecAsync(cmd, { name });
 	return { cancelled: false };
 }
 
@@ -133,9 +144,9 @@ async function elevateScriptCatalina(
 ): Promise<{ cancelled: boolean }> {
 	const cmd = ['bash', escapeSh(path)].join(' ');
 	try {
-		const { cancelled } = await darwinSudo(cmd);
+		const { cancelled } = await catalinaSudo(cmd);
 		return { cancelled };
-	} catch (error: any) {
+	} catch (error) {
 		throw errors.createError({ title: error.stderr });
 	}
 }
@@ -143,13 +154,13 @@ async function elevateScriptCatalina(
 export async function elevateCommand(
 	command: string[],
 	options: {
-		env: _.Dictionary<string | undefined>;
+		environment: _.Dictionary<string | undefined>;
 		applicationName: string;
 	},
 ): Promise<{ cancelled: boolean }> {
 	if (await isElevated()) {
-		spawn(command[0], command.slice(1), {
-			env: options.env,
+		await execFileAsync(command[0], command.slice(1), {
+			env: options.environment,
 		});
 		return { cancelled: false };
 	}
@@ -157,18 +168,17 @@ export async function elevateCommand(
 	const launchScript = createLaunchScript(
 		command[0],
 		command.slice(1),
-		options.env,
+		options.environment,
 	);
 	return await withTmpFile(
 		{
-			keepOpen: false,
 			prefix: 'balena-etcher-electron-',
 			postfix: '.cmd',
 		},
-		async ({ path }) => {
+		async (path) => {
 			await fs.writeFile(path, launchScript);
 			if (isWindows) {
-				return elevateScriptWindows(path, options.applicationName, options.env);
+				return elevateScriptWindows(path, options.applicationName);
 			}
 			if (
 				os.platform() === 'darwin' &&
@@ -178,8 +188,8 @@ export async function elevateCommand(
 				return elevateScriptCatalina(path);
 			}
 			try {
-				return elevateScriptUnix(path, options.applicationName);
-			} catch (error: any) {
+				return await elevateScriptUnix(path, options.applicationName);
+			} catch (error) {
 				// We're hardcoding internal error messages declared by `sudo-prompt`.
 				// There doesn't seem to be a better way to handle these errors, so
 				// for now, we should make sure we double check if the error messages

lib/shared/sudo/darwin.ts

@@ -1,102 +0,0 @@
-/*
- * Copyright 2019 balena.io
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { spawn } from 'child_process';
-import { join } from 'path';
-import { env } from 'process';
-// import { promisify } from "util";
-
-import { supportedLocales } from '../../gui/app/i18n';
-
-// const execFileAsync = promisify(execFile);
-
-const SUCCESSFUL_AUTH_MARKER = 'AUTHENTICATION SUCCEEDED';
-const EXPECTED_SUCCESSFUL_AUTH_MARKER = `${SUCCESSFUL_AUTH_MARKER}\n`;
-
-function getAskPassScriptPath(lang: string): string {
-	if (process.env.NODE_ENV === 'development') {
-		// Force webpack's hand to bundle the script.
-		return require.resolve(`./sudo-askpass.osascript-${lang}.js`);
-	}
-	// Otherwise resolve the script relative to resources path.
-	return join(process.resourcesPath, `sudo-askpass.osascript-${lang}.js`);
-}
-
-export async function sudo(
-	command: string,
-): Promise<{ cancelled: boolean; stdout?: string; stderr?: string }> {
-	try {
-		let lang = Intl.DateTimeFormat().resolvedOptions().locale;
-		lang = lang.substr(0, 2);
-		if (supportedLocales.indexOf(lang) > -1) {
-			// language should be present
-		} else {
-			// fallback to eng
-			lang = 'en';
-		}
-
-		const elevateProcess = spawn(
-			'sudo',
-			['--askpass', 'sh', '-c', `echo ${SUCCESSFUL_AUTH_MARKER} && ${command}`],
-			{
-				// encoding: "utf8",
-				env: {
-					PATH: env.PATH,
-					SUDO_ASKPASS: getAskPassScriptPath(lang),
-				},
-			},
-		);
-
-		let elevated = 'pending';
-
-		elevateProcess.stdout.on('data', (data) => {
-			if (data.toString().includes(SUCCESSFUL_AUTH_MARKER)) {
-				// if the first data comming out of the sudo command is the expected marker we resolve the promise
-				elevated = 'granted';
-			} else {
-				// if the first data comming out of the sudo command is not the expected marker we reject the promise
-				elevated = 'rejected';
-			}
-		});
-
-		// we don't spawn or read stdout in the promise otherwise resolving stop the process
-		return new Promise((resolve, reject) => {
-			const checkElevation = setInterval(() => {
-				if (elevated === 'granted') {
-					clearInterval(checkElevation);
-					resolve({ cancelled: false });
-				} else if (elevated === 'rejected') {
-					clearInterval(checkElevation);
-					resolve({ cancelled: true });
-				}
-			}, 300);
-
-			// if the elevation didn't occured in 30 seconds we reject the promise
-			setTimeout(() => {
-				clearInterval(checkElevation);
-				reject(new Error('Elevation timeout'));
-			}, 30000);
-		});
-	} catch (error: any) {
-		if (error.code === 1) {
-			if (!error.stdout.startsWith(EXPECTED_SUCCESSFUL_AUTH_MARKER)) {
-				return { cancelled: true };
-			}
-			error.stdout = error.stdout.slice(EXPECTED_SUCCESSFUL_AUTH_MARKER.length);
-		}
-		throw error;
-	}
-}

lib/shared/sudo/linux.ts

@@ -1,142 +0,0 @@
-/* 
- * This is heavily inspired (read: a ripof) https://github.com/balena-io-modules/sudo-prompt
- * Which was a fork of https://github.com/jorangreef/sudo-prompt
- * 
- * This and the original code was released under The MIT License (MIT)
- * 
- * Copyright (c) 2015 Joran Dirk Greef
- * Copyright (c) 2024 Balena
- * 
-    The MIT License (MIT)
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
- */
-
-import { spawn } from 'child_process';
-import { access, constants } from 'fs/promises';
-import { env } from 'process';
-
-// const execFileAsync = promisify(execFile);
-
-const SUCCESSFUL_AUTH_MARKER = 'AUTHENTICATION SUCCEEDED';
-
-/** Check for kdesudo or pkexec */
-function checkLinuxBinary() {
-	// eslint-disable-next-line no-async-promise-executor
-	return new Promise(async (resolve, reject) => {
-		// We used to prefer gksudo over pkexec since it enabled a better prompt.
-		// However, gksudo cannot run multiple commands concurrently.
-
-		const paths = ['/usr/bin/kdesudo', '/usr/bin/pkexec'];
-		for (const path of paths) {
-			try {
-				// check if the file exist and is executable
-				await access(path, constants.X_OK);
-				resolve(path);
-			} catch (error: any) {
-				continue;
-			}
-		}
-		reject('Unable to find pkexec or kdesudo.');
-	});
-}
-
-function escapeDoubleQuotes(escapeString: string) {
-	return escapeString.replace(/"/g, '\\"');
-}
-
-export async function sudo(
-	command: string,
-	{ name }: { name: string },
-): Promise<{ cancelled: boolean; stdout?: string; stderr?: string }> {
-	const linuxBinary: string = (await checkLinuxBinary()) as string;
-	if (!linuxBinary) {
-		throw new Error('Unable to find pkexec or kdesudo.');
-	}
-
-	const parameters = [];
-
-	if (/kdesudo/i.test(linuxBinary)) {
-		parameters.push(
-			'--comment',
-			`"${name} wants to make changes.
-			Enter your password to allow this."`,
-		);
-		parameters.push('-d'); // Do not show the command to be run in the dialog.
-		parameters.push('--');
-	} else if (/pkexec/i.test(linuxBinary)) {
-		parameters.push('--disable-internal-agent');
-	}
-
-	parameters.push('/bin/bash');
-	parameters.push('-c');
-	parameters.push(
-		`echo ${SUCCESSFUL_AUTH_MARKER} && ${escapeDoubleQuotes(command)}`,
-	);
-
-	const elevateProcess = spawn(linuxBinary, parameters, {
-		// encoding: "utf8",
-		env: {
-			PATH: env.PATH,
-		},
-	});
-
-	let elevated = '';
-
-	elevateProcess.stdout.on('data', (data) => {
-		// console.log(`stdout: ${data.toString()}`);
-		if (data.toString().includes(SUCCESSFUL_AUTH_MARKER)) {
-			// if the first data comming out of the sudo command is the expected marker we resolve the promise
-			elevated = 'granted';
-		} else {
-			// if the first data comming out of the sudo command is not the expected marker we reject the promise
-			elevated = 'refused';
-		}
-	});
-
-	// elevateProcess.stderr.on('data', (data) => {
-	// 	// console.log(`stderr: ${data.toString()}`);
-	// 	// if (data.toString().includes(SUCCESSFUL_AUTH_MARKER)) {
-	// 	// 	// if the first data comming out of the sudo command is the expected marker we resolve the promise
-	// 	// 	elevated = 'granted';
-	// 	// } else {
-	// 	// 	// if the first data comming out of the sudo command is not the expected marker we reject the promise
-	// 	// 	elevated = 'refused';
-	// 	// }
-	// });
-
-	// we don't spawn or read stdout in the promise otherwise resolving stop the process
-	return new Promise((resolve, reject) => {
-		const checkElevation = setInterval(() => {
-			if (elevated === 'granted') {
-				clearInterval(checkElevation);
-				resolve({ cancelled: false });
-			} else if (elevated === 'refused') {
-				clearInterval(checkElevation);
-				resolve({ cancelled: true });
-			}
-		}, 300);
-
-		// if the elevation didn't occured in 30 seconds we reject the promise
-		setTimeout(() => {
-			clearInterval(checkElevation);
-			reject(new Error('Elevation timeout'));
-		}, 30000);
-	});
-}

lib/shared/sudo/sudo-askpass.osascript-zh.js

@@ -1,21 +0,0 @@
-#!/usr/bin/env osascript -l JavaScript
-
-ObjC.import('stdlib')
-
-const app = Application.currentApplication()
-app.includeStandardAdditions = true
-
-const result = app.displayDialog('balenaEtcher 需要来自管理员的权限才能烧录镜像到磁盘。\n\n输入您的密码以允许此操作。', {
-  defaultAnswer: '',
-  withIcon: 'caution',
-  buttons: ['取消', '好'],
-  defaultButton: '好',
-  hiddenAnswer: true,
-})
-
-if (result.buttonReturned === '好') {
-  result.textReturned
-} else {
-  $.exit(255)
-}
-

lib/shared/sudo/windows.ts

@@ -1,218 +0,0 @@
-/* 
- * This is heavily inspired (read: a ripof) https://github.com/balena-io-modules/sudo-prompt
- * Which was a fork of https://github.com/jorangreef/sudo-prompt
- * 
- * This and the original code was released under The MIT License (MIT)
- * 
- * Copyright (c) 2015 Joran Dirk Greef
- * Copyright (c) 2024 Balena
- * 
-    The MIT License (MIT)
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
- */
-
-import { spawn } from 'child_process';
-// import { env } from 'process';
-import { tmpdir } from 'os';
-import { v4 as uuidv4 } from 'uuid';
-import { join, sep } from 'path';
-import { mkdir, writeFile, copyFile, readFile } from 'fs/promises';
-
-/**
- * TODO:
- * Migrate, modernize and clenup the windows elevation code from the old @balena/sudo-prompt package in a similar way to linux-sudo.ts and catalina-sudo files.
- */
-
-export async function sudo(
-	command: string,
-	_name: string,
-	env: any,
-): Promise<{ cancelled: boolean; stdout?: string; stderr?: string }> {
-	const uuid = uuidv4();
-
-	const temp = tmpdir();
-	if (!temp) {
-		throw new Error('os.tmpdir() not defined.');
-	}
-
-	const tmpFolder = join(temp, uuid);
-
-	if (/"/.test(tmpFolder)) {
-		// We expect double quotes to be reserved on Windows.
-		// Even so, we test for this and abort if they are present.
-		throw new Error('instance.path cannot contain double-quotes.');
-	}
-
-	const executeScriptPath = join(tmpFolder, 'execute.bat');
-	const commandScriptPath = join(tmpFolder, 'command.bat');
-	const stdoutPath = join(tmpFolder, 'stdout');
-	const stderrPath = join(tmpFolder, 'stderr');
-	const statusPath = join(tmpFolder, 'status');
-
-	const SUCCESSFUL_AUTH_MARKER = 'AUTHENTICATION SUCCEEDED';
-
-	try {
-		await mkdir(tmpFolder);
-
-		// WindowsWriteExecuteScript(instance, end)
-		const executeScript = `
-      @echo off\r\n
-      call "${commandScriptPath}" > "${stdoutPath}" 2> "${stderrPath}"\r\n
-      (echo %ERRORLEVEL%) > "${statusPath}"
-    `;
-
-		await writeFile(executeScriptPath, executeScript, 'utf-8');
-
-		// WindowsWriteCommandScript(instance, end)
-		const cwd = process.cwd();
-		if (/"/.test(cwd)) {
-			// We expect double quotes to be reserved on Windows.
-			// Even so, we test for this and abort if they are present.
-			throw new Error('process.cwd() cannot contain double-quotes.');
-		}
-
-		const commandScriptArray = [];
-		commandScriptArray.push('@echo off');
-		// Set code page to UTF-8:
-		commandScriptArray.push('chcp 65001>nul');
-		// Preserve current working directory:
-		// We pass /d as an option in case the cwd is on another drive (issue 70).
-		commandScriptArray.push(`cd /d "${cwd}"`);
-		// Export environment variables:
-		for (const key in env) {
-			// "The characters <, >, |, &, ^ are special command shell characters, and
-			// they must be preceded by the escape character (^) or enclosed in
-			// quotation marks. If you use quotation marks to enclose a string that
-			// contains one of the special characters, the quotation marks are set as
-			// part of the environment variable value."
-			// In other words, Windows assigns everything that follows the equals sign
-			// to the value of the variable, whereas Unix systems ignore double quotes.
-			if (Object.prototype.hasOwnProperty.call(env, key)) {
-				const value = env[key];
-				commandScriptArray.push(
-					`set ${key}=${value!.replace(/([<>\\|&^])/g, '^$1')}`,
-				);
-			}
-		}
-		commandScriptArray.push(`echo ${SUCCESSFUL_AUTH_MARKER}`);
-		commandScriptArray.push(command);
-		await writeFile(
-			commandScriptPath,
-			commandScriptArray.join('\r\n'),
-			'utf-8',
-		);
-
-		// WindowsCopyCmd(instance, end)
-		if (windowsNeedsCopyCmd(tmpFolder)) {
-			// Work around https://github.com/jorangreef/sudo-prompt/issues/97
-			// Powershell can't properly escape amperstands in paths.
-			// We work around this by copying cmd.exe in our temporary folder and running
-			// it from here (see WindowsElevate below).
-			// That way, we don't have to pass the path containing the amperstand at all.
-			// A symlink would probably work too but you have to be an administrator in
-			// order to create symlinks on Windows.
-			await copyFile(
-				join(process.env.SystemRoot!, 'System32', 'cmd.exe'),
-				join(tmpFolder, 'cmd.exe'),
-			);
-		}
-
-		// WindowsElevate(instance, end)
-		// We used to use this for executing elevate.vbs:
-		// var command = 'cscript.exe //NoLogo "' + instance.pathElevate + '"';
-		const spawnCommand = [];
-		// spawnCommand.push("powershell.exe") // as we use spawn this one is out of the array
-		spawnCommand.push('Start-Process');
-		spawnCommand.push('-FilePath');
-		const options: any = { encoding: 'utf8' };
-		if (windowsNeedsCopyCmd(tmpFolder)) {
-			// Node.path.join('.', 'cmd.exe') would return 'cmd.exe'
-			spawnCommand.push(['.', 'cmd.exe'].join(sep));
-			spawnCommand.push('-ArgumentList');
-			spawnCommand.push('"/C","execute.bat"');
-			options.cwd = tmpFolder;
-		} else {
-			// Escape characters for cmd using double quotes:
-			// Escape characters for PowerShell using single quotes:
-			// Escape single quotes for PowerShell using backtick:
-			// See: https://ss64.com/ps/syntax-esc.html
-			spawnCommand.push(`'${executeScriptPath.replace(/'/g, "`'")}'`);
-		}
-		spawnCommand.push('-WindowStyle hidden');
-		spawnCommand.push('-Verb runAs');
-
-		spawn('powershell.exe', spawnCommand);
-
-		// setTimeout(() => {elevated = "granted"}, 5000)
-
-		// we don't spawn or read stdout in the promise otherwise resolving stop the process
-		return new Promise((resolve, reject) => {
-			const checkElevation = setInterval(async () => {
-				try {
-					const result = await readFile(stdoutPath, 'utf-8');
-					const error = await readFile(stderrPath, 'utf-8');
-
-					if (error && error !== '') {
-						throw new Error(error);
-					}
-
-					// TODO: should track something more generic
-					if (result.includes(SUCCESSFUL_AUTH_MARKER)) {
-						clearInterval(checkElevation);
-						resolve({ cancelled: false });
-					}
-				} catch (error) {
-					console.log(
-						'Error while reading flasher elevation script output',
-						error,
-					);
-				}
-			}, 1000);
-
-			// if the elevation didn't occured in 30 seconds we reject the promise
-			setTimeout(() => {
-				clearInterval(checkElevation);
-				reject(new Error('Elevation timeout'));
-			}, 30000);
-		});
-
-		// WindowsWaitForStatus(instance, end)
-
-		// WindowsResult(instance, end)
-	} catch (error) {
-		throw new Error(`Can't elevate process ${error}`);
-	} finally {
-		// TODO: cleanup
-		//   // Remove(instance.path, function (errorRemove) {
-		//   // if (error) return callback(error)
-		//   // if (errorRemove) return callback(errorRemove)
-		//   // callback(undefined, stdout, stderr)
-	}
-}
-
-function windowsNeedsCopyCmd(path: string) {
-	const specialChars = ['&', '`', "'", '"', '<', '>', '|', '^'];
-	for (const specialChar of specialChars) {
-		if (path.includes(specialChar)) {
-			return true;
-		}
-	}
-	return false;
-}