v5.26.1

Co-authored-by: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>

.babelrc.js

@@ -8,7 +8,6 @@ module.exports = {
   plugins: [
     'react-hot-loader/babel',
     'lodash',
-    '@babel/plugin-transform-typescript',
     '@babel/plugin-proposal-class-properties',
     '@babel/plugin-proposal-optional-chaining',
     '@babel/plugin-proposal-nullish-coalescing-operator',

.eslintignore

@@ -1,3 +1,4 @@
+build/**
 components/**
 coverage/**
 dist/**
@@ -14,17 +15,19 @@ libtextsecure/components.js
 libtextsecure/test/test.js
 test/test.js
 sticker-creator/dist/**
-ts/protobuf/compiled.d.ts
 
 # Third-party files
 js/Mp3LameEncoder.min.js
 js/WebAudioRecorderMp3.js
+js/libphonenumber-util.js
 
 # TypeScript generated files
 app/**/*.js
 ts/**/*.js
 sticker-creator/**/*.js
+!sticker-creator/preload.js
 
+**/*.d.ts
 .eslintrc.js
 webpack.config.ts
 preload.bundle.*

.eslintrc.js

@@ -1,4 +1,4 @@
-// Copyright 2018-2022 Signal Messenger, LLC
+// Copyright 2018-2021 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 // For reference: https://github.com/airbnb/javascript
@@ -15,14 +15,6 @@ const rules = {
     },
   ],
 
-  // No omitting braces, keep on the same line
-  'brace-style': ['error', '1tbs', { allowSingleLine: false }],
-  curly: ['error', 'all'],
-
-  // Always use === and !== except when directly comparing to null
-  // (which only will equal null or undefined)
-  eqeqeq: ['error', 'always', { null: 'never' }],
-
   // prevents us from accidentally checking in exclusive tests (`.only`):
   'mocha/no-exclusive-tests': 'error',
 
@@ -31,14 +23,10 @@ const rules = {
 
   // it helps readability to put public API at top,
   'no-use-before-define': 'off',
-  '@typescript-eslint/no-use-before-define': 'off',
 
   // useful for unused or internal fields
   'no-underscore-dangle': 'off',
 
-  // Temp: We have because TypeScript's `allowUnreachableCode` option is on.
-  'no-unreachable': 'error',
-
   // though we have a logger, we still remap console to log to disk
   'no-console': 'error',
 
@@ -120,36 +108,14 @@ const rules = {
         '`with` is disallowed in strict mode because it makes code impossible to predict and optimize.',
     },
   ],
+  curly: 'error',
 };
 
 const typescriptRules = {
   ...rules,
 
-  // Override brace style to enable typescript-specific syntax
-  'brace-style': 'off',
-  '@typescript-eslint/brace-style': [
-    'error',
-    '1tbs',
-    { allowSingleLine: false },
-  ],
-
   '@typescript-eslint/array-type': ['error', { default: 'generic' }],
 
-  'no-restricted-imports': 'off',
-  '@typescript-eslint/no-restricted-imports': [
-    'error',
-    {
-      paths: [
-        {
-          name: 'chai',
-          importNames: ['expect', 'should', 'Should'],
-          message: 'Please use assert',
-          allowTypeImports: true,
-        },
-      ],
-    },
-  ],
-
   // Overrides recommended by typescript-eslint
   //   https://github.com/typescript-eslint/typescript-eslint/releases/tag/v4.0.0
   '@typescript-eslint/no-redeclare': 'error',
@@ -185,14 +151,7 @@ module.exports = {
 
   overrides: [
     {
-      files: [
-        'ts/**/*.ts',
-        'ts/**/*.tsx',
-        'app/**/*.ts',
-        'sticker-creator/**/*.ts',
-        'sticker-creator/**/*.tsx',
-        'build/intl-linter/**/*.ts',
-      ],
+      files: ['ts/**/*.ts', 'ts/**/*.tsx', 'app/**/*.ts'],
       parser: '@typescript-eslint/parser',
       parserOptions: {
         project: 'tsconfig.json',
@@ -212,12 +171,27 @@ module.exports = {
       rules: typescriptRules,
     },
     {
-      files: [
-        '**/*.stories.tsx',
-        'ts/build/**',
-        'ts/test-*/**',
-        'build/intl-linter/**/*.ts',
+      files: ['sticker-creator/**/*.ts', 'sticker-creator/**/*.tsx'],
+      parser: '@typescript-eslint/parser',
+      parserOptions: {
+        project: './sticker-creator/tsconfig.json',
+        ecmaFeatures: {
+          jsx: true,
+        },
+        ecmaVersion: 2018,
+        sourceType: 'module',
+      },
+      plugins: ['@typescript-eslint'],
+      extends: [
+        'eslint:recommended',
+        'plugin:@typescript-eslint/recommended',
+        'plugin:react/recommended',
+        'airbnb-typescript-prettier',
       ],
+      rules: typescriptRules,
+    },
+    {
+      files: ['**/*.stories.tsx', 'ts/build/**', 'ts/test-*/**'],
       rules: {
         ...typescriptRules,
         'import/no-extraneous-dependencies': 'off',
@@ -227,6 +201,4 @@ module.exports = {
   ],
 
   rules,
-
-  reportUnusedDisableDirectives: true,
 };

.github/ISSUE_TEMPLATE/config.yml

@@ -16,7 +16,7 @@ contact_links:
     url: https://community.signalusers.org/c/support/
     about: Feel free to ask anything
   - name: 📖 Contribution instructions
-    url: https://github.com/signalapp/Signal-Desktop/blob/main/CONTRIBUTING.md
+    url: https://github.com/signalapp/Signal-Desktop/blob/development/CONTRIBUTING.md
     about: Want to contribute to Signal Desktop? Start here.
   - name: ❓ Other issue?
     url: https://community.signalusers.org/

.github/PULL_REQUEST_TEMPLATE.md

@@ -14,9 +14,9 @@ Remember, you can preview this before saving it.
 
 ### Contributor checklist:
 
-- [ ] My contribution is **not** related to translations.
+- [ ] My contribution is **not** related to translations. _Please submit translation changes via our [Signal Desktop Transifex project](https://www.transifex.com/signalapp/signal-desktop/)._
 - [ ] My commits are in nice logical chunks with [good commit messages](http://chris.beams.io/posts/git-commit/)
-- [ ] My changes are [rebased](https://medium.com/free-code-camp/git-rebase-and-the-golden-rule-explained-70715eccc372) on the latest [`main`](https://github.com/signalapp/Signal-Desktop/tree/main) branch
+- [ ] My changes are [rebased](https://medium.com/free-code-camp/git-rebase-and-the-golden-rule-explained-70715eccc372) on the latest [`development`](https://github.com/signalapp/Signal-Desktop/tree/development) branch
 - [ ] A `yarn ready` run passes successfully ([more about tests here](https://github.com/signalapp/Signal-Desktop/blob/master/CONTRIBUTING.md#tests))
 - [ ] My changes are ready to be shipped to users
 

.github/stale.yml

@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Signal Messenger, LLC
+# Copyright 2021 Signal Messenger, LLC
 # SPDX-License-Identifier: AGPL-3.0-only
 
 # Configuration for probot-stale - https://github.com/probot/stale
@@ -18,7 +18,6 @@ exemptLabels:
   - Accessibility
   - Bug
   - Regression
-  - "Don't mark stale"
   - "Feature Request"
   - "Good starter task"
   - "Upstream Change Needed"

.github/workflows/backport.yml

@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Signal Messenger, LLC
+# Copyright 2021 Signal Messenger, LLC
 # SPDX-License-Identifier: AGPL-3.0-only
 
 name: Backport
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2
         with:
           token: ${{ secrets.AUTOMATED_GITHUB_PAT }}
           repository: signalapp/Signal-Backport-Action-Private

.github/workflows/benchmark.yml

@@ -1,20 +1,13 @@
-# Copyright 2020-2022 Signal Messenger, LLC
+# Copyright 2020-2021 Signal Messenger, LLC
 # SPDX-License-Identifier: AGPL-3.0-only
 
 name: Benchmark
-on:
-  push:
-    branches:
-      - development
-      - main
-      - '[0-9]+.[0-9]+.x'
-  pull_request:
+on: push
 
 jobs:
   linux:
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'signalapp/Signal-Desktop-Private' }}
-    timeout-minutes: 30
 
     steps:
     - name: Get system specs
@@ -22,22 +15,32 @@ jobs:
     - name: Get other system specs
       run: uname -a
 
+    - name: Configure git to use HTTPS
+      run: git config --global url."https://${{ secrets.AUTOMATED_GITHUB_PAT }}:x-oauth-basic@github.com".insteadOf ssh://git@github.com
+
     - name: Clone Desktop repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
+    - name: Clone Mock-Server repo
+      uses: actions/checkout@v2
+      with:
+        repository: 'signalapp/Mock-Signal-Server-Private'
+        path: 'Mock-Server'
+        ref: 'gamma'
+        token: ${{ secrets.AUTOMATED_GITHUB_PAT }}
 
     - name: Setup node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v2
       with:
-        node-version: '16.15.0'
+        node-version: '16.5.0'
     - name: Install global dependencies
-      run: npm install -g yarn@1.22.10
+      run: npm install -g yarn@1.22.10 typescript@4.4.2 ts-node@10.2.1
 
     - name: Install xvfb
       run: sudo apt-get install xvfb
 
     - name: Cache Desktop node_modules
       id: cache-desktop-modules
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: node_modules
         key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
@@ -46,73 +49,68 @@ jobs:
       if: steps.cache-desktop-modules.outputs.cache-hit != 'true'
       run: yarn install --frozen-lockfile
 
+    - name: Install Mock-Server node_modules
+      run: yarn install --frozen-lockfile
+      working-directory: Mock-Server
+      env:
+        PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
+
     - name: Build typescript
-      run: yarn generate
+      run: yarn grunt
     - name: Bundle
       run: yarn build:webpack
 
+    - name: Copy CI configuration
+      run: |
+        cp -rf ./Mock-Server/config/local-development.json \
+          ./config/local-development.json
+        cp -rf ./config/local-development.json ./config/local-production.json
+
+    - name: Setup hosts
+      run: sudo echo "127.0.0.1 mock.signal.org" | sudo tee -a /etc/hosts
+
     - name: Run startup benchmarks
       run: |
         set -o pipefail
-        xvfb-run --auto-servernum node ts/test-mock/benchmarks/startup_bench.js |
-          tee benchmark-startup.log
+        rm -rf /tmp/mock
+        xvfb-run --auto-servernum ts-node Mock-Server/scripts/load-test.ts \
+          ./node_modules/.bin/electron . | tee benchmark-startup.log || \
+          (cat /tmp/mock/logs/{app,main}.log && exit 1)
       timeout-minutes: 10
       env:
         NODE_ENV: production
         RUN_COUNT: 10
         ELECTRON_ENABLE_STACK_DUMPING: on
-        ARTIFACTS_DIR: artifacts/startup
 
     - name: Run send benchmarks
       run: |
         set -o pipefail
         rm -rf /tmp/mock
-        xvfb-run --auto-servernum node ts/test-mock/benchmarks/send_bench.js |
-          tee benchmark-send.log
+        xvfb-run --auto-servernum ts-node Mock-Server/scripts/send-test.ts \
+          ./node_modules/.bin/electron . | tee benchmark-send.log || \
+          (cat /tmp/mock/logs/{app,main}.log && exit 1)
       timeout-minutes: 10
       env:
         NODE_ENV: production
         RUN_COUNT: 100
         ELECTRON_ENABLE_STACK_DUMPING: on
-        ARTIFACTS_DIR: artifacts/send
 
     - name: Run group send benchmarks
       run: |
         set -o pipefail
         rm -rf /tmp/mock
-        xvfb-run --auto-servernum node \
-          ts/test-mock/benchmarks/group_send_bench.js | \
-          tee benchmark-group-send.log
+        xvfb-run --auto-servernum ts-node \
+          Mock-Server/scripts/group-send-test.ts \
+          ./node_modules/.bin/electron . | tee benchmark-group-send.log || \
+          (cat /tmp/mock/logs/{app,main}.log && exit 1)
       timeout-minutes: 10
       env:
         NODE_ENV: production
         RUN_COUNT: 100
         ELECTRON_ENABLE_STACK_DUMPING: on
-        ARTIFACTS_DIR: artifacts/group-send
-
-    - name: Run conversation open benchmarks
-      run: |
-        set -o pipefail
-        rm -rf /tmp/mock
-        xvfb-run --auto-servernum node \
-          ts/test-mock/benchmarks/convo_open_bench.js | \
-          tee benchmark-convo-open.log
-      timeout-minutes: 10
-      env:
-        NODE_ENV: production
-        RUN_COUNT: 100
-        ELECTRON_ENABLE_STACK_DUMPING: on
-        ARTIFACTS_DIR: artifacts/convo-open
-
-    - name: Upload benchmark logs on failure
-      if: failure()
-      uses: actions/upload-artifact@v3
-      with:
-        name: logs
-        path: artifacts
 
     - name: Clone benchmark repo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
       with:
         repository: 'signalapp/Signal-Desktop-Benchmarks-Private'
         path: 'benchmark-results'
@@ -125,7 +123,6 @@ jobs:
         node ./bin/collect.js ../benchmark-startup.log data/startup.json
         node ./bin/collect.js ../benchmark-send.log data/send.json
         node ./bin/collect.js ../benchmark-group-send.log data/group-send.json
-        node ./bin/collect.js ../benchmark-convo-open.log data/convo-open.json
         npm run build
         git config --global user.email "no-reply@signal.org"
         git config --global user.name "Signal Bot"

.github/workflows/ci.yml

@@ -1,32 +1,25 @@
-# Copyright 2020-2022 Signal Messenger, LLC
+# Copyright 2020-2021 Signal Messenger, LLC
 # SPDX-License-Identifier: AGPL-3.0-only
 
 name: CI
-on:
-  push:
-    branches:
-      - development
-      - main
-      - '[0-9]+.[0-9]+.x'
-  pull_request:
+on: [push, pull_request]
 
 jobs:
   lint:
     runs-on: ubuntu-latest
-    timeout-minutes: 30
 
     steps:
     - run: lsb_release -a
     - run: uname -a
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
       with:
-        node-version: '16.15.0'
+        node-version: '16.5.0'
     - run: npm install -g yarn@1.22.10
 
     - name: Cache Desktop node_modules
       id: cache-desktop-modules
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: node_modules
         key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
@@ -43,20 +36,19 @@ jobs:
   macos:
     needs: lint
     runs-on: macos-latest
-    if: github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
-    timeout-minutes: 30
+    if: github.ref == 'refs/heads/development' || github.ref == 'refs/heads/master'
 
     steps:
     - run: uname -a
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
       with:
-        node-version: '16.15.0'
+        node-version: '16.5.0'
     - run: npm install -g yarn@1.22.10
 
     - name: Cache Desktop node_modules
       id: cache-desktop-modules
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: node_modules
         key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
@@ -66,36 +58,30 @@ jobs:
 
     - run: yarn generate
     - run: yarn prepare-beta-build
+    - run: yarn build
     - run: yarn test-node
     - run: yarn test-electron
-      timeout-minutes: 5
-    - run: yarn build
-      env:
-        DISABLE_INSPECT_FUSE: on
-    - name: Rebuild native modules for x64
-      run: yarn electron:install-app-deps
-    - run: yarn test-release
+    - run: yarn grunt test-release:osx
       env:
         NODE_ENV: production
 
   linux:
     needs: lint
     runs-on: ubuntu-latest
-    timeout-minutes: 30
 
     steps:
     - run: lsb_release -a
     - run: uname -a
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
       with:
-        node-version: '16.15.0'
+        node-version: '16.5.0'
     - run: sudo apt-get install xvfb
     - run: npm install -g yarn@1.22.10
 
     - name: Cache Desktop node_modules
       id: cache-desktop-modules
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: node_modules
         key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
@@ -106,36 +92,32 @@ jobs:
     - run: yarn generate
     - run: yarn prepare-beta-build
     - run: yarn build
-      env:
-        DISABLE_INSPECT_FUSE: on
     - run: xvfb-run --auto-servernum yarn test-node
     - run: xvfb-run --auto-servernum yarn test-electron
-      timeout-minutes: 5
       env:
         LANG: en_US
         LANGUAGE: en_US
-    - run: xvfb-run --auto-servernum yarn test-release
+    - run: xvfb-run --auto-servernum yarn grunt test-release:linux
       env:
         NODE_ENV: production
 
   windows:
     needs: lint
     runs-on: windows-latest
-    timeout-minutes: 30
 
     steps:
     - run: systeminfo
     - run: git config --global core.autocrlf false
     - run: git config --global core.eol lf
-    - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
+    - uses: actions/checkout@v2
+    - uses: actions/setup-node@v2
       with:
-        node-version: '16.15.0'
+        node-version: '16.5.0'
     - run: npm install -g yarn@1.22.10
 
     - name: Cache Desktop node_modules
       id: cache-desktop-modules
-      uses: actions/cache@v3
+      uses: actions/cache@v2
       with:
         path: node_modules
         key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
@@ -144,74 +126,14 @@ jobs:
       run: yarn install --frozen-lockfile
 
     - run: yarn generate
+    - run: node build\grunt.js
     - run: yarn test-node
     - run: copy package.json temp.json
     - run: del package.json
     - run: type temp.json | findstr /v certificateSubjectName | findstr /v certificateSha1 > package.json
     - run: yarn prepare-beta-build
     - run: yarn build
-      env:
-        DISABLE_INSPECT_FUSE: on
-    - run: yarn test-electron
-      timeout-minutes: 5
-    - run: yarn test-release
+    - run: node build\grunt.js test
+    - run: node build\grunt.js test-release:win
       env:
         SIGNAL_ENV: production
-
-  mock-tests:
-    needs: lint
-    runs-on: ubuntu-latest
-    if: ${{ github.repository == 'signalapp/Signal-Desktop-Private' }}
-    timeout-minutes: 30
-
-    steps:
-    - name: Get system specs
-      run: lsb_release -a
-    - name: Get other system specs
-      run: uname -a
-
-    - name: Clone Desktop repo
-      uses: actions/checkout@v3
-
-    - name: Setup node.js
-      uses: actions/setup-node@v3
-      with:
-        node-version: '16.15.0'
-    - name: Install global dependencies
-      run: npm install -g yarn@1.22.10
-
-    - name: Install xvfb
-      run: sudo apt-get install xvfb
-
-    - name: Cache Desktop node_modules
-      id: cache-desktop-modules
-      uses: actions/cache@v3
-      with:
-        path: node_modules
-        key: ${{ runner.os }}-${{ hashFiles('package.json', 'yarn.lock', 'patches/**') }}
-
-    - name: Install Desktop node_modules
-      if: steps.cache-desktop-modules.outputs.cache-hit != 'true'
-      run: yarn install --frozen-lockfile
-
-    - name: Build typescript
-      run: yarn generate
-    - name: Bundle
-      run: yarn build:webpack
-
-    - name: Run mock server tests
-      run: |
-        set -o pipefail
-        xvfb-run --auto-servernum yarn test-mock
-      timeout-minutes: 10
-      env:
-        NODE_ENV: production
-        DEBUG: mock:test:*
-        ARTIFACTS_DIR: artifacts/startup
-
-    - name: Upload mock server test logs on failure
-      if: failure()
-      uses: actions/upload-artifact@v2
-      with:
-        name: logs
-        path: artifacts

.github/workflows/danger.yml

@@ -1,32 +0,0 @@
-# Copyright 2020-2022 Signal Messenger, LLC
-# SPDX-License-Identifier: AGPL-3.0-only
-
-name: CI
-on:
-  pull_request:
-
-jobs:
-  danger:
-    runs-on: ubuntu-latest
-    timeout-minutes: 30
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          fetch-depth: 0 # fetch all history
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '16.15.0'
-      - run: npm install -g yarn@1.22.10
-      - name: Cache danger node_modules
-        id: cache-desktop-modules
-        uses: actions/cache@v3
-        with:
-          path: danger/node_modules
-          key: danger-${{ runner.os }}-${{ hashFiles('danger/package.json', 'danger/yarn.lock') }}
-      - name: Install danger node_modules
-        if: steps.cache-desktop-modules.outputs.cache-hit != 'true'
-        run: cd danger && yarn install --frozen-lockfile
-      - name: Run DangerJS
-        run: yarn danger:ci
-        env:
-          DANGER_GITHUB_API_TOKEN: ${{ secrets.AUTOMATED_GITHUB_PAT }}

.gitignore

@@ -1,5 +1,4 @@
 node_modules
-node_modules_bkp
 .sass-cache
 coverage/*
 build/curve25519_compiled.js
@@ -12,21 +11,19 @@ config/local-*.json
 release/
 /dev-app-update.yml
 .nyc_output/
-
+*.sublime*
 /sql/
 /start.sh
 .eslintcache
 tsconfig.tsbuildinfo
-.smartling-source.sh
 
 # generated files
 js/components.js
 js/util_worker.js
 libtextsecure/components.js
+libtextsecure/test/test.js
 stylesheets/*.css
-/storybook-static/
-preload.bundle.*
-ts/sql/mainWorker.bundle.js.LICENSE.txt
+test/test.js
 
 # React / TypeScript
 app/*.js
@@ -39,10 +36,8 @@ sticker-creator/**/*.js
 
 # Sticker Creator
 sticker-creator/dist/*
-sticker-creator/**/*.js
 
-# Editors
 /.idea
-/.vscode
-*.sublime*
-*.map
+/storybook-static/
+preload.bundle.*
+ts/sql/mainWorker.bundle.js.LICENSE.txt

.nvmrc

@@ -1 +1 @@
-16.15.0
+16.5.0

.prettierignore

@@ -3,7 +3,6 @@
 
 # Generated files
 app/**/*.js
-sticker-creator/**/*.js
 config/local-*.json
 config/local.json
 dist/**
@@ -14,7 +13,6 @@ libtextsecure/test/test.js
 stylesheets/*.css
 test/test.js
 ts/**/*.js
-!ts/**/.eslintrc.js
 ts/protobuf/*.d.ts
 ts/protobuf/*.js
 stylesheets/manifest.css
@@ -28,13 +26,18 @@ js/curve/**
 js/Mp3LameEncoder.min.js
 js/WebAudioRecorderMp3.js
 
-# Assets
-/images/
-/fixtures/
+# Test fixtures
+test/fixtures.js
 
 # Github workflows
 .github/**
 
+# Managed by Transifex:
+# Note: the negate pattern only works because it's targeting the same depth as the
+#   glob on the previous line.
+_locales/**/*.json
+!_locales/en/messages.json
+
 # Managed by package manager (`bower` and `yarn`/`npm`):
 /bower.json
 /package.json

.smartling-source-example.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-# Copyright 2022 Signal Messenger, LLC
-# SPDX-License-Identifier: AGPL-3.0-only
-
-# run this before yarn get-strings/push-strings:
-#   source .smartling-source.sh
-
-export SMARTLING_USER="your token 'user identifier' here"
-export SMARTLING_SECRET="your token secret here"

.smartling.yml

@@ -1,7 +0,0 @@
-# Copyright 2022 Signal Messenger, LLC
-# SPDX-License-Identifier: AGPL-3.0-only
-
-# https://github.com/Smartling/smartling-cli/wiki/examples.md
-
-account_id: '92ff14ad'
-project_id: 'ef62d1ebb'

.storybook/addons.js

@@ -0,0 +1,5 @@
+// Copyright 2019-2020 Signal Messenger, LLC
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import '@storybook/addon-knobs/register';
+import '@storybook/addon-actions/register';

.storybook/config.js

@@ -0,0 +1,141 @@
+// Copyright 2019-2021 Signal Messenger, LLC
+// SPDX-License-Identifier: AGPL-3.0-only
+
+import * as React from 'react';
+import { addDecorator, addParameters, configure } from '@storybook/react';
+import { withKnobs, boolean, optionsKnob } from '@storybook/addon-knobs';
+import classnames from 'classnames';
+import * as styles from './styles.scss';
+import messages from '../_locales/en/messages.json';
+import { I18n } from '../sticker-creator/util/i18n';
+import { ThemeType } from '../ts/types/Util';
+import { ClassyProvider } from '../ts/components/PopperRootContext';
+import { StorybookThemeContext } from './StorybookThemeContext';
+
+const optionsConfig = {
+  display: 'inline-radio',
+};
+
+const persistKnob = id => knob => {
+  const value = knob(localStorage.getItem(id));
+  localStorage.setItem(id, value);
+  return value;
+};
+
+const makeThemeKnob = pane =>
+  persistKnob(`${pane}-pane-theme`)(localValue =>
+    optionsKnob(
+      `${pane} Pane Theme`,
+      { Light: '', Dark: classnames('dark-theme', styles.darkTheme) },
+      localValue || '',
+      optionsConfig,
+      `${pane} Pane`
+    )
+  );
+
+const parseThemeString = str => (str === '' ? ThemeType.light : ThemeType.dark);
+
+const makeModeKnob = pane =>
+  persistKnob(`${pane}-pane-mode`)(localValue =>
+    optionsKnob(
+      `${pane} Pane Mode`,
+      { Mouse: 'mouse-mode', Keyboard: 'keyboard-mode' },
+      localValue || 'mouse-mode',
+      optionsConfig,
+      `${pane} Pane`
+    )
+  );
+
+addDecorator(withKnobs({ escapeHTML: false }));
+
+addDecorator((storyFn /* , context */) => {
+  const contents = storyFn();
+  const firstPaneThemeString = makeThemeKnob('First');
+  const firstPaneTheme = parseThemeString(firstPaneThemeString);
+  const firstPaneMode = makeModeKnob('First');
+
+  const secondPane = persistKnob('second-pane-active')(localValue =>
+    boolean('Second Pane Active', localValue !== 'false', 'Second Pane')
+  );
+
+  const secondPaneThemeString = makeThemeKnob('Second');
+  const secondPaneTheme = parseThemeString(secondPaneThemeString);
+  const secondPaneMode = makeModeKnob('Second');
+
+  // Adding it to the body as well so that we can cover modals and other
+  // components that are rendered outside of this decorator container
+  if (firstPaneThemeString === '') {
+    document.body.classList.remove('dark-theme');
+  } else {
+    document.body.classList.add('dark-theme');
+  }
+
+  if (firstPaneMode === 'mouse-mode') {
+    document.body.classList.remove('keyboard-mode');
+    document.body.classList.add('mouse-mode');
+  } else {
+    document.body.classList.remove('mouse-mode');
+    document.body.classList.add('keyboard-mode');
+  }
+
+  document.body.classList.add('page-is-visible');
+
+  return (
+    <div className={styles.container}>
+      <StorybookThemeContext.Provider value={firstPaneTheme}>
+        <ClassyProvider themes={['dark']}>
+          <div
+            className={classnames(
+              styles.panel,
+              firstPaneThemeString,
+              firstPaneMode
+            )}
+          >
+            {contents}
+          </div>
+        </ClassyProvider>
+      </StorybookThemeContext.Provider>
+      {secondPane ? (
+        <div
+          className={classnames(
+            styles.panel,
+            secondPaneThemeString,
+            secondPaneMode
+          )}
+        >
+          <StorybookThemeContext.Provider value={secondPaneTheme}>
+            {contents}
+          </StorybookThemeContext.Provider>
+        </div>
+      ) : null}
+    </div>
+  );
+});
+
+// Hack to enable hooks in stories: https://github.com/storybookjs/storybook/issues/5721#issuecomment-473869398
+addDecorator(Story => <Story />);
+
+addDecorator(story => <I18n messages={messages}>{story()}</I18n>);
+
+addParameters({
+  axe: {
+    disabledRules: ['html-has-lang'],
+  },
+});
+
+configure(() => {
+  // Load main app stories
+  const tsComponentsContext = require.context(
+    '../ts/components',
+    true,
+    /\.stories.tsx?$/
+  );
+  tsComponentsContext.keys().forEach(f => tsComponentsContext(f));
+  // Load sticker creator stories
+  const stickerCreatorContext = require.context(
+    '../sticker-creator',
+    true,
+    /\.stories\.tsx?$/
+  );
+  stickerCreatorContext.keys().forEach(f => stickerCreatorContext(f));
+}, module);

.storybook/main.js

@@ -1,23 +0,0 @@
-// Copyright 2022 Signal Messenger, LLC
-// SPDX-License-Identifier: AGPL-3.0-only
-
-module.exports = {
-  stories: [
-    '../ts/components/**/*.stories.tsx',
-    '../sticker-creator/**/*.stories.tsx',
-  ],
-  addons: [
-    '@storybook/addon-a11y',
-    '@storybook/addon-actions',
-    '@storybook/addon-controls',
-    '@storybook/addon-measure',
-    '@storybook/addon-toolbars',
-    '@storybook/addon-viewport',
-
-    // This must be imported last.
-    '@storybook/addon-interactions',
-
-    // Deprecated! Please remove when all uses have been migrated to controls.
-    '@storybook/addon-knobs',
-  ],
-};

.storybook/preview-head.html

@@ -1,17 +1,9 @@
-<!-- Copyright 2019-2022 Signal Messenger, LLC -->
+<!-- Copyright 2019-2021 Signal Messenger, LLC -->
 <!-- SPDX-License-Identifier: AGPL-3.0-only -->
 
 <!-- prettier-ignore -->
 <link rel="stylesheet" href="../stylesheets/manifest.css" />
-<link
-  href="../node_modules/@indutny/frameless-titlebar/dist/styles.css"
-  rel="stylesheet"
-  type="text/css"
-/>
 <script>
-  // eslint-disable-next-line
-  const noop = () => {};
-
   window.SignalWindow = window.SignalWindow || {};
   window.SignalWindow.log = {
     fatal: console.error.bind(console),
@@ -21,28 +13,4 @@
     debug: console.debug.bind(console),
     trace: console.trace.bind(console),
   };
-  window.SignalContext = {
-    activeWindowService: {
-      isActive: () => true,
-      registerForActive: noop,
-      unregisterForActive: noop,
-      registerForChange: noop,
-      unregisterForChange: noop,
-    },
-
-    nativeThemeListener: {
-      getSystemValue: async () => 'light',
-      subscribe: noop,
-      unsubscribe: noop,
-    },
-    Settings: {
-      themeSetting: {
-        getValue: async () => 'light',
-      },
-      waitForChange: () => new Promise(noop),
-    },
-    OS: {
-      hasCustomTitleBar: () => false,
-    },
-  };
 </script>

.storybook/preview.tsx

@@ -1,87 +0,0 @@
-// Copyright 2019-2022 Signal Messenger, LLC
-// SPDX-License-Identifier: AGPL-3.0-only
-
-import React from 'react';
-import classnames from 'classnames';
-import { withKnobs, boolean, optionsKnob } from '@storybook/addon-knobs';
-
-import * as styles from './styles.scss';
-import messages from '../_locales/en/messages.json';
-import { ClassyProvider } from '../ts/components/PopperRootContext';
-import { I18n } from '../sticker-creator/util/i18n';
-import { StorybookThemeContext } from './StorybookThemeContext';
-import { ThemeType } from '../ts/types/Util';
-
-export const globalTypes = {
-  mode: {
-    name: 'Mode',
-    description: 'Application mode',
-    defaultValue: 'mouse',
-    toolbar: {
-      dynamicTitle: true,
-      icon: 'circlehollow',
-      items: ['mouse', 'keyboard'],
-      showName: true,
-    },
-  },
-  theme: {
-    name: 'Theme',
-    description: 'Global theme for components',
-    defaultValue: 'light',
-    toolbar: {
-      dynamicTitle: true,
-      icon: 'circlehollow',
-      items: ['light', 'dark'],
-      showName: true,
-    },
-  },
-};
-
-const withModeAndThemeProvider = (Story, context) => {
-  const theme =
-    context.globals.theme === 'light' ? ThemeType.light : ThemeType.dark;
-  const mode = context.globals.mode;
-
-  // Adding it to the body as well so that we can cover modals and other
-  // components that are rendered outside of this decorator container
-  if (theme === 'light') {
-    document.body.classList.remove('dark-theme');
-  } else {
-    document.body.classList.add('dark-theme');
-  }
-
-  if (mode === 'mouse') {
-    document.body.classList.remove('keyboard-mode');
-    document.body.classList.add('mouse-mode');
-  } else {
-    document.body.classList.remove('mouse-mode');
-    document.body.classList.add('keyboard-mode');
-  }
-
-  document.body.classList.add('page-is-visible');
-
-  return (
-    <div className={styles.container}>
-      <StorybookThemeContext.Provider value={theme}>
-        <Story {...context} />
-      </StorybookThemeContext.Provider>
-    </div>
-  );
-};
-
-const withI18n = (Story, context) => (
-  <I18n messages={messages} locale="en">
-    <Story {...context} />
-  </I18n>
-);
-
-export const decorators = [
-  withModeAndThemeProvider,
-  withI18n,
-];
-
-export const parameters = {
-  axe: {
-    disabledRules: ['html-has-lang'],
-  },
-};

.storybook/styles.scss

@@ -4,10 +4,19 @@
 @import '../stylesheets/variables';
 
 .container {
-  align-content: stretch;
+  display: flex;
+  flex-direction: row;
   align-items: stretch;
+  align-content: stretch;
+  width: 100vw;
+  height: 100vh;
+}
+
+.panel {
+  flex: 1;
+  padding: 16px;
   height: 100%;
-  width: 100%;
+  overflow: auto;
 }
 
 .dark-theme {

.storybook/webpack.config.js

@@ -1,4 +1,4 @@
-// Copyright 2019-2022 Signal Messenger, LLC
+// Copyright 2019-2020 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 const webpack = require('webpack');
@@ -10,6 +10,11 @@ module.exports = ({ config }) => {
   );
 
   config.module.rules.unshift(
+    {
+      test: /\.[jt]sx?$/,
+      loader: 'babel-loader',
+      exclude: /node_modules/,
+    },
     {
       test: /\.scss$/,
       loaders: [
@@ -20,6 +25,8 @@ module.exports = ({ config }) => {
     }
   );
 
+  config.resolve.extensions = ['.tsx', '.ts', '.jsx', '.js'];
+
   config.externals = {
     net: 'net',
   };

.tx/config

@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[signal-desktop.messagesjson-electron]
+file_filter = _locales/<lang>/messages.json
+source_file = _locales/en/messages.json
+source_lang = en
+type = CHROME

.yarnclean

@@ -5,6 +5,7 @@ tests
 powered-test
 
 # asset directories
+docs
 doc
 website
 images

ACKNOWLEDGMENTS.md

@@ -1,38 +1,10 @@
-<!-- Copyright 2020-2022 Signal Messenger, LLC -->
+<!-- Copyright 2020-2021 Signal Messenger, LLC -->
 <!-- SPDX-License-Identifier: AGPL-3.0-only -->
 
 # Acknowledgments
 
 Signal Desktop makes use of the following open source projects.
 
-## @formatjs/fast-memoize
-
-    License: MIT
-
-## @indutny/frameless-titlebar
-
-    MIT License
-
-    Copyright (c) 2019 Cristian Ponce
-
-    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.
-
 ## @popperjs/core
 
     License: MIT
@@ -887,53 +859,6 @@ Signal Desktop makes use of the following open source projects.
     TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
     SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-## dicer
-
-    Copyright Brian White. All rights reserved.
-
-    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.
-
-## direction
-
-    (The MIT License)
-
-    Copyright (c) 2014 Titus Wormer <tituswormer@gmail.com>
-
-    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.
-
 ## emoji-datasource
 
     The MIT License (MIT)
@@ -2131,33 +2056,6 @@ Signal Desktop makes use of the following open source projects.
     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
     OTHER DEALINGS IN THE SOFTWARE.
 
-## mp4box
-
-    Copyright (c) 2012. Telecom ParisTech/TSI/MM/GPAC Cyril Concolato
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or without
-    modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-    * Neither the name of the copyright holder nor the
-    names of its contributors may be used to endorse or promote products
-    derived from this software without specific prior written permission.
-
-    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-    WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-    DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-    DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-    (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-    LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-    ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-    (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 ## mustache
 
     The MIT License
@@ -2533,6 +2431,18 @@ Signal Desktop makes use of the following open source projects.
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
     THE SOFTWARE.
 
+## os-locale
+
+    MIT License
+
+    Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
+
+    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.
+
 ## p-map
 
     MIT License
@@ -2569,18 +2479,6 @@ Signal Desktop makes use of the following open source projects.
 
     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.
 
-## p-timeout
-
-    MIT License
-
-    Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-    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.
-
 ## parchment
 
     Copyright (c) 2015, Jason Chen
@@ -2652,6 +2550,10 @@ Signal Desktop makes use of the following open source projects.
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
 
+## pino-multi-stream
+
+    License: MIT
+
 ## protobufjs
 
     This license applies to all parts of protobuf.js except those files
@@ -2698,10 +2600,6 @@ Signal Desktop makes use of the following open source projects.
 
     License: MIT
 
-## qrcode-generator
-
-    License: MIT
-
 ## quill
 
     Copyright (c) 2014, Jason Chen
@@ -2863,10 +2761,6 @@ Signal Desktop makes use of the following open source projects.
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
 
-## react-intl
-
-    License: BSD-3-Clause
-
 ## react-measure
 
     The MIT License (MIT)
@@ -2991,29 +2885,6 @@ Signal Desktop makes use of the following open source projects.
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
 
-## react-textarea-autosize
-
-    The MIT License (MIT)
-
-    Copyright (c) 2013 Andrey Popp
-
-    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.
-
 ## react-virtualized
 
     The MIT License (MIT)
@@ -3182,6 +3053,30 @@ Signal Desktop makes use of the following open source projects.
     ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
     IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
+## rotating-file-stream
+
+    The MIT License (MIT)
+
+    Copyright (c) 2015-2020 Daniele Ricci
+
+    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.
+
 ## sanitize.css
 
     License: CC0-1.0
@@ -3449,9 +3344,7 @@ Signal Desktop makes use of the following open source projects.
 
 ## typeface-inter
 
-    Copyright (c) 2016-2020 The Inter Project Authors.
-    "Inter" is trademark of Rasmus Andersson.
-    https://github.com/rsms/inter
+    Copyright (c) 2016-2018 The Inter Project Authors (me@rsms.me)
 
     This Font Software is licensed under the SIL Open Font License, Version 1.1.
     This license is copied below, and is also available with a FAQ at:

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-<!-- Copyright 2015-2022 Signal Messenger, LLC -->
+<!-- Copyright 2015-2020 Signal Messenger, LLC -->
 <!-- SPDX-License-Identifier: AGPL-3.0-only -->
 
 # Contributor Guidelines
@@ -13,15 +13,14 @@ It's a good idea to gauge interest in your intended work by finding the current
 for it or creating a new one yourself. You can use also that issue as a place to signal
 your intentions and get feedback from the users most likely to appreciate your changes.
 
-Once you've spent a little bit of time planning your solution, you can go
+Once you've spent a little bit of time planning your solution, it's a good idea to go
 back to the issue and talk about your approach. We'd be happy to provide feedback. [An
 ounce of prevention, as they say!](https://www.goodreads.com/quotes/247269-an-ounce-of-prevention-is-worth-a-pound-of-cure)
 
 ## Developer Setup
 
 First, you'll need [Node.js](https://nodejs.org/) which matches our current version.
-You can check [`.nvmrc` in the `main` branch](https://github.com/signalapp/Signal-Desktop/blob/main/.nvmrc)
-to see what the current version is. If you have [nvm](https://github.com/creationix/nvm)
+You can check [`.nvmrc` in the `development` branch](https://github.com/signalapp/Signal-Desktop/blob/development/.nvmrc) to see what the current version is. If you have [nvm](https://github.com/creationix/nvm)
 you can just run `nvm use` in the project directory and it will switch to the project's
 desired Node.js version. [nvm for windows](https://github.com/coreybutler/nvm-windows) is
 still useful, but it doesn't support `.nvmrc` files.
@@ -48,18 +47,19 @@ Install the [Xcode Command-Line Tools](http://osxdaily.com/2014/02/12/install-co
 1.  Install `gcc`
 1.  Install `g++`
 1.  Install `make`
+1.  Install `git-lfs`
 
 ### All platforms
 
 Now, run these commands in your preferred terminal in a good directory for development:
 
 ```
-git lfs install                # Setup Git LFS.
-npm install --global yarn      # Make sure you have have `yarn`
 git clone https://github.com/signalapp/Signal-Desktop.git
 cd Signal-Desktop
+git-lfs install                # Setup Git LFS.
+npm install --global yarn      # (only if you don’t already have `yarn`)
 yarn install --frozen-lockfile # Install and build dependencies (this will take a while)
-yarn generate                  # Generate final JS and CSS assets
+yarn grunt                     # Generate final JS and CSS assets
 yarn build:webpack             # Build parts of the app that use webpack (Sticker Creator)
 yarn test                      # A good idea to make sure tests run first
 yarn start                     # Start Signal!
@@ -72,14 +72,13 @@ is no automatic restart mechanism. Alternatively, keep the developer tools open
 (Windows & Linux).
 
 Also, note that the assets loaded by the application are not necessarily the same files
-you’re touching. You may not see your changes until you run `yarn generate` on the
+you’re touching. You may not see your changes until you run `yarn grunt` on the
 command-line like you did during setup. You can make it easier on yourself by generating
-the latest built assets when you change a file. Run each of these in their own terminal
-instance while you make changes - they'll run until you stop them:
+the latest built assets when you change a file. Run this in its own terminal instance
+while you make changes:
 
 ```
-yarn transpile --watch         # recompiles when you change .ts files
-yarn sass-manifest --watch     # recompiles when you change .scss files
+yarn grunt dev # runs until you stop it, re-generating built assets on file changes
 ```
 
 If you miss the `git-lfs` step, run `yarn cache clean` and remove `node_modules` before trying again.
@@ -181,9 +180,17 @@ Please write tests! Our testing framework is
 [mocha](http://mochajs.org/) and our assertion library is
 [chai](http://chaijs.com/api/assert/).
 
-The easiest way to run all tests at once is `yarn test`, which will run them on the
-command line. You can run the client-side tests in an interactive session with
-`NODE_ENV=test yarn run start`.
+The easiest way to run all tests at once is `yarn test`.
+
+You can browse tests from the command line with `grunt unit-tests` or in an
+interactive session with `NODE_ENV=test yarn run start`.
+
+If you want to run the `libtextsecure` tests, you can run `yarn run test-electron`,
+which also runs the unit tests.
+
+To run Node.js tests, you can run `yarn test-server` from the command line. You can get
+code coverage numbers for this kind of run via `yarn test-server-coverage`, then display
+the report with `yarn open-coverage`.
 
 ## Pull requests
 
@@ -191,16 +198,19 @@ So you wanna make a pull request? Please observe the following guidelines.
 
 - First, make sure that your `yarn ready` run passes - it's very similar to what our
   Continuous Integration servers do to test the app.
-- Please do not submit pull requests for translation fixes.
+- Please do not submit pull requests for translation fixes. Anyone can update
+  the translations in
+  [Transifex](https://www.transifex.com/projects/p/signal-desktop).
 - Never use plain strings right in the source code - pull them from `messages.json`!
   You **only** need to modify the default locale
   [`_locales/en/messages.json`](_locales/en/messages.json). Other locales are generated
-  automatically based on that file and then periodically translated.
+  automatically based on that file and then periodically uploaded to Transifex for
+  translation.
 - [Rebase](https://nathanleclaire.com/blog/2014/09/14/dont-be-scared-of-git-rebase/) your
-  changes on the latest `main` branch, resolving any conflicts.
+  changes on the latest `development` branch, resolving any conflicts.
   This ensures that your changes will merge cleanly when you open your PR.
 - Be sure to add and run tests!
-- Make sure the diff between the development branch and your branch contains only the
+- Make sure the diff between our master and your branch contains only the
   minimal set of changes needed to implement your feature or bugfix. This will
   make it easier for the person reviewing your code to approve the changes.
   Please do not submit a PR with commented out code or unfinished features.
@@ -271,4 +281,16 @@ yarn generate
 yarn build
 ```
 
-Then, run the tests using `yarn test-release`.
+Then, run the tests using `grunt test-release:osx --dir=release`, replacing `osx` with `linux` or `win` depending on your platform.
+
+## Translations
+
+To pull the latest translations, follow these steps:
+
+1.  Download Transifex client:
+    https://docs.transifex.com/client/installing-the-client
+2.  Create Transifex account: https://transifex.com
+3.  Generate API token: https://www.transifex.com/user/settings/api/
+4.  Create `~/.transifexrc` configuration:
+    https://docs.transifex.com/client/client-configuration#-transifexrc
+5.  Run `yarn grunt tx`.

Gruntfile.js

@@ -0,0 +1,431 @@
+// Copyright 2014-2021 Signal Messenger, LLC
+// SPDX-License-Identifier: AGPL-3.0-only
+
+const { join } = require('path');
+const importOnce = require('node-sass-import-once');
+const rimraf = require('rimraf');
+const mkdirp = require('mkdirp');
+const spectron = require('spectron');
+const asar = require('asar');
+const fs = require('fs');
+const os = require('os');
+const assert = require('assert');
+const sass = require('node-sass');
+const packageJson = require('./package.json');
+
+/* eslint-disable more/no-then, no-console  */
+
+module.exports = grunt => {
+  async function promiseToAsyncGruntTask(promise, gruntDone) {
+    let succeeded = false;
+    try {
+      await promise;
+      succeeded = true;
+    } catch (err) {
+      grunt.log.error(err);
+    }
+    if (succeeded) {
+      gruntDone();
+    } else {
+      gruntDone(false);
+    }
+  }
+
+  const bower = grunt.file.readJSON('bower.json');
+  const components = [];
+  // eslint-disable-next-line guard-for-in, no-restricted-syntax
+  for (const i in bower.concat.app) {
+    components.push(bower.concat.app[i]);
+  }
+
+  grunt.loadNpmTasks('grunt-sass');
+
+  grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
+    concat: {
+      components: {
+        src: components,
+        dest: 'js/components.js',
+      },
+      test: {
+        src: [
+          'node_modules/mocha/mocha.js',
+          'node_modules/chai/chai.js',
+          'test/_test.js',
+        ],
+        dest: 'test/test.js',
+      },
+      libtextsecuretest: {
+        src: [
+          'node_modules/jquery/dist/jquery.js',
+          'node_modules/mocha/mocha.js',
+          'node_modules/chai/chai.js',
+          'libtextsecure/test/_test.js',
+        ],
+        dest: 'libtextsecure/test/test.js',
+      },
+    },
+    sass: {
+      options: {
+        implementation: sass,
+        sourceMap: true,
+        importer: importOnce,
+      },
+      dev: {
+        files: {
+          'stylesheets/manifest.css': 'stylesheets/manifest.scss',
+          'stylesheets/manifest_bridge.css': 'stylesheets/manifest_bridge.scss',
+        },
+      },
+    },
+    copy: {
+      deps: {
+        files: [
+          {
+            src: 'components/mp3lameencoder/lib/Mp3LameEncoder.js',
+            dest: 'js/Mp3LameEncoder.min.js',
+          },
+          {
+            src: 'components/webaudiorecorder/lib/WebAudioRecorderMp3.js',
+            dest: 'js/WebAudioRecorderMp3.js',
+          },
+        ],
+      },
+    },
+    watch: {
+      protobuf: {
+        files: ['./protos/SignalService.proto'],
+        tasks: ['exec:build-protobuf'],
+      },
+      sass: {
+        files: ['./stylesheets/*.scss', './stylesheets/**/*.scss'],
+        tasks: ['sass'],
+      },
+    },
+    exec: {
+      'tx-pull-mostly-translated': {
+        cmd: 'tx pull --all --use-git-timestamps --minimum-perc=80',
+      },
+      'tx-pull-any-existing-translation': {
+        cmd: 'tx pull --use-git-timestamps',
+      },
+      transpile: {
+        cmd: 'yarn transpile',
+      },
+      'build-protobuf': {
+        cmd: 'yarn build-protobuf',
+      },
+    },
+    'test-release': {
+      osx: {
+        archive: `mac/${packageJson.productName}.app/Contents/Resources/app.asar`,
+        exe: `mac/${packageJson.productName}.app/Contents/MacOS/${packageJson.productName}`,
+      },
+      mas: {
+        archive: 'mas/Signal.app/Contents/Resources/app.asar',
+        exe: `mas/${packageJson.productName}.app/Contents/MacOS/${packageJson.productName}`,
+      },
+      linux: {
+        archive: 'linux-unpacked/resources/app.asar',
+        exe: `linux-unpacked/${packageJson.name}`,
+      },
+      win: {
+        archive: 'win-unpacked/resources/app.asar',
+        exe: `win-unpacked/${packageJson.productName}.exe`,
+      },
+    },
+    gitinfo: {}, // to be populated by grunt gitinfo
+  });
+
+  Object.keys(grunt.config.get('pkg').devDependencies).forEach(key => {
+    if (/^grunt(?!(-cli)?$)/.test(key)) {
+      // ignore grunt and grunt-cli
+      grunt.loadNpmTasks(key);
+    }
+  });
+
+  // Transifex does not understand placeholders, so this task patches all non-en
+  // locales with missing placeholders
+  grunt.registerTask('locale-patch', () => {
+    const en = grunt.file.readJSON('_locales/en/messages.json');
+    grunt.file.recurse('_locales', (abspath, rootdir, subdir, filename) => {
+      if (subdir === 'en' || filename !== 'messages.json') {
+        return;
+      }
+      const messages = grunt.file.readJSON(abspath);
+
+      // eslint-disable-next-line no-restricted-syntax
+      for (const key in messages) {
+        if (en[key] !== undefined && messages[key] !== undefined) {
+          if (
+            en[key].placeholders !== undefined &&
+            messages[key].placeholders === undefined
+          ) {
+            messages[key].placeholders = en[key].placeholders;
+          }
+        }
+      }
+
+      grunt.file.write(abspath, `${JSON.stringify(messages, null, 4)}\n`);
+    });
+  });
+
+  grunt.registerTask('getExpireTime', () => {
+    grunt.task.requires('gitinfo');
+    const gitinfo = grunt.config.get('gitinfo');
+    const committed = gitinfo.local.branch.current.lastCommitTime;
+    const buildCreation = Date.parse(committed);
+    const buildExpiration = buildCreation + 1000 * 60 * 60 * 24 * 90;
+    grunt.file.write(
+      'config/local-production.json',
+      `${JSON.stringify({ buildCreation, buildExpiration })}\n`
+    );
+  });
+
+  grunt.registerTask('clean-release', () => {
+    rimraf.sync('release');
+    mkdirp.sync('release');
+  });
+
+  async function runTests(environment) {
+    const { Application } = spectron;
+    const electronBinary =
+      process.platform === 'win32' ? 'electron.cmd' : 'electron';
+
+    const path = join(__dirname, 'node_modules', '.bin', electronBinary);
+    const args = [join(__dirname, 'app', 'main.js')];
+    grunt.log.writeln('Starting path', path, 'with args', args);
+    const app = new Application({
+      path,
+      args,
+      env: {
+        NODE_ENV: environment,
+      },
+      requireName: 'unused',
+      startTimeout: 30000,
+    });
+
+    function getMochaResults() {
+      // eslint-disable-next-line no-undef
+      return window.mochaResults;
+    }
+
+    async function logForFailure() {
+      const temporaryDirectory = join(
+        os.tmpdir(),
+        `Signal-Desktop-tests--${Date.now()}-${Math.random()
+          .toString()
+          .slice(2)}`
+      );
+      const renderProcessLogPath = join(
+        temporaryDirectory,
+        'render-process.log'
+      );
+      const mainProcessLogPath = join(temporaryDirectory, 'main-process.log');
+
+      await fs.promises.mkdir(temporaryDirectory, { recursive: true });
+
+      await Promise.all([
+        (async () => {
+          const logs = await app.client.getRenderProcessLogs();
+          await fs.promises.writeFile(
+            renderProcessLogPath,
+            logs.map(log => JSON.stringify(log)).join('\n')
+          );
+        })(),
+        (async () => {
+          const logs = await app.client.getMainProcessLogs();
+          await fs.promises.writeFile(mainProcessLogPath, logs.join('\n'));
+        })(),
+      ]);
+
+      console.error();
+      grunt.log.error(
+        `Renderer process logs written to ${renderProcessLogPath}`
+      );
+      grunt.log.error(`Renderer process logs written to ${mainProcessLogPath}`);
+      grunt.log.error(
+        `For easier debugging, try NODE_ENV='${environment}' yarn start`
+      );
+      console.error();
+    }
+
+    try {
+      await app.start();
+
+      grunt.log.writeln('App started. Now waiting for test results...');
+      await app.client.waitUntil(
+        () =>
+          app.client.execute(getMochaResults).then(data => Boolean(data.value)),
+        25000,
+        'Expected to find window.mochaResults set!'
+      );
+
+      const results = (await app.client.execute(getMochaResults)).value;
+      if (!results) {
+        await logForFailure();
+        throw new Error("Couldn't extract test results");
+      }
+
+      if (results.failures > 0) {
+        const errorMessage = `Found ${results.failures} failing test${
+          results.failures === 1 ? '' : 's'
+        }.`;
+        grunt.log.error(errorMessage);
+        results.reports.forEach(report => {
+          grunt.log.error(JSON.stringify(report, null, 2));
+        });
+        await logForFailure();
+        throw new Error(errorMessage);
+      }
+
+      grunt.log.ok(`${results.passes} tests passed.`);
+    } finally {
+      if (app.isRunning()) {
+        await app.stop();
+      }
+    }
+  }
+
+  grunt.registerTask(
+    'unit-tests',
+    'Run unit tests w/Electron',
+    function thisNeeded() {
+      const environment = grunt.option('env') || 'test';
+      promiseToAsyncGruntTask(runTests(environment), this.async());
+    }
+  );
+
+  grunt.registerTask(
+    'lib-unit-tests',
+    'Run libtextsecure unit tests w/Electron',
+    function thisNeeded() {
+      const environment = grunt.option('env') || 'test-lib';
+      promiseToAsyncGruntTask(runTests(environment), this.async());
+    }
+  );
+
+  grunt.registerMultiTask(
+    'test-release',
+    'Test packaged releases',
+    function thisNeeded() {
+      const dir = grunt.option('dir') || 'release';
+      const environment = grunt.option('env') || 'production';
+      const config = this.data;
+      const archive = [dir, config.archive].join('/');
+      const files = [
+        'config/default.json',
+        `config/${environment}.json`,
+        `config/local-${environment}.json`,
+      ];
+
+      console.log(this.target, archive);
+      const releaseFiles = files.concat(config.files || []);
+      releaseFiles.forEach(fileName => {
+        console.log(fileName);
+        try {
+          asar.statFile(archive, fileName);
+          return true;
+        } catch (e) {
+          console.log(e);
+          throw new Error(`Missing file ${fileName}`);
+        }
+      });
+
+      if (config.appUpdateYML) {
+        const appUpdateYML = [dir, config.appUpdateYML].join('/');
+        if (fs.existsSync(appUpdateYML)) {
+          console.log('auto update ok');
+        } else {
+          throw new Error(`Missing auto update config ${appUpdateYML}`);
+        }
+      }
+
+      const done = this.async();
+      // A simple test to verify a visible window is opened with a title
+      const { Application } = spectron;
+
+      const path = [dir, config.exe].join('/');
+      console.log('Starting path', path);
+      const app = new Application({
+        path,
+      });
+
+      const sleep = millis =>
+        new Promise(resolve => setTimeout(resolve, millis));
+
+      Promise.race([app.start(), sleep(15000)])
+        .then(() => {
+          if (!app.isRunning()) {
+            throw new Error('Application failed to start');
+          }
+
+          return app.client.getWindowCount();
+        })
+        .then(count => {
+          assert.equal(count, 1);
+          console.log('window opened');
+        })
+        .then(() =>
+          // Verify the window's title
+          app.client.waitUntil(
+            async () =>
+              (await app.client.getTitle()) === packageJson.productName,
+            {
+              timeoutMsg: `Expected window title to be ${JSON.stringify(
+                packageJson.productName
+              )}`,
+            }
+          )
+        )
+        .then(() => {
+          console.log('title ok');
+        })
+        .then(() => {
+          assert(
+            app.chromeDriver.logLines.indexOf(`NODE_ENV ${environment}`) > -1
+          );
+          console.log('environment ok');
+        })
+        .then(
+          () =>
+            // Successfully completed test
+            app.stop(),
+          error =>
+            // Test failed!
+            app.stop().then(() => {
+              grunt.fail.fatal(`Test failed: ${error.message} ${error.stack}`);
+            })
+        )
+        .catch(error => {
+          console.log('Main process logs:');
+          app.client.getMainProcessLogs().then(logs => {
+            logs.forEach(log => {
+              console.log(log);
+            });
+
+            // Test failed!
+            grunt.fail.fatal(`Failure! ${error.message} ${error.stack}`);
+          });
+        })
+        .then(done);
+    }
+  );
+
+  grunt.registerTask('tx', [
+    'exec:tx-pull-mostly-translated',
+    'exec:tx-pull-any-existing-translation',
+    'locale-patch',
+  ]);
+  grunt.registerTask('dev', ['default', 'watch']);
+  grunt.registerTask('test', ['unit-tests', 'lib-unit-tests']);
+  grunt.registerTask('date', ['gitinfo', 'getExpireTime']);
+  grunt.registerTask('default', [
+    'exec:build-protobuf',
+    'exec:transpile',
+    'concat',
+    'copy:deps',
+    'sass',
+    'date',
+  ]);
+};

README.md

@@ -1,4 +1,4 @@
-<!-- Copyright 2014-2022 Signal Messenger, LLC -->
+<!-- Copyright 2014-2021 Signal Messenger, LLC -->
 <!-- SPDX-License-Identifier: AGPL-3.0-only -->
 
 # Signal Desktop
@@ -20,9 +20,15 @@ Please search for any [existing issues](https://github.com/signalapp/Signal-Desk
 
 Please use our community forum: https://community.signalusers.org/
 
+## Contributing Translations
+
+Interested in helping to translate Signal? Contribute here:
+
+https://www.transifex.com/projects/p/signal-desktop
+
 ## Contributing Code
 
-Please see [CONTRIBUTING.md](https://github.com/signalapp/Signal-Desktop/blob/main/CONTRIBUTING.md)
+Please see [CONTRIBUTING.md](https://github.com/signalapp/Signal-Desktop/blob/master/CONTRIBUTING.md)
 for setup instructions and guidelines for new contributors. Don't forget to sign the [CLA](https://signal.org/cla/).
 
 ## Contributing Funds
@@ -40,6 +46,6 @@ The form and manner of this distribution makes it eligible for export under the
 
 ## License
 
-Copyright 2013–2022 Signal, a 501c3 nonprofit
+Copyright 2013–2021 Signal, a 501c3 nonprofit
 
 Licensed under the AGPLv3: https://opensource.org/licenses/agpl-3.0