Update dependencies

Co-authored-by: Victor Ibragimov <victor.ibragimov@gmail.com>

.circleci/config.yml

@@ -1,77 +1,48 @@
 version: 2.0
 jobs:
-  build:
-    docker:
-      - image: circleci/node:10
-    steps:
-      - checkout
-      - restore_cache:
-          key: send-build-{{ checksum "package-lock.json" }}
-      - run: npm install
-      - save_cache:
-          key: send-build-{{ checksum "package-lock.json" }}
-          paths:
-            - node_modules
-      - run: npm run build
-      - persist_to_workspace:
-          root: .
-          paths:
-            - ./dist
   test:
     docker:
-      - image: circleci/node:10-browsers
+      - image: circleci/node:12-browsers
     steps:
       - checkout
-      - restore_cache:
-          key: send-test-{{ checksum "package-lock.json" }}
-      - run: npm install
-      - save_cache:
-          key: send-test-{{ checksum "package-lock.json" }}
-          paths:
-            - node_modules
+      - run: npm ci
       - run: npm run lint
-      - run: npm run test
+      - run: npm test
       - store_artifacts:
           path: coverage
   integration_tests:
     docker:
-      - image: circleci/node:10-browsers
+      - image: circleci/node:12-browsers
     steps:
       - checkout
-      - restore_cache:
-          key: send-int-{{ checksum "package-lock.json" }}
-      - run: npm install
-      - save_cache:
-          key: send-int-{{ checksum "package-lock.json" }}
-          paths:
-            - node_modules
-      - run: 
+      - run: npm ci
+      - run:
           name: Run integration test
           command: ./scripts/bin/run-integration-test-circleci.sh
   deploy_dev:
-    machine: true
+    docker:
+      - image: circleci/node:12
     steps:
       - checkout
-      - attach_workspace:
-          at: .
+      - setup_remote_docker
       - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
       - run: docker build -t mozilla/send:latest .
       - run: docker push mozilla/send:latest
   deploy_vnext:
-    machine: true
+    docker:
+      - image: circleci/node:12
     steps:
       - checkout
-      - attach_workspace:
-          at: .
+      - setup_remote_docker
       - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
       - run: docker build -t mozilla/send:vnext .
       - run: docker push mozilla/send:vnext
   deploy_stage:
-    machine: true
+    docker:
+      - image: circleci/node:12
     steps:
       - checkout
-      - attach_workspace:
-          at: .
+      - setup_remote_docker
       - run: docker login -u $DOCKER_USER -p $DOCKER_PASS
       - run: docker build -t mozilla/send:$CIRCLE_TAG .
       - run: docker push mozilla/send:$CIRCLE_TAG
@@ -79,12 +50,6 @@ workflows:
   version: 2
   test_pr:
     jobs:
-      - build:
-          filters:
-            branches:
-              ignore:
-                - master
-                - vnext
       - test:
           filters:
             branches:
@@ -97,25 +62,13 @@ workflows:
               ignore: master
   build_and_deploy_dev:
     jobs:
-      - build:
-          filters:
-            branches:
-              only:
-                - master
-                - vnext
-            tags:
-              ignore: /^v.*/
       - deploy_dev:
-          requires:
-            - build
           filters:
             branches:
               only: master
             tags:
               ignore: /^v.*/
       - deploy_vnext:
-          requires:
-            - build
           filters:
             branches:
               only: vnext
@@ -123,12 +76,6 @@ workflows:
               ignore: /^v.*/
   build_and_deploy_stage:
     jobs:
-      - build:
-          filters:
-            branches:
-              ignore: /.*/
-            tags:
-              only: /^v.*/
       - test:
           filters:
             branches:
@@ -143,7 +90,6 @@ workflows:
               only: /^v.*/
       - deploy_stage:
           requires:
-            - build
             - test
             - integration_tests
           filters:

.dockerignore

@@ -1,10 +1,8 @@
-node_modules
-.git
-.tox
-.DS_Store
-firefox
-assets
-docs
-test
-coverage
+.circleci
 .nyc_output
+.vscode
+.DS_Store
+coverage
+docs
+firefox
+node_modules

.eslintignore

@@ -2,5 +2,6 @@ dist
 assets
 firefox
 coverage
+android/app/build
 app/locale.js
 app/capabilities.js

.eslintrc.yml

@@ -4,6 +4,7 @@ env:
 
 extends:
   - eslint:recommended
+  - prettier
   - plugin:node/recommended
   - plugin:security/recommended
 
@@ -18,17 +19,10 @@ rules:
   node/no-unsupported-features/es-syntax: off
   node/no-unsupported-features/node-builtins: off
   node/no-unpublished-require: off
+  node/no-unpublished-import: off
 
   security/detect-non-literal-fs-filename: off
   security/detect-object-injection: off
 
-  eol-last: [error, always]
-  eqeqeq: error
-  no-alert: warn
-  no-console: warn
-  no-path-concat: error
   no-unused-vars: [error, {argsIgnorePattern: "^_|err|event|next|reject"}]
-  no-var: error
-  one-var: [error, never]
-  prefer-const: error
-  quotes: [error, single, {avoidEscape: true}]
+  require-atomic-updates: warn

CODE_OF_CONDUCT.md

@@ -0,0 +1,15 @@
+# Community Participation Guidelines
+
+This repository is governed by Mozilla's code of conduct and etiquette guidelines. 
+For more details, please read the
+[Mozilla Community Participation Guidelines](https://www.mozilla.org/about/governance/policies/participation/). 
+
+## How to Report
+For more information on how to report violations of the Community Participation Guidelines, please read our '[How to Report](https://www.mozilla.org/about/governance/policies/participation/reporting/)' page.
+
+<!--
+## Project Specific Etiquette
+
+In some cases, there will be additional project etiquette i.e.: (https://bugzilla.mozilla.org/page.cgi?id=etiquette.html).
+Please update for your project.
+-->

CONTRIBUTORS

@@ -1,72 +1,121 @@
 Abdalrahman Hwoij
 Abhinav Adduri
 Adnan Kičin
+Adolfo Jayme Barrientos
 Alberto Castro
 Alexander Slovesnik
 Alfredos-Panagiotis Damkalis
+Aman Alam
 Amin Mahmudian
+Ander Elortondo
 Andreas Pettersson
+Anesu Chiodza
+Anika Dorn
+Anish Sheela
 Arash Mousavi
 Artem Polivanchuk
 Ashikur Rahman
+Ashok kumar
+Balasankar C
 Balázs Meskó
 Belayet Hossain
+Benjamin Forehand Jr
 Besnik Bleta
+Björn I
 Bjørn I
 Boopesh Mahendran
+Brahim Essaidi
+Brainlulz
 Breana Gonzales
+Christian Elbrianno
+Christoph Kührer
+Christopher Ramírez
 Chuck Harmston
+Cloney 173741
 Cláudio Esperança
 Cristian Silaghi
 Cynthia Pereira
 Daniel Thorn
 Daniela Arcese
 Danny Coates
+Davide
 Derek Tamsen
+Dhyey Thakore
+Donovan Preston
+Edi Santoso
 Edmund Huggett
 Elisa X
+Emily
+Emily Hou
 Emin Mastizada
 Enol
 Erica
 Erica Wright
+Fauzan Alfi
 Filip Hruška
 Fjoerfoks
 Francesco Lodolo
 Francesco Lodolo [:flod]
 Frederick Villaluna
+G12r
 Gabriela
 Gautam krishna.R
+George Raptis
 Georgianizator
 Gonçalo Matos
+Gwenn
+Hampus
+Hugo
+Hugo Abreu
 Hyeonseok Shin
 Håvar Henriksen
+Ian Neal
+ItielMaN
 Jae Hyeon Park
+Jakob Kappel
 Jakub Rychlý
 Jamie
+Jarmo
 Jim Spentzos
+Jiri Grönroos
 Jobava
+Joe Becher
+Joe ST
+Joergen
 Johann-S
 John Gruen
+Jon Buckley
 Jon Vadillo
 Jonathan Claudius
 Jordi Cuevas
 Jordi Serratosa
 Juan Esteban Ajsivinac Sián
+Juan Sián
 Juraj Cigáň
 Kerim Kalamujić
 Khaled Hosny
+Kim Ludvigsen
+Kim Younggeon
 Kohei Yoshino
 Lan Glad
+Lasse Liehu
 Laurent Jouanneau
 Lobodzets
 LuFlo
+Luis A. Sánchez
 Luiz Carlos de Morais
+Luiz Felipe F M Costa
 Luna Jernberg
+Mahay Alam Khan
+Marcelo Ghelman
 Marcelo Poli
 Marco Aurélio
 Mark Heijl
 Mark Liang
+Mark Liang (You-Wen)
 Marko Andrejić
+Martijn Dekker
+Marwan Mohamad
 Matjaž Horvat
 Maykon Chagas
 Melo46
@@ -75,24 +124,43 @@ Michael Köhler
 Michael Wolf
 Michal Stanke
 Michal Vašíček
+Mikeyy
+Miro Rauhala
 Mozilla Pontoon
+Mozilla-GitHub-Standards
+Mozinet
 Moḥend Belqasem
+Muhend Belkacem
 Muḥend Belqasem
+Myungjae Won
 Nicholas Skinsacos
 Nihad
 Nihad Suljić
+Niksend Mizuhara
 Oscar
+Paulius
+Pedro Burlamaqui Bendahan
 Peter deHaan
 Pierre Neter
 Pin-guang Chen
+Piotr Drąg
+Quentí
+Quế Tùng
+Rachel Tublitz
 Radu Popescu
 Rhoslyn Prys
 RickieES
+Rimas Kudelis
 Rizky Ariestiyansyah
+Rob Powell
+Robert
 Roberto Alvarado
 Rodrigo
 Rodrigo Guerra
 Rok Žerdin
+Romi Hardiyanto
+Rongjian Zhang
+Ruba
 Sahithi
 Sairam Raavi
 Sander Lepik
@@ -101,57 +169,104 @@ Sara Todaro
 Sav22999
 Schieck :)
 Selim Şumlu
+Selyan Sliman Amiri
+Sidak Singh Aulakh
 Slimane Amiri
+Slimane Selyan AMIRI
 Soumya Himanish Mohapatra
 Staś Małolepszy
+Suriyaa ✌️️
 Tema
 Thomas Dalichow
 Théo Chevalier
 Tiago Morais Morgado
+Tim Visée
+Tomer Cohen
 Tomáš Zelina
 Ton
+Top
 Tymur Faradzhev
 Uccen Marzuq
 Varghese Thomas
 Victor Bychek
+Vimal Raghubir
 Vitaliy Krutko
 Weihang Lo
+Wiktor Furman
 Wil Clouser
 YFdyh000
+Yassine Aït-El-Mouden
+Yongmin H
 You-Wen Liang (Mark)
+aaaaalbert
 aefgh39622
+alamanda
 albertdcastro
 alex_mayorga
 ariestiyansyah
 avelper
+chilledfrogs
+clouserw-mozilla-owner
 dgadelha
+dskmori
 ehuggett
 eljuno
+emily-hou1
 erdem cobanoglu
 gautamkrishnar
 gmontagu
 goofy
 hello
 hi
+ivan.pompa
 jesferman1993
 jlG
 josotrix
 jspam
+julen
+julenx
 kenrick95
+kumincir
+leo.toneff
+m4hdi.pdroid
+mail
 manxmensch
+marigalicer
+marsf
+merianosnikos
 mirzet.omerovic.1992
+mujeebcpy
+p.sanroman.bengoetxea
+passionforlife
+paul.trevor
+pyup.io bot
 ravmn
 rcmainak
 reza.habibi2008
+rgpublic
+risger
+robbp
+ruikunai
 savemore99.sm
+sergio
 shikhar-scs
 siparon
 skystar-p
+stripTM
+tatalmondmush
 tiagomoraismorgado
 timvisee
+victor.gonzalezro
 xcffl
 ybouhamam
+yoshimitsu002
+yusup.ramdani
 Μιχάλης
 Марко Костић (Marko Kostić)
+Ратко Вујановић
 صفا الفليج
 వీవెన్
+ജോയ്സ്
+张无忌
+新垣结衣松冈茉优长泽雅美门胁麦上野树里石原里美
+莫非前世那一眼

Dockerfile

@@ -1,17 +1,59 @@
-FROM node:10 AS builder
-RUN addgroup --gid 10001 app && adduser --disabled-password --gecos '' --gid 10001 --home /app --uid 10001 app
-COPY package*.json /app/
-WORKDIR /app
-RUN npm install --production
+##
+# Firefox Send - Mozilla
+#
+# License https://github.com/mozilla/send/blob/master/LICENSE
+##
 
-FROM node:10-slim
-RUN addgroup --gid 10001 app && adduser --disabled-password --gecos '' --gid 10001 --home /app --uid 10001 app
+
+# Build project
+FROM node:12 AS builder
+RUN set -x \
+    # Add user
+    && addgroup --gid 10001 app \
+    && adduser --disabled-password \
+        --gecos '' \
+        --gid 10001 \
+        --home /app \
+        --uid 10001 \
+        app
+COPY --chown=app:app . /app
 USER app
 WORKDIR /app
-COPY --chown=app:app --from=builder /app .
-COPY --chown=app:app . .
+RUN set -x \
+    # Build
+    && PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true npm ci \
+    && npm run build
+
+
+# Main image
+FROM node:12-slim
+RUN set -x \
+    # Add user
+    && addgroup --gid 10001 app \
+    && adduser --disabled-password \
+        --gecos '' \
+        --gid 10001 \
+        --home /app \
+        --uid 10001 \
+        app
+RUN apt-get update && apt-get -y install \
+    git-core \
+    && rm -rf /var/lib/apt/lists/*
+USER app
+WORKDIR /app
+COPY --chown=app:app package*.json ./
+COPY --chown=app:app app app
+COPY --chown=app:app common common
+COPY --chown=app:app public/locales public/locales
+COPY --chown=app:app server server
+COPY --chown=app:app --from=builder /app/dist dist
+
+RUN npm ci --production && npm cache clean --force
+RUN mkdir -p /app/.config/configstore
+RUN ln -s dist/version.json version.json
 
 ENV PORT=1443
-EXPOSE $PORT
+
+EXPOSE ${PORT}
 
 CMD ["node", "server/bin/prod.js"]

README.md

@@ -1,4 +1,4 @@
-# Firefox Send
+# [![Firefox Send](./assets/icon.svg)](https://send.firefox.com/) Firefox Send
 
 [![CircleCI](https://img.shields.io/circleci/project/github/mozilla/send.svg)](https://circleci.com/gh/mozilla/send)
 
@@ -16,6 +16,7 @@
 * [Localization](#localization)
 * [Contributing](#contributing)
 * [Testing](#testing)
+* [Deployment](#deployment)
 * [Android](#android)
 * [License](#license)
 
@@ -29,22 +30,22 @@ A file sharing experiment which allows you to send encrypted files to other user
 
 ## Requirements
 
-- [Node.js 10.0+](https://nodejs.org/)
+- [Node.js 12.x](https://nodejs.org/)
 - [Redis server](https://redis.io/) (optional for development)
-- [AWS S3](https://aws.amazon.com/s3/) or compatible service. (optional)
+- [AWS S3](https://aws.amazon.com/s3/) or compatible service (optional)
 
 ---
 
 ## Development
 
-To start an ephemeral development server run:
+To start an ephemeral development server, run:
 
 ```sh
 npm install
 npm start
 ```
 
-Then browse to http://localhost:8080
+Then, browse to http://localhost:1337
 
 ---
 
@@ -91,9 +92,15 @@ Pull requests are always welcome! Feel free to check out the list of ["good firs
 
 ---
 
+## Deployment
+
+see also [docs/deployment.md](docs/deployment.md)
+
+---
+
 ## Android
 
-The android implementation is contained in the `android` directory, and can be viewed locally for easy testing and editing by running `ANDROID=1 npm start` and then visiting <http://localhost:8080>. CSS and image files are located in the `android/app/src/main/assets` directory.
+The android implementation is contained in the `android` directory, and can be viewed locally for easy testing and editing by running `ANDROID=1 npm start` and then visiting <http://localhost:1337>. CSS and image files are located in the `android/app/src/main/assets` directory.
 
 ---
 

android/android.js

@@ -1,8 +1,7 @@
-/* global window, navigator */
-import 'fluent-intl-polyfill';
+import 'intl-pluralrules';
 import choo from 'choo';
 import html from 'choo/html';
-import Raven from 'raven-js';
+import * as Sentry from '@sentry/browser';
 
 import { setApiUrlPrefix, getConstants } from '../app/api';
 import metrics from '../app/metrics';
@@ -19,6 +18,8 @@ import share from './pages/share';
 import preferences from './pages/preferences';
 import error from './pages/error';
 import { getTranslator } from '../app/locale';
+import { setTranslate } from '../app/utils';
+
 import { delay } from '../app/utils';
 
 if (navigator.userAgent === 'Send Android') {
@@ -51,7 +52,7 @@ function body(main) {
 
     const menu = html`<a
         id="hamburger"
-        class="absolute pin-t pin-r z-50"
+        class="absolute top-0 right-0 z-50"
         href="#"
         onclick="${clickPreferences}"
       >
@@ -59,9 +60,7 @@ function body(main) {
       </a>`;
     */
     return html`
-      <body
-        class="flex flex-col items-center font-sans bg-grey-lightest h-screen"
-      >
+      <body class="flex flex-col items-center font-sans bg-grey-10 h-screen">
         ${state.cache(Header, 'header').render()} ${main(state, emit)}
       </body>
     `;
@@ -69,6 +68,7 @@ function body(main) {
 }
 (async function start() {
   const translate = await getTranslator('en-US');
+  setTranslate(translate);
   const { LIMITS, DEFAULTS } = await getConstants();
   app.use(state => {
     state.LIMITS = LIMITS;
@@ -80,7 +80,7 @@ function body(main) {
     state.archive = new Archive([], DEFAULTS.EXPIRE_SECONDS);
     state.storage = storage;
     state.user = new User(storage, LIMITS);
-    state.raven = Raven;
+    state.sentry = Sentry;
   });
   app.use(metrics);
   app.route('/', body(home));

android/app/build.gradle

@@ -1,7 +1,5 @@
 apply plugin: 'com.android.application'
-
 apply plugin: 'kotlin-android'
-
 apply plugin: 'kotlin-android-extensions'
 
 android {
@@ -31,7 +29,7 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     implementation 'com.github.delight-im:Android-AdvancedWebView:v3.0.0'
-    implementation "org.mozilla.components:service-firefox-accounts:${rootProject.ext.android_components_version}"
+    implementation "org.mozilla.components:service-firefox-accounts:$android_components_version"
 }
 
 task generateAndLinkBundle(type: Exec, description: 'Generate the android.js bundle and link it into the assets directory') {

android/app/src/main/java/org/mozilla/firefoxsend/MainActivity.kt

@@ -1,39 +1,39 @@
 package org.mozilla.firefoxsend
 
-
-import android.support.v7.app.AppCompatActivity
-import android.os.Bundle
-import im.delight.android.webview.AdvancedWebView
-import android.graphics.Bitmap
-import android.content.Intent
 import android.annotation.SuppressLint
 import android.content.ComponentName
+import android.content.Intent
+import android.graphics.Bitmap
 import android.net.Uri
-import android.webkit.WebView
-import android.webkit.WebMessage
-import android.util.Log
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
 import android.util.Base64
+import android.util.Log
 import android.view.View
-import android.webkit.ConsoleMessage
-import android.webkit.JavascriptInterface
-import android.webkit.WebChromeClient
+import android.webkit.*
+import im.delight.android.webview.AdvancedWebView
+import kotlinx.android.synthetic.main.activity_main.*
 import mozilla.components.service.fxa.Config
 import mozilla.components.service.fxa.FirefoxAccount
-import mozilla.components.service.fxa.Profile
 import mozilla.components.service.fxa.FxaResult
+import org.json.JSONObject
 
 internal class LoggingWebChromeClient : WebChromeClient() {
     override fun onConsoleMessage(cm: ConsoleMessage): Boolean {
-        Log.w("CONTENT", String.format("%s @ %d: %s",
+        Log.d(TAG, String.format("%s @ %d: %s",
                 cm.message(), cm.lineNumber(), cm.sourceId()))
         return true
     }
+
+    companion object {
+        private const val TAG = "CONTENT"
+    }
 }
 
 class WebAppInterface(private val mContext: MainActivity) {
     @JavascriptInterface
     fun beginOAuthFlow() {
-        mContext.beginOAuthFlow();
+        mContext.beginOAuthFlow()
     }
 
     @JavascriptInterface
@@ -43,176 +43,184 @@ class WebAppInterface(private val mContext: MainActivity) {
 }
 
 class MainActivity : AppCompatActivity(), AdvancedWebView.Listener {
-    private var mWebView: AdvancedWebView? = null
+
     private var mToShare: String? = null
     private var mToCall: String? = null
     private var mAccount: FirefoxAccount? = null
 
+    @SuppressLint("SetJavaScriptEnabled")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        // https://developers.google.com/web/tools/chrome-devtools/remote-debugging/webviews
-        // WebView.setWebContentsDebuggingEnabled(true); // TODO only dev builds
+        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG)
+        webView.apply {
+            setListener(this@MainActivity, this@MainActivity)
+            addJavascriptInterface(WebAppInterface(this@MainActivity), JS_INTERFACE_NAME)
+            setLayerType(View.LAYER_TYPE_HARDWARE, null)
+            webChromeClient = LoggingWebChromeClient()
 
-        mWebView = findViewById<WebView>(R.id.webview) as AdvancedWebView
-        mWebView!!.setListener(this, this)
-        mWebView!!.setWebChromeClient(LoggingWebChromeClient())
-        mWebView!!.addJavascriptInterface(WebAppInterface(this), "Android")
-        mWebView!!.setLayerType(View.LAYER_TYPE_HARDWARE, null);
+            settings.apply {
+                userAgentString = "Send Android"
+                allowUniversalAccessFromFileURLs = true
+                javaScriptEnabled = true
+            }
+        }
 
-        val webSettings = mWebView!!.getSettings()
-        webSettings.setUserAgentString("Send Android")
-        webSettings.setAllowUniversalAccessFromFileURLs(true)
-        webSettings.setJavaScriptEnabled(true)
-
-        val intent = getIntent()
-        val action = intent.getAction()
-        val type = intent.getType()
-
-        if (Intent.ACTION_SEND.equals(action) && type != null) {
-            if (type.equals("text/plain")) {
+        val type = intent.type
+        if (Intent.ACTION_SEND == intent.action && type != null) {
+            if (type == "text/plain") {
                 val sharedText = intent.getStringExtra(Intent.EXTRA_TEXT)
-                Log.w("INTENT", "text/plain " + sharedText)
+                // Log.d(TAG_INTENT, "text/plain $sharedText")
                 mToShare = "data:text/plain;base64," + Base64.encodeToString(sharedText.toByteArray(), 16).trim()
             } else if (type.startsWith("image/")) {
                 val imageUri = intent.getParcelableExtra(Intent.EXTRA_STREAM) as Uri
-                Log.w("INTENT", "image/ " + imageUri)
+                // Log.d(TAG_INTENT, "image/ $imageUri")
                 mToShare = "data:text/plain;base64," + Base64.encodeToString(imageUri.path.toByteArray(), 16).trim()
             }
         }
-        mWebView!!.loadUrl("file:///android_asset/android.html")
-
+        webView.loadUrl("file:///android_asset/android.html")
     }
 
     fun beginOAuthFlow() {
-        Config.release().then(fun (value: Config): FxaResult<Unit> {
+        Config.release().then { value ->
             mAccount = FirefoxAccount(value, "20f7931c9054d833", "https://send.firefox.com/fxa/android-redirect.html")
-            mAccount?.beginOAuthFlow(arrayOf("profile", "https://identity.mozilla.com/apps/send"), true)?.then(fun (url: String): FxaResult<Unit> {
-                Log.w("CONFIG", "GOT A URL " + url)
-                this@MainActivity.runOnUiThread({
-                    mWebView!!.loadUrl(url)
-                })
-                return FxaResult.fromValue(Unit)
-            })
-            Log.w("CONFIG", "CREATED FIREFOXACCOUNT")
-            return FxaResult.fromValue(Unit)
-        })
+            mAccount?.beginOAuthFlow(arrayOf("profile", "https://identity.mozilla.com/apps/send"), true)
+                    ?.then { url ->
+                        // Log.d(TAG_CONFIG, "GOT A URL $url")
+                        this@MainActivity.runOnUiThread {
+                            webView.loadUrl(url)
+                        }
+                        FxaResult.fromValue(Unit)
+                    }
+            // Log.d(TAG_CONFIG, "CREATED FIREFOXACCOUNT")
+            FxaResult.fromValue(Unit)
+        }
     }
 
     fun shareUrl(url: String) {
-        val shareIntent = Intent()
-        shareIntent.action = Intent.ACTION_SEND
-        shareIntent.type = "text/plain"
-        shareIntent.putExtra(Intent.EXTRA_TEXT, url)
+        val shareIntent = Intent().apply {
+            action = Intent.ACTION_SEND
+            type = "text/plain"
+            putExtra(Intent.EXTRA_TEXT, url)
+        }
+
+        val components = arrayOf(ComponentName(applicationContext, MainActivity::class.java))
         val chooser = Intent.createChooser(shareIntent, "")
-        chooser.putExtra(Intent.EXTRA_EXCLUDE_COMPONENTS, arrayOf(ComponentName(applicationContext, MainActivity::class.java)))
+                .putExtra(Intent.EXTRA_EXCLUDE_COMPONENTS, components)
+
         startActivity(chooser)
     }
 
-    @SuppressLint("NewApi")
     override fun onResume() {
         super.onResume()
-        mWebView!!.onResume()
-        // ...
+        webView.onResume()
     }
 
-    @SuppressLint("NewApi")
     override fun onPause() {
-        mWebView!!.onPause()
-        // ...
+        webView.onPause()
         super.onPause()
     }
 
     override fun onDestroy() {
-        mWebView!!.onDestroy()
-        // ...
+        webView.onDestroy()
         super.onDestroy()
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
         super.onActivityResult(requestCode, resultCode, intent)
-        mWebView!!.onActivityResult(requestCode, resultCode, intent)
-        // ...
+        webView.onActivityResult(requestCode, resultCode, intent)
     }
 
     override fun onBackPressed() {
-        if (!mWebView!!.onBackPressed()) {
+        if (!webView.onBackPressed()) {
             return
         }
-        // ...
         super.onBackPressed()
     }
 
     override fun onPageStarted(url: String, favicon: Bitmap?) {
         if (url.startsWith("https://send.firefox.com/fxa/android-redirect.html")) {
             // We load this here so the user doesn't see the android-redirect.html page
-            mWebView!!.loadUrl("file:///android_asset/android.html")
+            webView.loadUrl("file:///android_asset/android.html")
 
-            val parsed = Uri.parse(url)
-            val code = parsed.getQueryParameter("code")
-            val state = parsed.getQueryParameter("state")
-
-            code?.let { code ->
-                state?.let { state ->
+            val uri = Uri.parse(url)
+            uri.getQueryParameter("code")?.let { code ->
+                uri.getQueryParameter("state")?.let { state ->
                     mAccount?.completeOAuthFlow(code, state)?.whenComplete { info ->
-                        //displayAndPersistProfile(code, state)
-                        val profile = mAccount?.getProfile(false)?.then(fun (profile: Profile): FxaResult<Unit> {
-                            val accessToken = info.accessToken
-                            val keys = info.keys
-                            val avatar = profile.avatar
-                            val displayName = profile.displayName
-                            val email = profile.email
-                            val uid = profile.uid
-                            val toPass = "{\"accessToken\": \"${accessToken}\", \"keys\": '${keys}', \"avatar\": \"${avatar}\", \"displayName\": \"${displayName}\", \"email\": \"${email}\", \"uid\": \"${uid}\"}"
-                            mToCall = "finishLogin(${toPass})"
-                            this@MainActivity.runOnUiThread({
+                        mAccount?.getProfile(false)?.then { profile ->
+                            val profileJsonPayload = JSONObject()
+                                    .put("accessToken", info.accessToken)
+                                    .put("keys", info.keys)
+                                    .put("avatar", profile.avatar)
+                                    .put("displayName", profile.displayName)
+                                    .put("email", profile.email)
+                                    .put("uid", profile.uid).toString()
+                            mToCall = "finishLogin($profileJsonPayload)"
+                            this@MainActivity.runOnUiThread {
                                 // Clear the history so that the user can't use the back button to see broken pages
                                 // that were inserted into the history by the login process.
-                                mWebView!!.clearHistory()
+                                webView.clearHistory()
 
                                 // We also reload this here because we need to make sure onPageFinished runs after mToCall has been set.
                                 // We can't guarantee that onPageFinished wasn't already called at this point.
-                                mWebView!!.loadUrl("file:///android_asset/android.html")
-                            })
-
-
-                            return FxaResult.fromValue(Unit)
-                        })
+                                webView.loadUrl("file:///android_asset/android.html")
+                            }
+                            FxaResult.fromValue(Unit)
+                        }
                     }
                 }
             }
         }
-        Log.w("MAIN", "onPageStarted");
+        if (!url.startsWith("file:///android_asset/") && !url.startsWith("https://accounts.firefox.com/")) {
+            // Don't allow loading anything other than the app in our webview
+            // It should be possible to do this with shouldOverrideUrlLoading
+            // but it didn't seem to be working, so this works as a hack.
+            webView.loadUrl("file:///android_asset/android.html")
+            Log.d(TAG_MAIN, "BAD URL " + url)
+        } else {
+            // Log.d(TAG_MAIN, "onPageStarted " + url)
+        }
     }
 
     override fun onPageFinished(url: String) {
-        Log.w("MAIN", "onPageFinished")
+        // Log.d(TAG_MAIN, "onPageFinished")
         if (mToShare != null) {
-            Log.w("INTENT", mToShare)
+            // Log.d(TAG_INTENT, mToShare)
 
-            mWebView?.postWebMessage(WebMessage(mToShare), Uri.EMPTY)
+            webView.postWebMessage(WebMessage(mToShare), Uri.EMPTY)
             mToShare = null
         }
         if (mToCall != null) {
-            this@MainActivity.runOnUiThread({
-                mWebView?.evaluateJavascript(mToCall, fun (value: String) {
+            this@MainActivity.runOnUiThread {
+                webView.evaluateJavascript(mToCall) {
                     mToCall = null
-                })
-            })
+                }
+            }
         }
     }
 
     override fun onPageError(errorCode: Int, description: String, failingUrl: String) {
-        Log.w("MAIN", "onPageError " + description)
+        Log.d(TAG_MAIN, "onPageError($errorCode, $description, $failingUrl)")
     }
 
-    override fun onDownloadRequested(url: String, suggestedFilename: String, mimeType: String, contentLength: Long, contentDisposition: String, userAgent: String) {
-        Log.w("MAIN", "onDownloadRequested")
+    override fun onDownloadRequested(url: String,
+                                     suggestedFilename: String,
+                                     mimeType: String,
+                                     contentLength: Long,
+                                     contentDisposition: String,
+                                     userAgent: String) {
+        // Log.d(TAG_MAIN, "onDownloadRequested")
     }
 
     override fun onExternalPageRequest(url: String) {
-        Log.w("MAIN", "onExternalPageRequest")
+        // Log.d(TAG_MAIN, "onExternalPageRequest($url)")
     }
 
+    companion object {
+        private const val TAG_MAIN = "MAIN"
+        private const val TAG_INTENT = "INTENT"
+        private const val TAG_CONFIG = "CONFIG"
+        private const val JS_INTERFACE_NAME = "Android"
+    }
 }

android/app/src/main/res/layout/activity_main.xml

@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<im.delight.android.webview.AdvancedWebView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/webView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity">
-
-    <im.delight.android.webview.AdvancedWebView
-        android:id="@+id/webview"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</android.support.constraint.ConstraintLayout>
+    tools:context=".MainActivity" />

android/build.gradle

@@ -8,20 +8,15 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.20"
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.21"
     }
 }
 
 allprojects {
     repositories {
         google()
-        maven {
-            url "https://maven.mozilla.org/maven2"
-        }
+        maven { url "https://maven.mozilla.org/maven2" }
         jcenter()
         maven { url "https://jitpack.io" }
     }

android/pages/home.js

@@ -25,7 +25,7 @@ module.exports = function(state, emit) {
   let content = '';
   let button = html`
     <div
-      class="bg-blue rounded-full m-4 flex items-center justify-center shadow-lg"
+      class="bg-blue-50 rounded-full m-4 flex items-center justify-center shadow-lg"
       style="width: 56px; height: 56px"
       onclick="${onclick}"
     >
@@ -42,11 +42,7 @@ module.exports = function(state, emit) {
     content =
       archives.length < 1
         ? intro(state)
-        : list(
-            archives,
-            'list-reset h-full overflow-y-auto w-full',
-            'mb-3 w-full'
-          );
+        : list(archives, 'h-full overflow-y-auto w-full', 'mb-3 w-full');
   }
 
   return html`
@@ -57,7 +53,7 @@ module.exports = function(state, emit) {
       >
         ${content}
       </section>
-      <div class="fixed pin-r pin-b z-20">
+      <div class="fixed right-0 bottom-0 z-20">
         ${button}
         <input
           id="file-upload"

android/stores/state.js

@@ -12,7 +12,7 @@ export default function initialState(state, emitter) {
     getAsset(name) {
       return `${state.prefix}/${name}`;
     },
-    raven: {
+    sentry: {
       captureException: e => {
         console.error('ERROR ' + e + ' ' + e.stack);
       }

app/api.js

@@ -11,6 +11,15 @@ if (!fileProtocolWssUrl) {
   fileProtocolWssUrl = 'wss://send.firefox.com/api/ws';
 }
 
+export class ConnectionError extends Error {
+  constructor(cancelled, duration, size) {
+    super(cancelled ? '0' : 'connection closed');
+    this.cancelled = cancelled;
+    this.duration = duration;
+    this.size = size;
+  }
+}
+
 export function setFileProtocolWssUrl(url) {
   localStorage && localStorage.setItem('wssURL', url);
   fileProtocolWssUrl = url;
@@ -52,7 +61,10 @@ async function fetchWithAuth(url, params, keychain) {
   const result = {};
   params = params || {};
   const h = await keychain.authHeader();
-  params.headers = new Headers({ Authorization: h });
+  params.headers = new Headers({
+    Authorization: h,
+    'Content-Type': 'application/json'
+  });
   const response = await fetch(url, params);
   result.response = response;
   result.ok = response.ok;
@@ -118,10 +130,10 @@ export async function metadata(id, keychain) {
     return {
       size: meta.size,
       ttl: data.ttl,
-      iv: meta.iv,
       name: meta.name,
       type: meta.type,
-      manifest: meta.manifest
+      manifest: meta.manifest,
+      flagged: data.flagged
     };
   }
   throw new Error(result.response.status);
@@ -137,17 +149,25 @@ export async function setPassword(id, owner_token, keychain) {
 }
 
 function asyncInitWebSocket(server) {
-  return new Promise(resolve => {
-    const ws = new WebSocket(server);
-    ws.onopen = () => {
-      resolve(ws);
-    };
+  return new Promise((resolve, reject) => {
+    try {
+      const ws = new WebSocket(server);
+      ws.addEventListener('open', () => resolve(ws), { once: true });
+    } catch (e) {
+      reject(new ConnectionError(false));
+    }
   });
 }
 
 function listenForResponse(ws, canceller) {
   return new Promise((resolve, reject) => {
+    function handleClose(event) {
+      // a 'close' event before a 'message' event means the request failed
+      ws.removeEventListener('message', handleMessage);
+      reject(new ConnectionError(canceller.cancelled));
+    }
     function handleMessage(msg) {
+      ws.removeEventListener('close', handleClose);
       try {
         const response = JSON.parse(msg.data);
         if (response.error) {
@@ -156,13 +176,11 @@ function listenForResponse(ws, canceller) {
           resolve(response);
         }
       } catch (e) {
-        ws.close();
-        canceller.cancelled = true;
-        canceller.error = e;
         reject(e);
       }
     }
     ws.addEventListener('message', handleMessage, { once: true });
+    ws.addEventListener('close', handleClose, { once: true });
   });
 }
 
@@ -176,6 +194,8 @@ async function upload(
   onprogress,
   canceller
 ) {
+  let size = 0;
+  const start = Date.now();
   const host = window.location.hostname;
   const port = window.location.port;
   const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
@@ -203,31 +223,41 @@ async function upload(
 
     const reader = stream.getReader();
     let state = await reader.read();
-    let size = 0;
     while (!state.done) {
-      const buf = state.value;
       if (canceller.cancelled) {
-        throw canceller.error;
+        ws.close();
       }
-
+      if (ws.readyState !== WebSocket.OPEN) {
+        break;
+      }
+      const buf = state.value;
       ws.send(buf);
-
       onprogress(size);
       size += buf.length;
       state = await reader.read();
-      while (ws.bufferedAmount > ECE_RECORD_SIZE * 2) {
+      while (
+        ws.bufferedAmount > ECE_RECORD_SIZE * 2 &&
+        ws.readyState === WebSocket.OPEN &&
+        !canceller.cancelled
+      ) {
         await delay();
       }
     }
-    const footer = new Uint8Array([0]);
-    ws.send(footer);
+    if (ws.readyState === WebSocket.OPEN) {
+      ws.send(new Uint8Array([0])); //EOF
+    }
 
     await completedResponse;
-    ws.close();
+    uploadInfo.duration = Date.now() - start;
     return uploadInfo;
   } catch (e) {
-    ws.close(4000);
+    e.size = size;
+    e.duration = Date.now() - start;
     throw e;
+  } finally {
+    if (![WebSocket.CLOSED, WebSocket.CLOSING].includes(ws.readyState)) {
+      ws.close();
+    }
   }
 }
 
@@ -244,7 +274,6 @@ export function uploadWs(
 
   return {
     cancel: function() {
-      canceller.error = new Error(0);
       canceller.cancelled = true;
     },
 
@@ -263,20 +292,13 @@ export function uploadWs(
 
 ////////////////////////
 
-async function downloadS(id, keychain, signal) {
-  const auth = await keychain.authHeader();
-
+async function _downloadStream(id, dlToken, signal) {
   const response = await fetch(getApiUrl(`/api/download/${id}`), {
     signal: signal,
     method: 'GET',
-    headers: { Authorization: auth }
+    headers: { Authorization: `Bearer ${dlToken}` }
   });
 
-  const authHeader = response.headers.get('WWW-Authenticate');
-  if (authHeader) {
-    keychain.nonce = parseNonce(authHeader);
-  }
-
   if (response.status !== 200) {
     throw new Error(response.status);
   }
@@ -284,13 +306,13 @@ async function downloadS(id, keychain, signal) {
   return response.body;
 }
 
-async function tryDownloadStream(id, keychain, signal, tries = 1) {
+async function tryDownloadStream(id, dlToken, signal, tries = 2) {
   try {
-    const result = await downloadS(id, keychain, signal);
+    const result = await _downloadStream(id, dlToken, signal);
     return result;
   } catch (e) {
     if (e.message === '401' && --tries > 0) {
-      return tryDownloadStream(id, keychain, signal, tries);
+      return tryDownloadStream(id, dlToken, signal, tries);
     }
     if (e.name === 'AbortError') {
       throw new Error('0');
@@ -299,31 +321,27 @@ async function tryDownloadStream(id, keychain, signal, tries = 1) {
   }
 }
 
-export function downloadStream(id, keychain) {
+export function downloadStream(id, dlToken) {
   const controller = new AbortController();
   function cancel() {
     controller.abort();
   }
   return {
     cancel,
-    result: tryDownloadStream(id, keychain, controller.signal, 2)
+    result: tryDownloadStream(id, dlToken, controller.signal)
   };
 }
 
 //////////////////
 
-function download(id, keychain, onprogress, canceller) {
+async function download(id, dlToken, onprogress, canceller) {
   const xhr = new XMLHttpRequest();
   canceller.oncancel = function() {
     xhr.abort();
   };
-  return new Promise(async function(resolve, reject) {
+  return new Promise(function(resolve, reject) {
     xhr.addEventListener('loadend', function() {
       canceller.oncancel = function() {};
-      const authHeader = xhr.getResponseHeader('WWW-Authenticate');
-      if (authHeader) {
-        keychain.nonce = parseNonce(authHeader);
-      }
       if (xhr.status !== 200) {
         return reject(new Error(xhr.status));
       }
@@ -337,28 +355,27 @@ function download(id, keychain, onprogress, canceller) {
         onprogress(event.loaded);
       }
     });
-    const auth = await keychain.authHeader();
     xhr.open('get', getApiUrl(`/api/download/blob/${id}`));
-    xhr.setRequestHeader('Authorization', auth);
+    xhr.setRequestHeader('Authorization', `Bearer ${dlToken}`);
     xhr.responseType = 'blob';
     xhr.send();
     onprogress(0);
   });
 }
 
-async function tryDownload(id, keychain, onprogress, canceller, tries = 1) {
+async function tryDownload(id, dlToken, onprogress, canceller, tries = 2) {
   try {
-    const result = await download(id, keychain, onprogress, canceller);
+    const result = await download(id, dlToken, onprogress, canceller);
     return result;
   } catch (e) {
     if (e.message === '401' && --tries > 0) {
-      return tryDownload(id, keychain, onprogress, canceller, tries);
+      return tryDownload(id, dlToken, onprogress, canceller, tries);
     }
     throw e;
   }
 }
 
-export function downloadFile(id, keychain, onprogress) {
+export function downloadFile(id, dlToken, onprogress) {
   const canceller = {
     oncancel: function() {} // download() sets this
   };
@@ -367,7 +384,7 @@ export function downloadFile(id, keychain, onprogress) {
   }
   return {
     cancel,
-    result: tryDownload(id, keychain, onprogress, canceller, 2)
+    result: tryDownload(id, dlToken, onprogress, canceller)
   };
 }
 
@@ -412,3 +429,44 @@ export async function getConstants() {
 
   throw new Error(response.status);
 }
+
+export async function reportLink(id, keychain, reason) {
+  const result = await fetchWithAuthAndRetry(
+    getApiUrl(`/api/report/${id}`),
+    {
+      method: 'POST',
+      body: JSON.stringify({ reason })
+    },
+    keychain
+  );
+
+  if (result.ok) {
+    return;
+  }
+
+  throw new Error(result.response.status);
+}
+
+export async function getDownloadToken(id, keychain) {
+  const result = await fetchWithAuthAndRetry(
+    getApiUrl(`/api/download/token/${id}`),
+    {
+      method: 'GET'
+    },
+    keychain
+  );
+
+  if (result.ok) {
+    return (await result.response.json()).token;
+  }
+  throw new Error(result.response.status);
+}
+
+export async function downloadDone(id, dlToken) {
+  const headers = new Headers({ Authorization: `Bearer ${dlToken}` });
+  const response = await fetch(getApiUrl(`/api/download/done/${id}`), {
+    headers,
+    method: 'POST'
+  });
+  return response.ok;
+}

app/capabilities.js

@@ -1,5 +1,5 @@
-/* global AUTH_CONFIG LOCALE */
-import { browserName } from './utils';
+/* global AUTH_CONFIG */
+import { browserName, locale } from './utils';
 
 async function checkCrypto() {
   try {
@@ -76,8 +76,9 @@ async function polyfillStreams() {
 }
 
 export default async function getCapabilities() {
-  const serviceWorker =
-    'serviceWorker' in navigator && browserName() !== 'edge';
+  const browser = browserName();
+  const isMobile = /mobi|android/i.test(navigator.userAgent);
+  const serviceWorker = 'serviceWorker' in navigator && browser !== 'edge';
   let crypto = await checkCrypto();
   const nativeStreams = checkStreams();
   let polyStreams = false;
@@ -91,19 +92,23 @@ export default async function getCapabilities() {
     account = false;
   }
   const share =
-    typeof navigator.share === 'function' && LOCALE.startsWith('en'); // en until strings merge
+    isMobile &&
+    typeof navigator.share === 'function' &&
+    locale().startsWith('en'); // en until strings merge
 
   const standalone =
     window.matchMedia('(display-mode: standalone)').matches ||
     navigator.standalone;
 
+  const mobileFirefox = browser === 'firefox' && isMobile;
+
   return {
     account,
     crypto,
     serviceWorker,
     streamUpload: nativeStreams || polyStreams,
     streamDownload:
-      nativeStreams && serviceWorker && browserName() !== 'safari',
+      nativeStreams && serviceWorker && browser !== 'safari' && !mobileFirefox,
     multifile: nativeStreams || polyStreams,
     share,
     standalone

app/controller.js

@@ -2,11 +2,12 @@ import FileSender from './fileSender';
 import FileReceiver from './fileReceiver';
 import { copyToClipboard, delay, openLinksInNewTab, percent } from './utils';
 import * as metrics from './metrics';
-import { bytes } from './utils';
+import { bytes, locale } from './utils';
 import okDialog from './ui/okDialog';
 import copyDialog from './ui/copyDialog';
 import shareDialog from './ui/shareDialog';
 import signupDialog from './ui/signupDialog';
+import surveyDialog from './ui/surveyDialog';
 
 export default function(state, emitter) {
   let lastRender = 0;
@@ -48,8 +49,8 @@ export default function(state, emitter) {
     state.user.login(email);
   });
 
-  emitter.on('logout', () => {
-    state.user.logout();
+  emitter.on('logout', async () => {
+    await state.user.logout();
     metrics.loggedOut({ trigger: 'button' });
     emitter.emit('pushState', '/');
   });
@@ -75,7 +76,7 @@ export default function(state, emitter) {
       state.storage.remove(ownedFile.id);
       await ownedFile.del();
     } catch (e) {
-      state.raven.captureException(e);
+      state.sentry.captureException(e);
     }
     render();
   });
@@ -175,14 +176,23 @@ export default function(state, emitter) {
     } catch (err) {
       if (err.message === '0') {
         //cancelled. do nothing
-        const duration = Date.now() - start;
-        metrics.cancelledUpload(archive, duration);
+        metrics.cancelledUpload(archive, err.duration);
         render();
+      } else if (err.message === '401') {
+        const refreshed = await state.user.refresh();
+        if (refreshed) {
+          return emitter.emit('upload');
+        }
+        emitter.emit('pushState', '/error');
       } else {
         // eslint-disable-next-line no-console
         console.error(err);
-        state.raven.captureException(err);
-        metrics.stoppedUpload(archive);
+        state.sentry.withScope(scope => {
+          scope.setExtra('duration', err.duration);
+          scope.setExtra('size', err.size);
+          state.sentry.captureException(err);
+        });
+        metrics.stoppedUpload(archive, err.duration);
         emitter.emit('pushState', '/error');
       }
     } finally {
@@ -222,9 +232,10 @@ export default function(state, emitter) {
     } catch (e) {
       if (e.message === '401' || e.message === '404') {
         file.password = null;
-        if (!file.requiresPassword) {
-          return emitter.emit('pushState', '/404');
-        }
+        file.dead = e.message === '404';
+      } else {
+        console.error(e);
+        return emitter.emit('pushState', '/error');
       }
     }
 
@@ -240,7 +251,8 @@ export default function(state, emitter) {
     const start = Date.now();
     try {
       const dl = state.transfer.download({
-        stream: state.capabilities.streamDownload
+        stream: state.capabilities.streamDownload,
+        storage: state.storage
       });
       render();
       await dl;
@@ -259,9 +271,16 @@ export default function(state, emitter) {
       } else {
         // eslint-disable-next-line no-console
         state.transfer = null;
-        const location = err.message === '404' ? '/404' : '/error';
+        const location = ['404', '403'].includes(err.message)
+          ? '/404'
+          : '/error';
         if (location === '/error') {
-          state.raven.captureException(err);
+          state.sentry.withScope(scope => {
+            scope.setExtra('duration', err.duration);
+            scope.setExtra('size', err.size);
+            scope.setExtra('progress', err.progress);
+            state.sentry.captureException(err);
+          });
           const duration = Date.now() - start;
           metrics.stoppedDownload({
             size,
@@ -281,6 +300,37 @@ export default function(state, emitter) {
     // metrics.copiedLink({ location });
   });
 
+  emitter.on('closeModal', () => {
+    if (
+      state.PREFS.surveyUrl &&
+      ['copy', 'share'].includes(state.modal.type) &&
+      locale().startsWith('en') &&
+      (state.storage.totalUploads > 1 || state.storage.totalDownloads > 0) &&
+      !state.user.surveyed
+    ) {
+      state.user.surveyed = true;
+      state.modal = surveyDialog();
+    } else {
+      state.modal = null;
+    }
+    render();
+  });
+
+  emitter.on('report', async ({ reason }) => {
+    try {
+      const receiver = state.transfer || new FileReceiver(state.fileInfo);
+      await receiver.reportLink(reason);
+      render();
+    } catch (err) {
+      console.error(err);
+      if (err.message === '404') {
+        state.fileInfo = { reported: true };
+        return render();
+      }
+      emitter.emit('pushState', '/error');
+    }
+  });
+
   setInterval(() => {
     // poll for updates of the upload list
     if (!state.modal && state.route === '/') {

app/crc32.js

@@ -0,0 +1,266 @@
+const LOOKUP = Int32Array.from([
+  0x00000000,
+  0x77073096,
+  0xee0e612c,
+  0x990951ba,
+  0x076dc419,
+  0x706af48f,
+  0xe963a535,
+  0x9e6495a3,
+  0x0edb8832,
+  0x79dcb8a4,
+  0xe0d5e91e,
+  0x97d2d988,
+  0x09b64c2b,
+  0x7eb17cbd,
+  0xe7b82d07,
+  0x90bf1d91,
+  0x1db71064,
+  0x6ab020f2,
+  0xf3b97148,
+  0x84be41de,
+  0x1adad47d,
+  0x6ddde4eb,
+  0xf4d4b551,
+  0x83d385c7,
+  0x136c9856,
+  0x646ba8c0,
+  0xfd62f97a,
+  0x8a65c9ec,
+  0x14015c4f,
+  0x63066cd9,
+  0xfa0f3d63,
+  0x8d080df5,
+  0x3b6e20c8,
+  0x4c69105e,
+  0xd56041e4,
+  0xa2677172,
+  0x3c03e4d1,
+  0x4b04d447,
+  0xd20d85fd,
+  0xa50ab56b,
+  0x35b5a8fa,
+  0x42b2986c,
+  0xdbbbc9d6,
+  0xacbcf940,
+  0x32d86ce3,
+  0x45df5c75,
+  0xdcd60dcf,
+  0xabd13d59,
+  0x26d930ac,
+  0x51de003a,
+  0xc8d75180,
+  0xbfd06116,
+  0x21b4f4b5,
+  0x56b3c423,
+  0xcfba9599,
+  0xb8bda50f,
+  0x2802b89e,
+  0x5f058808,
+  0xc60cd9b2,
+  0xb10be924,
+  0x2f6f7c87,
+  0x58684c11,
+  0xc1611dab,
+  0xb6662d3d,
+  0x76dc4190,
+  0x01db7106,
+  0x98d220bc,
+  0xefd5102a,
+  0x71b18589,
+  0x06b6b51f,
+  0x9fbfe4a5,
+  0xe8b8d433,
+  0x7807c9a2,
+  0x0f00f934,
+  0x9609a88e,
+  0xe10e9818,
+  0x7f6a0dbb,
+  0x086d3d2d,
+  0x91646c97,
+  0xe6635c01,
+  0x6b6b51f4,
+  0x1c6c6162,
+  0x856530d8,
+  0xf262004e,
+  0x6c0695ed,
+  0x1b01a57b,
+  0x8208f4c1,
+  0xf50fc457,
+  0x65b0d9c6,
+  0x12b7e950,
+  0x8bbeb8ea,
+  0xfcb9887c,
+  0x62dd1ddf,
+  0x15da2d49,
+  0x8cd37cf3,
+  0xfbd44c65,
+  0x4db26158,
+  0x3ab551ce,
+  0xa3bc0074,
+  0xd4bb30e2,
+  0x4adfa541,
+  0x3dd895d7,
+  0xa4d1c46d,
+  0xd3d6f4fb,
+  0x4369e96a,
+  0x346ed9fc,
+  0xad678846,
+  0xda60b8d0,
+  0x44042d73,
+  0x33031de5,
+  0xaa0a4c5f,
+  0xdd0d7cc9,
+  0x5005713c,
+  0x270241aa,
+  0xbe0b1010,
+  0xc90c2086,
+  0x5768b525,
+  0x206f85b3,
+  0xb966d409,
+  0xce61e49f,
+  0x5edef90e,
+  0x29d9c998,
+  0xb0d09822,
+  0xc7d7a8b4,
+  0x59b33d17,
+  0x2eb40d81,
+  0xb7bd5c3b,
+  0xc0ba6cad,
+  0xedb88320,
+  0x9abfb3b6,
+  0x03b6e20c,
+  0x74b1d29a,
+  0xead54739,
+  0x9dd277af,
+  0x04db2615,
+  0x73dc1683,
+  0xe3630b12,
+  0x94643b84,
+  0x0d6d6a3e,
+  0x7a6a5aa8,
+  0xe40ecf0b,
+  0x9309ff9d,
+  0x0a00ae27,
+  0x7d079eb1,
+  0xf00f9344,
+  0x8708a3d2,
+  0x1e01f268,
+  0x6906c2fe,
+  0xf762575d,
+  0x806567cb,
+  0x196c3671,
+  0x6e6b06e7,
+  0xfed41b76,
+  0x89d32be0,
+  0x10da7a5a,
+  0x67dd4acc,
+  0xf9b9df6f,
+  0x8ebeeff9,
+  0x17b7be43,
+  0x60b08ed5,
+  0xd6d6a3e8,
+  0xa1d1937e,
+  0x38d8c2c4,
+  0x4fdff252,
+  0xd1bb67f1,
+  0xa6bc5767,
+  0x3fb506dd,
+  0x48b2364b,
+  0xd80d2bda,
+  0xaf0a1b4c,
+  0x36034af6,
+  0x41047a60,
+  0xdf60efc3,
+  0xa867df55,
+  0x316e8eef,
+  0x4669be79,
+  0xcb61b38c,
+  0xbc66831a,
+  0x256fd2a0,
+  0x5268e236,
+  0xcc0c7795,
+  0xbb0b4703,
+  0x220216b9,
+  0x5505262f,
+  0xc5ba3bbe,
+  0xb2bd0b28,
+  0x2bb45a92,
+  0x5cb36a04,
+  0xc2d7ffa7,
+  0xb5d0cf31,
+  0x2cd99e8b,
+  0x5bdeae1d,
+  0x9b64c2b0,
+  0xec63f226,
+  0x756aa39c,
+  0x026d930a,
+  0x9c0906a9,
+  0xeb0e363f,
+  0x72076785,
+  0x05005713,
+  0x95bf4a82,
+  0xe2b87a14,
+  0x7bb12bae,
+  0x0cb61b38,
+  0x92d28e9b,
+  0xe5d5be0d,
+  0x7cdcefb7,
+  0x0bdbdf21,
+  0x86d3d2d4,
+  0xf1d4e242,
+  0x68ddb3f8,
+  0x1fda836e,
+  0x81be16cd,
+  0xf6b9265b,
+  0x6fb077e1,
+  0x18b74777,
+  0x88085ae6,
+  0xff0f6a70,
+  0x66063bca,
+  0x11010b5c,
+  0x8f659eff,
+  0xf862ae69,
+  0x616bffd3,
+  0x166ccf45,
+  0xa00ae278,
+  0xd70dd2ee,
+  0x4e048354,
+  0x3903b3c2,
+  0xa7672661,
+  0xd06016f7,
+  0x4969474d,
+  0x3e6e77db,
+  0xaed16a4a,
+  0xd9d65adc,
+  0x40df0b66,
+  0x37d83bf0,
+  0xa9bcae53,
+  0xdebb9ec5,
+  0x47b2cf7f,
+  0x30b5ffe9,
+  0xbdbdf21c,
+  0xcabac28a,
+  0x53b39330,
+  0x24b4a3a6,
+  0xbad03605,
+  0xcdd70693,
+  0x54de5729,
+  0x23d967bf,
+  0xb3667a2e,
+  0xc4614ab8,
+  0x5d681b02,
+  0x2a6f2b94,
+  0xb40bbe37,
+  0xc30c8ea1,
+  0x5a05df1b,
+  0x2d02ef8d
+]);
+
+module.exports = function crc32(uint8Array, previous) {
+  let crc = previous === 0 ? 0 : ~~previous ^ -1;
+  for (let i = 0; i < uint8Array.byteLength; i++) {
+    crc = LOOKUP[(crc ^ uint8Array[i]) & 0xff] ^ (crc >>> 8);
+  }
+  return (crc ^ -1) >>> 0;
+};

app/ece.js

@@ -1,5 +1,5 @@
-import 'buffer';
 import { transformStream } from './streams';
+import { concat } from './utils';
 
 const NONCE_LENGTH = 12;
 const TAG_LENGTH = 16;
@@ -81,19 +81,18 @@ class ECETransformer {
       )
     );
 
-    return Buffer.from(base.slice(0, NONCE_LENGTH));
+    return base.slice(0, NONCE_LENGTH);
   }
 
   generateNonce(seq) {
     if (seq > 0xffffffff) {
       throw new Error('record sequence number exceeds limit');
     }
-    const nonce = Buffer.from(this.nonceBase);
-    const m = nonce.readUIntBE(nonce.length - 4, 4);
+    const nonce = new DataView(this.nonceBase.slice());
+    const m = nonce.getUint32(nonce.byteLength - 4);
     const xor = (m ^ seq) >>> 0; //forces unsigned int xor
-    nonce.writeUIntBE(xor, nonce.length - 4, 4);
-
-    return nonce;
+    nonce.setUint32(nonce.byteLength - 4, xor);
+    return new Uint8Array(nonce.buffer);
   }
 
   pad(data, isLast) {
@@ -103,14 +102,11 @@ class ECETransformer {
     }
 
     if (isLast) {
-      const padding = Buffer.alloc(1);
-      padding.writeUInt8(2, 0);
-      return Buffer.concat([data, padding]);
+      return concat(data, Uint8Array.of(2));
     } else {
-      const padding = Buffer.alloc(this.rs - len - TAG_LENGTH);
-      padding.fill(0);
-      padding.writeUInt8(1, 0);
-      return Buffer.concat([data, padding]);
+      const padding = new Uint8Array(this.rs - len - TAG_LENGTH);
+      padding[0] = 1;
+      return concat(data, padding);
     }
   }
 
@@ -133,10 +129,9 @@ class ECETransformer {
   }
 
   createHeader() {
-    const nums = Buffer.alloc(5);
-    nums.writeUIntBE(this.rs, 0, 4);
-    nums.writeUIntBE(0, 4, 1);
-    return Buffer.concat([Buffer.from(this.salt), nums]);
+    const nums = new DataView(new ArrayBuffer(5));
+    nums.setUint32(0, this.rs);
+    return concat(new Uint8Array(this.salt), new Uint8Array(nums.buffer));
   }
 
   readHeader(buffer) {
@@ -144,9 +139,10 @@ class ECETransformer {
       throw new Error('chunk too small for reading header');
     }
     const header = {};
-    header.salt = buffer.buffer.slice(0, KEY_LENGTH);
-    header.rs = buffer.readUIntBE(KEY_LENGTH, 4);
-    const idlen = buffer.readUInt8(KEY_LENGTH + 4);
+    const dv = new DataView(buffer.buffer);
+    header.salt = buffer.slice(0, KEY_LENGTH);
+    header.rs = dv.getUint32(KEY_LENGTH);
+    const idlen = dv.getUint8(KEY_LENGTH + 4);
     header.length = idlen + KEY_LENGTH + 5;
     return header;
   }
@@ -158,7 +154,7 @@ class ECETransformer {
       this.key,
       this.pad(buffer, isLast)
     );
-    return Buffer.from(encrypted);
+    return new Uint8Array(encrypted);
   }
 
   async decryptRecord(buffer, seq, isLast) {
@@ -173,7 +169,7 @@ class ECETransformer {
       buffer
     );
 
-    return this.unpad(Buffer.from(data), isLast);
+    return this.unpad(new Uint8Array(data), isLast);
   }
 
   async start(controller) {
@@ -214,7 +210,7 @@ class ECETransformer {
       await this.transformPrevChunk(false, controller);
     }
     this.firstchunk = false;
-    this.prevChunk = Buffer.from(chunk.buffer);
+    this.prevChunk = new Uint8Array(chunk.buffer);
   }
 
   async flush(controller) {

app/experiments.js

@@ -1,6 +1,22 @@
 import hash from 'string-hash';
+import Account from './ui/account';
 
-const experiments = {};
+const experiments = {
+  signin_button_color: {
+    eligible: function() {
+      return true;
+    },
+    variant: function() {
+      return ['white-blue', 'blue', 'white-violet', 'violet'][
+        Math.floor(Math.random() * 4)
+      ];
+    },
+    run: function(variant, state) {
+      const account = state.cache(Account, 'account');
+      account.buttonClass = variant;
+    }
+  }
+};
 
 //Returns a number between 0 and 1
 // eslint-disable-next-line no-unused-vars
@@ -25,23 +41,12 @@ export default function initialize(state, emitter) {
       xp.run(+state.query.v, state, emitter);
     }
   });
-
-  if (!state.storage.get('testpilot_ga__cid')) {
-    // first ever visit. check again after cid is assigned.
-    emitter.on('DOMContentLoaded', () => {
-      checkExperiments(state, emitter);
-    });
+  const enrolled = state.storage.enrolled;
+  // single experiment per session for now
+  const id = Object.keys(enrolled)[0];
+  if (Object.keys(experiments).includes(id)) {
+    experiments[id].run(enrolled[id], state, emitter);
   } else {
-    const enrolled = state.storage.enrolled.filter(([id, variant]) => {
-      const xp = experiments[id];
-      if (xp) {
-        xp.run(variant, state, emitter);
-      }
-      return !!xp;
-    });
-    // single experiment per session for now
-    if (enrolled.length === 0) {
-      checkExperiments(state, emitter);
-    }
+    checkExperiments(state, emitter);
   }
 }

app/fileReceiver.js

@@ -1,7 +1,14 @@
 import Nanobus from 'nanobus';
 import Keychain from './keychain';
 import { delay, bytes, streamToArrayBuffer } from './utils';
-import { downloadFile, metadata, getApiUrl } from './api';
+import {
+  downloadFile,
+  downloadDone,
+  metadata,
+  getApiUrl,
+  reportLink,
+  getDownloadToken
+} from './api';
 import { blobStream } from './streams';
 import Zip from './zip';
 
@@ -13,9 +20,14 @@ export default class FileReceiver extends Nanobus {
       this.keychain.setPassword(fileInfo.password, fileInfo.url);
     }
     this.fileInfo = fileInfo;
+    this.dlToken = null;
     this.reset();
   }
 
+  get id() {
+    return this.fileInfo.id;
+  }
+
   get progressRatio() {
     return this.progress[0] / this.progress[1];
   }
@@ -47,12 +59,16 @@ export default class FileReceiver extends Nanobus {
     const meta = await metadata(this.fileInfo.id, this.keychain);
     this.fileInfo.name = meta.name;
     this.fileInfo.type = meta.type;
-    this.fileInfo.iv = meta.iv;
     this.fileInfo.size = +meta.size;
     this.fileInfo.manifest = meta.manifest;
+    this.fileInfo.flagged = meta.flagged;
     this.state = 'ready';
   }
 
+  async reportLink(reason) {
+    await reportLink(this.fileInfo.id, this.keychain, reason);
+  }
+
   sendMessageToSw(msg) {
     return new Promise((resolve, reject) => {
       const channel = new MessageChannel();
@@ -75,7 +91,7 @@ export default class FileReceiver extends Nanobus {
     this.state = 'downloading';
     this.downloadRequest = await downloadFile(
       this.fileInfo.id,
-      this.keychain,
+      this.dlToken,
       p => {
         this.progress = [p, this.fileInfo.size];
         this.emit('progress');
@@ -112,6 +128,7 @@ export default class FileReceiver extends Nanobus {
   }
 
   async downloadStream(noSave = false) {
+    const start = Date.now();
     const onprogress = p => {
       this.progress = [p, this.fileInfo.size];
       this.emit('progress');
@@ -138,6 +155,7 @@ export default class FileReceiver extends Nanobus {
         url: this.fileInfo.url,
         size: this.fileInfo.size,
         nonce: this.keychain.nonce,
+        dlToken: this.dlToken,
         noSave
       };
       await this.sendMessageToSw(info);
@@ -153,9 +171,7 @@ export default class FileReceiver extends Nanobus {
         const downloadPath = `/api/download/${this.fileInfo.id}`;
         let downloadUrl = getApiUrl(downloadPath);
         if (downloadUrl === downloadPath) {
-          downloadUrl = `${location.protocol}//${location.host}/api/download/${
-            this.fileInfo.id
-          }`;
+          downloadUrl = `${location.protocol}//${location.host}${downloadPath}`;
         }
         const a = document.createElement('a');
         a.href = downloadUrl;
@@ -164,11 +180,29 @@ export default class FileReceiver extends Nanobus {
       }
 
       let prog = 0;
+      let hangs = 0;
       while (prog < this.fileInfo.size) {
         const msg = await this.sendMessageToSw({
           request: 'progress',
           id: this.fileInfo.id
         });
+        if (msg.progress === prog) {
+          hangs++;
+        } else {
+          hangs = 0;
+        }
+        if (hangs > 30) {
+          // TODO: On Chrome we don't get a cancel
+          // signal so one is indistinguishable from
+          // a hang. We may be able to detect
+          // which end is hung in the service worker
+          // to improve on this.
+          const e = new Error('hung download');
+          e.duration = Date.now() - start;
+          e.size = this.fileInfo.size;
+          e.progress = prog;
+          throw e;
+        }
         prog = msg.progress;
         onprogress(prog);
         await delay(1000);
@@ -187,11 +221,19 @@ export default class FileReceiver extends Nanobus {
     }
   }
 
-  download(options) {
-    if (options.stream) {
-      return this.downloadStream(options.noSave);
+  async download({ stream, storage, noSave }) {
+    this.dlToken = storage.getDownloadToken(this.id);
+    if (!this.dlToken) {
+      this.dlToken = await getDownloadToken(this.id, this.keychain);
+      storage.setDownloadToken(this.id, this.dlToken);
     }
-    return this.downloadBlob(options.noSave);
+    if (stream) {
+      await this.downloadStream(noSave);
+    } else {
+      await this.downloadBlob(noSave);
+    }
+    await downloadDone(this.id, this.dlToken);
+    storage.setDownloadToken(this.id);
   }
 }
 

app/fileSender.js

@@ -44,7 +44,6 @@ export default class FileSender extends Nanobus {
   }
 
   async upload(archive, bearerToken) {
-    const start = Date.now();
     if (this.cancelled) {
       throw new Error(0);
     }
@@ -76,7 +75,6 @@ export default class FileSender extends Nanobus {
     this.emit('progress'); // HACK to kick MS Edge
     try {
       const result = await this.uploadRequest.result;
-      const time = Date.now() - start;
       this.msg = 'notifyUploadEncryptDone';
       this.uploadRequest = null;
       this.progress = [1, 1];
@@ -87,8 +85,8 @@ export default class FileSender extends Nanobus {
         name: archive.name,
         size: archive.size,
         manifest: archive.manifest,
-        time: time,
-        speed: archive.size / (time / 1000),
+        time: result.duration,
+        speed: archive.size / (result.duration / 1000),
         createdAt: Date.now(),
         expiresAt: Date.now() + archive.timeLimit * 1000,
         secretKey: secretKey,

app/fxa.js

@@ -1,5 +1,5 @@
 /* global AUTH_CONFIG */
-import { arrayToB64, b64ToArray } from './utils';
+import { arrayToB64, b64ToArray, concat } from './utils';
 
 const encoder = new TextEncoder();
 const decoder = new TextDecoder();
@@ -23,13 +23,6 @@ function getOtherInfo(enc) {
   return result;
 }
 
-function concat(b1, b2) {
-  const result = new Uint8Array(b1.length + b2.length);
-  result.set(b1, 0);
-  result.set(b2, b1.length);
-  return result;
-}
-
 async function concatKdf(key, enc) {
   if (key.length !== 32) {
     throw new Error('unsupported key length');

app/keychain.js

@@ -18,23 +18,6 @@ export default class Keychain {
       false,
       ['deriveKey']
     );
-    this.encryptKeyPromise = this.secretKeyPromise.then(function(secretKey) {
-      return crypto.subtle.deriveKey(
-        {
-          name: 'HKDF',
-          salt: new Uint8Array(),
-          info: encoder.encode('encryption'),
-          hash: 'SHA-256'
-        },
-        secretKey,
-        {
-          name: 'AES-GCM',
-          length: 128
-        },
-        false,
-        ['encrypt', 'decrypt']
-      );
-    });
     this.metaKeyPromise = this.secretKeyPromise.then(function(secretKey) {
       return crypto.subtle.deriveKey(
         {

app/locale.js

@@ -1,4 +1,4 @@
-import { FluentBundle } from 'fluent';
+import { FluentBundle } from '@fluent/bundle';
 
 function makeBundle(locale, ftl) {
   const bundle = new FluentBundle(locale, { useIsolating: false });
@@ -10,9 +10,9 @@ export async function getTranslator(locale) {
   const bundles = [];
   const { default: en } = await import('../public/locales/en-US/send.ftl');
   if (locale !== 'en-US') {
-    const {
-      default: ftl
-    } = await import(`../public/locales/${locale}/send.ftl`);
+    const { default: ftl } = await import(
+      `../public/locales/${locale}/send.ftl`
+    );
     bundles.push(makeBundle(locale, ftl));
   }
   bundles.push(makeBundle('en-US', en));

app/main.css

@@ -1,4 +1,9 @@
-@tailwind preflight;
+@tailwind base;
+
+html {
+  line-height: 1.15;
+}
+
 @tailwind components;
 
 :not(input) {
@@ -8,6 +13,14 @@
   user-select: none;
 }
 
+:root {
+  --violet-gradient: linear-gradient(
+    -180deg,
+    rgba(144, 89, 255, 0.8) 0%,
+    rgba(144, 89, 255, 0.4) 100%
+  );
+}
+
 a {
   color: inherit;
   text-decoration: none;
@@ -26,19 +39,26 @@ body {
 }
 
 .btn {
-  @apply bg-blue-dark;
+  @apply bg-blue-60;
   @apply text-white;
   @apply cursor-pointer;
   @apply py-4;
   @apply px-6;
+  @apply font-semibold;
 }
 
 .btn:hover {
-  @apply bg-blue-darker;
+  @apply bg-blue-70;
 }
 
 .btn:focus {
-  @apply bg-blue-darker;
+  @apply bg-blue-70;
+}
+
+.btn:disabled {
+  @apply bg-grey-transparent;
+
+  cursor: not-allowed;
 }
 
 .checkbox {
@@ -56,7 +76,7 @@ body {
 }
 
 .checkbox > label::before {
-  /* @apply bg-grey-lightest; */
+  /* @apply bg-grey-10; */
   @apply border;
   @apply rounded-sm;
 
@@ -68,16 +88,16 @@ body {
 }
 
 .checkbox > label:hover::before {
-  @apply border-blue-dark;
+  @apply border-blue-50;
 }
 
 .checkbox > input:focus + label::before {
-  @apply border-blue-dark;
+  @apply border-blue-50;
 }
 
 .checkbox > input:checked + label::before {
-  @apply bg-blue-dark;
-  @apply border-blue-dark;
+  @apply bg-blue-50;
+  @apply border-blue-50;
 
   background-image: url('../assets/lock.svg');
   background-position: center;
@@ -90,8 +110,8 @@ body {
 }
 
 .checkbox > input:disabled + label::before {
-  @apply bg-blue-dark;
-  @apply border-blue-dark;
+  @apply bg-blue-50;
+  @apply border-blue-50;
 
   background-image: url('../assets/lock.svg');
   background-position: center;
@@ -124,19 +144,21 @@ footer li:hover {
   text-decoration: underline;
 }
 
-.feedback-link {
-  background-color: #000;
-  background-image: url('../assets/feedback.svg');
-  background-position: 0.125rem 0.25rem;
-  background-repeat: no-repeat;
-  background-size: 1.125rem;
-  color: #fff;
-  display: block;
-  font-size: 0.75rem;
-  line-height: 0.75rem;
-  padding: 0.375rem 0.375rem 0.375rem 1.25rem;
-  text-indent: 0.125rem;
-  white-space: nowrap;
+.link-blue {
+  @apply text-blue-60;
+}
+
+.link-blue:hover {
+  @apply text-blue-70;
+}
+
+.link-blue:focus {
+  @apply text-blue-70;
+}
+
+.main-header img {
+  height: 32px;
+  width: auto;
 }
 
 .intro {
@@ -144,6 +166,10 @@ footer li:hover {
   height: unset;
 }
 
+.dl-bg {
+  filter: grayscale(1) opacity(0.15);
+}
+
 .main {
   display: flex;
   position: relative;
@@ -159,7 +185,7 @@ footer li:hover {
 .mozilla-logo {
   background-image: url('../assets/mozilla-logo.svg');
   background-repeat: no-repeat;
-  background-size: 100px, 32px;
+  background-size: 100px, 48px;
   overflow: hidden;
   text-indent: 120%;
   white-space: nowrap;
@@ -174,14 +200,14 @@ footer li:hover {
 }
 
 progress {
-  @apply bg-grey-light;
+  @apply bg-grey-30;
   @apply rounded-sm;
   @apply w-full;
   @apply h-1;
 }
 
 progress::-webkit-progress-bar {
-  @apply bg-grey-light;
+  @apply bg-grey-30;
   @apply rounded-sm;
   @apply w-full;
   @apply h-1;
@@ -246,6 +272,11 @@ select {
 }
 
 @screen md {
+  .main-header img {
+    height: 48px;
+    width: auto;
+  }
+
   .intro {
     max-width: unset;
     height: unset;
@@ -260,12 +291,65 @@ select {
     @apply m-auto;
     @apply py-8;
 
-    min-height: 36rem;
-    max-height: 40rem;
+    min-height: 42rem;
+    max-height: 42rem;
     width: calc(100% - 3rem);
   }
 }
 
+@screen dark {
+  body {
+    @apply text-grey-10;
+
+    background-image: unset;
+  }
+
+  .btn {
+    @apply bg-blue-40;
+    @apply text-white;
+  }
+
+  .btn:hover {
+    @apply bg-blue-50;
+  }
+
+  .btn:focus {
+    @apply bg-blue-50;
+  }
+
+  .btn:disabled {
+    @apply bg-grey-80;
+  }
+
+  .link-blue {
+    @apply text-blue-40;
+  }
+
+  .link-blue:hover {
+    @apply text-blue-50;
+  }
+
+  .link-blue:focus {
+    @apply text-blue-50;
+  }
+
+  .main > section {
+    @apply bg-grey-90;
+  }
+
+  .mozilla-logo {
+    background-color: white;
+    border: 1px solid white;
+  }
+
+  @screen md {
+    .main > section {
+      @apply border;
+      @apply border-grey-80;
+    }
+  }
+}
+
 @tailwind utilities;
 
 @responsive {
@@ -274,8 +358,9 @@ select {
   }
 
   .shadow-big {
-    box-shadow: 0 0 32px 0 rgba(12, 12, 13, 0.1),
-      0 2px 16px 0 rgba(12, 12, 13, 0.05);
+    box-shadow: 0 12px 18px 2px rgba(34, 0, 51, 0.04),
+      0 6px 22px 4px rgba(7, 48, 114, 0.12),
+      0 6px 10px -4px rgba(14, 13, 26, 0.12);
   }
 }
 
@@ -287,4 +372,22 @@ select {
 
 .word-break-all {
   word-break: break-all;
+  line-break: anywhere;
+}
+
+.signin {
+  backface-visibility: hidden;
+  border-radius: 6px;
+  transition-property: transform, background-color;
+  transition-duration: 250ms;
+  transition-timing-function: cubic-bezier(0.07, 0.95, 0, 1);
+}
+
+.signin:hover,
+.signin:focus {
+  transform: scale(1.0625);
+}
+
+.signin:hover:active {
+  transform: scale(0.9375);
 }

app/main.js

@@ -1,7 +1,7 @@
-/* global DEFAULTS LIMITS LOCALE */
+/* global DEFAULTS LIMITS PREFS */
 import 'core-js';
 import 'fast-text-encoding'; // MS Edge support
-import 'fluent-intl-polyfill';
+import 'intl-pluralrules';
 import choo from 'choo';
 import nanotiming from 'nanotiming';
 import routes from './routes';
@@ -12,15 +12,15 @@ import pasteManager from './pasteManager';
 import storage from './storage';
 import metrics from './metrics';
 import experiments from './experiments';
-import Raven from 'raven-js';
+import * as Sentry from '@sentry/browser';
 import './main.css';
 import User from './user';
 import { getTranslator } from './locale';
 import Archive from './archive';
-import { setTranslate } from './utils';
+import { setTranslate, locale } from './utils';
 
-if (navigator.doNotTrack !== '1' && window.RAVEN_CONFIG) {
-  Raven.config(window.SENTRY_ID, window.RAVEN_CONFIG).install();
+if (navigator.doNotTrack !== '1' && window.SENTRY_CONFIG) {
+  Sentry.init(window.SENTRY_CONFIG);
 }
 
 if (process.env.NODE_ENV === 'production') {
@@ -45,27 +45,31 @@ if (process.env.NODE_ENV === 'production') {
     }
   }
 
-  const translate = await getTranslator(LOCALE);
+  const translate = await getTranslator(locale());
   setTranslate(translate);
+  // eslint-disable-next-line require-atomic-updates
   window.initialState = {
     LIMITS,
     DEFAULTS,
+    PREFS,
     archive: new Archive([], DEFAULTS.EXPIRE_SECONDS),
     capabilities,
     translate,
     storage,
-    raven: Raven,
+    sentry: Sentry,
     user: new User(storage, LIMITS, window.AUTH_CONFIG),
     transfer: null,
-    fileInfo: null
+    fileInfo: null,
+    locale: locale()
   };
 
-  const app = routes(choo());
+  const app = routes(choo({ hash: true }));
+  // eslint-disable-next-line require-atomic-updates
   window.app = app;
+  app.use(experiments);
   app.use(metrics);
   app.use(controller);
   app.use(dragManager);
-  app.use(experiments);
   app.use(pasteManager);
   app.mount('body');
 })();

app/metrics.js

@@ -1,21 +1,23 @@
 import storage from './storage';
-import { platform } from './utils';
+import { platform, locale } from './utils';
 import { sendMetrics } from './api';
 
 let appState = null;
-// let experiment = null;
+let experiment = null;
 const HOUR = 1000 * 60 * 60;
 const events = [];
 let session_id = Date.now();
-const lang = document.querySelector('html').lang;
+const lang = locale();
 
 export default function initialize(state, emitter) {
   appState = state;
-  if (!appState.user.firstAction) {
-    appState.user.firstAction = appState.route === '/' ? 'upload' : 'download';
-  }
+
   emitter.on('DOMContentLoaded', () => {
-    // experiment = storage.enrolled[0];
+    experiment = storage.enrolled;
+    if (!appState.user.firstAction) {
+      appState.user.firstAction =
+        appState.route === '/' ? 'upload' : 'download';
+    }
     const query = appState.query;
     addEvent('client_visit', {
       entrypoint: appState.route === '/' ? 'upload' : 'download',
@@ -59,6 +61,11 @@ function submitEvents() {
 async function addEvent(event_type, event_properties) {
   const user_id = await appState.user.metricId();
   const device_id = await appState.user.deviceId();
+  const ab_id = Object.keys(experiment)[0];
+  if (ab_id) {
+    event_properties.experiment = ab_id;
+    event_properties.variant = experiment[ab_id];
+  }
   events.push({
     device_id,
     event_properties,
@@ -100,9 +107,10 @@ function completedUpload(archive, duration) {
   });
 }
 
-function stoppedUpload(archive) {
+function stoppedUpload(archive, duration = 0) {
   return addEvent('client_upload', {
     download_limit: archive.dlimit,
+    duration: sizeOrder(duration),
     file_count: archive.numFiles,
     password_protected: !!archive.password,
     size: sizeOrder(archive.size),

app/readme.md

@@ -2,7 +2,7 @@
 
 `app/` contains the browser code that gets bundled into `app.[hash].js`. It's got all the logic, crypto, and UI. All of it gets used in the browser, and some of it by the server for server side rendering.
 
-The main entrypoint for the browser is [main.js](./main.js) and on the server [routes/index.js](./routes/index.js) gets imported by [/server/routes/pages.js](../server/routes/pages.js)
+The main entrypoint for the browser is [main.js](./main.js) and on the server [routes.js](./routes.js) is imported by [/server/routes/pages.js](../server/routes/pages.js)
 
 - `pages` contains display logic an markup for pages
 - `routes` contains route definitions and logic

app/routes.js

@@ -2,7 +2,7 @@ const choo = require('choo');
 const download = require('./ui/download');
 const body = require('./ui/body');
 
-module.exports = function(app = choo()) {
+module.exports = function(app = choo({ hash: true })) {
   app.route('/', body(require('./ui/home')));
   app.route('/download/:id', body(download));
   app.route('/download/:id/:key', body(download));
@@ -13,6 +13,11 @@ module.exports = function(app = choo()) {
   app.route('/oauth', function(state, emit) {
     emit('authenticate', state.query.code, state.query.state);
   });
+  app.route('/login', function(state, emit) {
+    emit('replaceState', '/');
+    setTimeout(() => emit('render'));
+  });
+  app.route('/report', body(require('./ui/report')));
   app.route('*', body(require('./ui/notFound')));
   return app;
 };

app/serviceWorker.js

@@ -9,15 +9,16 @@ import contentDisposition from 'content-disposition';
 let noSave = false;
 const map = new Map();
 const IMAGES = /.*\.(png|svg|jpg)$/;
-const VERSIONED_ASSET = /\.[A-Fa-f0-9]{8}\.(js|css|png|svg|jpg)$/;
+const VERSIONED_ASSET = /\.[A-Fa-f0-9]{8}\.(js|css|png|svg|jpg)(#\w+)?$/;
 const DOWNLOAD_URL = /\/api\/download\/([A-Fa-f0-9]{4,})/;
+const FONT = /\.woff2?$/;
 
-self.addEventListener('install', event => {
-  event.waitUntil(precache());
+self.addEventListener('install', () => {
+  self.skipWaiting();
 });
 
 self.addEventListener('activate', event => {
-  event.waitUntil(self.clients.claim());
+  event.waitUntil(self.clients.claim().then(precache));
 });
 
 async function decryptStream(id) {
@@ -33,7 +34,7 @@ async function decryptStream(id) {
       keychain.setPassword(file.password, file.url);
     }
 
-    file.download = downloadStream(id, keychain);
+    file.download = downloadStream(id, file.dlToken);
 
     const body = await file.download.result;
 
@@ -83,16 +84,28 @@ async function decryptStream(id) {
 }
 
 async function precache() {
+  try {
+    await cleanCache();
+    const cache = await caches.open(version);
+    const images = assets.match(IMAGES);
+    await cache.addAll(images);
+  } catch (e) {
+    console.error(e);
+    // cache will get populated on demand
+  }
+}
+
+async function cleanCache() {
   const oldCaches = await caches.keys();
   for (const c of oldCaches) {
     if (c !== version) {
       await caches.delete(c);
     }
   }
-  const cache = await caches.open(version);
-  const images = assets.match(IMAGES);
-  await cache.addAll(images);
-  return self.skipWaiting();
+}
+
+function cacheable(url) {
+  return VERSIONED_ASSET.test(url) || FONT.test(url);
 }
 
 async function cachedOrFetched(req) {
@@ -102,7 +115,7 @@ async function cachedOrFetched(req) {
     return cached;
   }
   const fetched = await fetch(req);
-  if (fetched.ok && VERSIONED_ASSET.test(req.url)) {
+  if (fetched.ok && cacheable(req.url)) {
     cache.put(req, fetched.clone());
   }
   return fetched;
@@ -115,7 +128,7 @@ self.onfetch = event => {
   const dlmatch = DOWNLOAD_URL.exec(url.pathname);
   if (dlmatch) {
     event.respondWith(decryptStream(dlmatch[1]));
-  } else if (VERSIONED_ASSET.test(url.pathname)) {
+  } else if (cacheable(url.pathname)) {
     event.respondWith(cachedOrFetched(req));
   }
 };
@@ -133,6 +146,7 @@ self.onmessage = event => {
       type: event.data.type,
       manifest: event.data.manifest,
       size: event.data.size,
+      dlToken: event.data.dlToken,
       progress: 0
     };
     map.set(event.data.id, info);

app/storage.js

@@ -35,6 +35,7 @@ class Storage {
       this.engine = new Mem();
     }
     this._files = this.loadFiles();
+    this.pruneTokens();
   }
 
   loadFiles() {
@@ -86,16 +87,13 @@ class Storage {
     this.engine.setItem('referrer', str);
   }
   get enrolled() {
-    return JSON.parse(this.engine.getItem('experiments') || '[]');
+    return JSON.parse(this.engine.getItem('ab_experiments') || '{}');
   }
 
   enroll(id, variant) {
-    const enrolled = this.enrolled;
-    // eslint-disable-next-line no-unused-vars
-    if (!enrolled.find(([i, v]) => i === id)) {
-      enrolled.push([id, variant]);
-      this.engine.setItem('experiments', JSON.stringify(enrolled));
-    }
+    const enrolled = {};
+    enrolled[id] = variant;
+    this.engine.setItem('ab_experiments', JSON.stringify(enrolled));
   }
 
   get files() {
@@ -183,6 +181,48 @@ class Storage {
       downloadCount
     };
   }
+
+  setDownloadToken(id, token) {
+    let otherTokens = {};
+    try {
+      otherTokens = JSON.parse(this.get('dlTokens'));
+    } catch (e) {
+      //
+    }
+    if (token) {
+      const record = { token, ts: Date.now() };
+      this.set('dlTokens', JSON.stringify({ ...otherTokens, [id]: record }));
+    } else {
+      this.set('dlTokens', JSON.stringify({ ...otherTokens, [id]: undefined }));
+    }
+  }
+
+  getDownloadToken(id) {
+    try {
+      return JSON.parse(this.get('dlTokens'))[id].token;
+    } catch (e) {
+      return undefined;
+    }
+  }
+
+  pruneTokens() {
+    try {
+      const now = Date.now();
+      const tokens = JSON.parse(this.get('dlTokens'));
+      const keep = {};
+      for (const id of Object.keys(tokens)) {
+        const t = tokens[id];
+        if (t.ts > now - 7 * 86400 * 1000) {
+          keep[id] = t;
+        }
+      }
+      if (Object.keys(keep).length < Object.keys(tokens).length) {
+        this.set('dlTokens', JSON.stringify(keep));
+      }
+    } catch (e) {
+      console.error(e);
+    }
+  }
 }
 
 export default new Storage();

app/streams.js

@@ -1,4 +1,4 @@
-/* global ReadableStream TransformStream */
+/* global TransformStream */
 
 export function transformStream(readable, transformer, oncancel) {
   try {

app/ui/account.js

@@ -8,7 +8,8 @@ class Account extends Component {
     this.emit = emit;
     this.enabled = state.capabilities.account;
     this.local = state.components[name] = {};
-    this.setState();
+    this.buttonClass = '';
+    this.setLocal();
   }
 
   avatarClick(event) {
@@ -38,7 +39,7 @@ class Account extends Component {
     return this.local.loggedIn !== this.state.user.loggedIn;
   }
 
-  setState() {
+  setLocal() {
     const changed = this.changed();
     if (changed) {
       this.local.loggedIn = this.state.user.loggedIn;
@@ -47,26 +48,32 @@ class Account extends Component {
   }
 
   update() {
-    return this.setState();
+    return this.setLocal();
   }
 
   createElement() {
     if (!this.enabled) {
       return html`
-        <div></div>
+        <send-account></send-account>
       `;
     }
     const user = this.state.user;
     const translate = this.state.translate;
+    this.setLocal();
+    if (user.loginRequired && !this.local.loggedIn) {
+      return html`
+        <send-account></send-account>
+      `;
+    }
     if (!this.local.loggedIn) {
       return html`
         <send-account>
           <button
-            class="p-2 md:p-4 border rounded-lg text-blue-dark border-blue-dark hover:text-white hover:bg-blue-dark focus:outline"
+            class="px-4 py-2 md:px-8 md:py-4 focus:outline signin border-2 link-blue border-blue-60 hover:border-blue-70 dark:border-blue-40 dark:hover:border-blue-50"
             onclick="${e => this.login(e)}"
-            title="${translate('signInButton')}"
+            title="${translate('signInOnlyButton')}"
           >
-            ${translate('signInButton')}
+            ${translate('signInOnlyButton')}
           </button>
         </send-account>
       `;
@@ -76,19 +83,19 @@ class Account extends Component {
         <input
           type="image"
           alt="${user.email}"
-          class="w-8 h-8 rounded-full border text-blue md:text-white focus:outline"
+          class="w-8 h-8 rounded-full border text-blue-50 md:text-white focus:outline"
           src="${user.avatar}"
           onclick="${e => this.avatarClick(e)}"
         />
         <ul
           id="accountMenu"
-          class="invisible list-reset absolute pin-t pin-r mt-10 pt-2 pb-2 bg-white shadow-md whitespace-no-wrap outline-none z-50"
+          class="invisible absolute top-0 right-0 mt-10 pt-2 pb-2 bg-white shadow-md whitespace-no-wrap outline-none z-50 dark:bg-grey-80"
           onblur="${e => this.hideMenu(e)}"
         >
-          <li class="p-2 text-grey-dark">${user.email}</li>
+          <li class="p-2 text-grey-60 dark:text-grey-50">${user.email}</li>
           <li>
             <button
-              class="block w-full text-left px-4 py-2 text-grey-darkest hover:bg-blue hover:text-white cursor-pointer focus:outline"
+              class="block w-full text-left px-4 py-2 text-grey-80 dark:text-grey-30 hover:bg-blue-50 hover:text-white cursor-pointer focus:outline"
               onclick="${e => this.logout(e)}"
               title="${translate('signOut')}"
             >

app/ui/archiveTile.js

@@ -30,6 +30,12 @@ function password(state) {
 
   return html`
     <div class="mb-2 px-1">
+      <input
+        id="autocomplete-decoy"
+        class="hidden"
+        type="password"
+        value="lol"
+      />
       <div class="checkbox inline-block mr-3">
         <input
           id="add-password"
@@ -46,7 +52,7 @@ function password(state) {
         id="password-input"
         class="${state.archive.password
           ? ''
-          : 'invisible'} border rounded focus:border-blue-dark leading-normal my-1 py-1 px-2 h-8"
+          : 'invisible'} border rounded focus:border-blue-60 leading-normal my-1 py-1 px-2 h-8 dark:bg-grey-80"
         autocomplete="off"
         maxlength="${MAX_LENGTH}"
         type="password"
@@ -58,7 +64,7 @@ function password(state) {
       <label
         id="password-msg"
         for="password-input"
-        class="block text-xs text-grey-darker"
+        class="block text-xs text-grey-70"
       ></label>
     </div>
   `;
@@ -106,7 +112,9 @@ function password(state) {
 function fileInfo(file, action) {
   return html`
     <send-file class="flex flex-row items-center p-3 w-full">
-      <img class="h-8" src="${assets.get('blue_file.svg')}"/>
+      <svg class="h-8 w-8 text-white dark:text-grey-90">
+        <use xlink:href="${assets.get('blue_file.svg')}#icon"/>
+      </svg>
       <p class="ml-4 w-full">
         <h1 class="text-base font-medium word-break-all">${file.name}</h1>
         <div class="text-sm font-normal opacity-75 pt-1">${bytes(
@@ -120,7 +128,9 @@ function fileInfo(file, action) {
 function archiveInfo(archive, action) {
   return html`
     <p class="w-full flex items-center">
-      <img class="mr-3 flex-no-shrink" src="${assets.get('blue_file.svg')}"/>
+      <svg class="h-8 w-6 mr-3 flex-shrink-0 text-white dark:text-grey-90">
+        <use xlink:href="${assets.get('blue_file.svg')}#icon"/>
+      </svg>
       <p class="flex-grow">
         <h1 class="text-base font-medium word-break-all">${archive.name}</h1>
         <div class="text-sm font-normal opacity-75 pt-1">${bytes(
@@ -140,7 +150,7 @@ function archiveDetails(translate, archive) {
         ontoggle="${toggled}"
       >
         <summary
-          class="flex items-center text-blue-dark text-sm cursor-pointer outline-none"
+          class="flex items-center link-blue text-sm cursor-pointer outline-none"
         >
           <svg
             class="fill-current w-4 h-4 mr-1"
@@ -155,7 +165,7 @@ function archiveDetails(translate, archive) {
             num: archive.manifest.files.length
           })}
         </summary>
-        ${list(archive.manifest.files.map(f => fileInfo(f)), 'list-reset')}
+        ${list(archive.manifest.files.map(f => fileInfo(f)))}
       </details>
     `;
   }
@@ -170,20 +180,25 @@ module.exports = function(state, emit, archive) {
     state.capabilities.share || platform() === 'android'
       ? html`
           <button
-            class="text-blue-dark hover:text-blue-darker focus:text-blue-darker self-end flex items-end"
+            class="link-blue self-end flex items-start"
             onclick=${share}
             title="Share link"
           >
-            <img src="${assets.get('share-24.svg')}" class="mr-2" />Share link
+            <svg class="h-4 w-4 mr-2">
+              <use xlink:href="${assets.get('share-24.svg')}#icon" />
+            </svg>
+            Share link
           </button>
         `
       : html`
           <button
-            class="text-blue-dark hover:text-blue-darker focus:text-blue-darker focus:outline self-end flex items-center"
+            class="link-blue focus:outline self-end flex items-center"
             onclick=${copy}
             title="${state.translate('copyLinkButton')}"
           >
-            <img src="${assets.get('copy-16.svg')}" class="mr-2" />
+            <svg class="h-4 w-4 mr-2">
+              <use xlink:href="${assets.get('copy-16.svg')}#icon" />
+            </svg>
             ${state.translate('copyLinkButton')}
           </button>
         `;
@@ -191,12 +206,14 @@ module.exports = function(state, emit, archive) {
     platform() === 'web'
       ? html`
           <a
-            class="flex items-baseline text-blue-dark hover:text-blue-darker focus:text-blue-darker"
+            class="flex items-baseline link-blue"
             href="${archive.url}"
             title="${state.translate('downloadButtonLabel')}"
             tabindex="0"
           >
-            <img src="${assets.get('dl.svg')}" class="mr-2" />
+            <svg class="h-4 w-3 mr-2">
+              <use xlink:href="${assets.get('dl.svg')}#icon" />
+            </svg>
             ${state.translate('downloadButtonLabel')}
           </a>
         `
@@ -206,14 +223,14 @@ module.exports = function(state, emit, archive) {
   return html`
     <send-archive
       id="archive-${archive.id}"
-      class="flex flex-col items-start rounded shadow-light bg-white p-4 w-full"
+      class="flex flex-col items-start rounded shadow-light bg-white p-4 w-full dark:bg-grey-90 dark:border dark:border-grey-70"
     >
       ${archiveInfo(
         archive,
         html`
           <input
             type="image"
-            class="self-start flex-no-shrink text-white hover:opacity-75 focus:outline"
+            class="self-start flex-shrink-0 text-white hover:opacity-75 focus:outline"
             alt="${state.translate('deleteButtonHover')}"
             title="${state.translate('deleteButtonHover')}"
             src="${assets.get('close-16.svg')}"
@@ -225,7 +242,7 @@ module.exports = function(state, emit, archive) {
         ${expiryInfo(state.translate, archive)}
       </div>
       ${archiveDetails(state.translate, archive)}
-      <hr class="w-full border-t my-4" />
+      <hr class="w-full border-t my-4 dark:border-grey-70" />
       <div class="flex justify-between w-full">
         ${dl} ${copyOrShare}
       </div>
@@ -256,9 +273,7 @@ module.exports = function(state, emit, archive) {
       try {
         await navigator.share({
           title: state.translate('-send-brand'),
-          text: `Download "${
-            archive.name
-          }" with Firefox Send: simple, safe file sharing`,
+          text: `Download "${archive.name}" with Firefox Send: simple, safe file sharing`,
           //state.translate('shareMessage', { name }),
           url: archive.url
         });
@@ -271,22 +286,25 @@ module.exports = function(state, emit, archive) {
 
 module.exports.wip = function(state, emit) {
   return html`
-    <send-upload-area class="flex flex-col bg-white h-full w-full" id="wip">
+    <send-upload-area
+      class="flex flex-col bg-white h-full w-full dark:bg-grey-90"
+      id="wip"
+    >
       ${list(
         Array.from(state.archive.files)
           .reverse()
           .map(f =>
             fileInfo(f, remove(f, state.translate('deleteButtonHover')))
           ),
-        'flex-shrink bg-grey-lightest rounded-t list-reset overflow-y-auto px-6 py-4 md:h-full md:max-h-half-screen',
-        'bg-white px-2 my-2 shadow-light rounded'
+        'flex-shrink bg-grey-10 rounded-t overflow-y-auto px-6 py-4 md:h-full md:max-h-half-screen dark:bg-black',
+        'bg-white px-2 my-2 shadow-light rounded dark:bg-grey-90 dark:border dark:border-grey-80'
       )}
       <div
-        class="flex-no-shrink flex-grow flex items-end p-4 bg-grey-lightest rounded-b mb-1 font-medium"
+        class="flex-shrink-0 flex-grow flex items-end p-4 bg-grey-10 rounded-b mb-1 font-medium dark:bg-grey-90"
       >
         <input
           id="file-upload"
-          class="opacity-0 w-0 h-0 appearance-none absolute"
+          class="opacity-0 w-0 h-0 appearance-none absolute overflow-hidden"
           type="file"
           multiple
           onfocus="${focus}"
@@ -302,10 +320,12 @@ module.exports.wip = function(state, emit) {
             class="flex items-center cursor-pointer"
             title="${state.translate('addFilesButton')}"
           >
-            <img src="${assets.get('addfiles.svg')}" class="w-6 h-6 mr-2" />
+            <svg class="w-6 h-6 mr-2 link-blue">
+              <use xlink:href="${assets.get('addfiles.svg')}#plus" />
+            </svg>
             ${state.translate('addFilesButton')}
           </label>
-          <div class="font-normal text-sm text-grey-darker">
+          <div class="font-normal text-sm text-grey-70 dark:text-grey-40">
             ${state.translate('totalSize', {
               size: bytes(state.archive.size)
             })}
@@ -315,7 +335,7 @@ module.exports.wip = function(state, emit) {
       ${expiryOptions(state, emit)} ${password(state, emit)}
       <button
         id="upload-btn"
-        class="btn rounded-lg flex-no-shrink focus:outline"
+        class="btn rounded-lg flex-shrink-0 focus:outline"
         title="${state.translate('uploadButton')}"
         onclick="${upload}"
       >
@@ -380,22 +400,22 @@ module.exports.uploading = function(state, emit) {
   return html`
     <send-upload-area
       id="${archive.id}"
-      class="flex flex-col items-start rounded shadow-light bg-white p-4 w-full"
+      class="flex flex-col items-start rounded shadow-light bg-white p-4 w-full dark:bg-grey-90"
     >
       ${archiveInfo(archive)}
-      <div class="text-xs text-grey-dark w-full mt-2 mb-2">
+      <div class="text-xs opacity-75 w-full mt-2 mb-2">
         ${expiryInfo(state.translate, {
           dlimit: state.archive.dlimit,
           dtotal: 0,
           expiresAt: Date.now() + 500 + state.archive.timeLimit * 1000
         })}
       </div>
-      <div class="text-blue-dark text-sm font-medium mt-2">
+      <div class="link-blue text-sm font-medium mt-2">
         ${progressPercent}
       </div>
       <progress class="my-3" value="${progress}">${progressPercent}</progress>
       <button
-        class="text-blue-dark hover:text-blue-darker focus:text-blue-darker self-end font-medium"
+        class="link-blue self-end font-medium"
         onclick=${cancel}
         title="${state.translate('deletePopupCancel')}"
       >
@@ -417,7 +437,7 @@ module.exports.empty = function(state, emit) {
       ? ''
       : html`
           <button
-            class="center font-medium text-sm text-blue-dark hover:text-blue-darker focus:text-blue-darker mt-4 mb-2"
+            class="center font-medium text-sm link-blue mt-4 mb-2"
             onclick="${event => {
               event.stopPropagation();
               emit('signup-cta', 'drop');
@@ -430,14 +450,16 @@ module.exports.empty = function(state, emit) {
         `;
   return html`
     <send-upload-area
-      class="flex flex-col items-center justify-center border-2 border-dashed border-grey rounded px-6 py-16 h-full w-full"
+      class="flex flex-col items-center justify-center border-2 border-dashed border-grey-transparent rounded px-6 py-16 h-full w-full dark:border-grey-60"
       onclick="${e => {
         if (e.target.tagName !== 'LABEL') {
           document.getElementById('file-upload').click();
         }
       }}"
     >
-      <img src="${assets.get('addfiles.svg')}" width="48" height="48" />
+      <svg class="w-10 h-10 link-blue">
+        <use xlink:href="/${assets.get('addfiles.svg')}#plus" />
+      </svg>
       <div class="pt-6 pb-2 text-center text-lg font-bold tracking-wide">
         ${state.translate('dragAndDropFiles')}
       </div>
@@ -448,7 +470,7 @@ module.exports.empty = function(state, emit) {
       </div>
       <input
         id="file-upload"
-        class="opacity-0 w-0 h-0 appearance-none absolute"
+        class="opacity-0 w-0 h-0 appearance-none absolute overflow-hidden"
         type="file"
         multiple
         onfocus="${focus}"
@@ -466,19 +488,21 @@ module.exports.empty = function(state, emit) {
       >
         ${state.translate('addFilesButton')}
       </label>
+      <p
+        class="font-normal text-sm text-grey-50 dark:text-grey-40 my-6 mx-12 text-center max-w-sm leading-loose"
+      >
+        ${state.translate('trustWarningMessage')}
+      </p>
       ${upsell}
     </send-upload-area>
   `;
 
   function focus(event) {
-    event.target.nextElementSibling.classList.add('bg-blue-darker', 'outline');
+    event.target.nextElementSibling.classList.add('bg-blue-70', 'outline');
   }
 
   function blur(event) {
-    event.target.nextElementSibling.classList.remove(
-      'bg-blue-darker',
-      'outline'
-    );
+    event.target.nextElementSibling.classList.remove('bg-blue-70', 'outline');
   }
 
   function add(event) {
@@ -503,13 +527,29 @@ module.exports.preview = function(state, emit) {
         </div>
       `;
   return html`
-    <send-archive class="flex flex-col max-h-full bg-white p-4 w-full md:w-128">
-      <div class="border rounded py-3 px-6">
+    <send-archive
+      class="flex flex-col max-h-full bg-white w-full dark:bg-grey-90"
+    >
+      <div class="border rounded py-3 px-4 dark:border-grey-70">
         ${archiveInfo(archive)} ${details}
       </div>
+      <div class="checkbox inline-block mt-6 mx-auto">
+        <input
+          id="trust-download"
+          type="checkbox"
+          autocomplete="off"
+          onchange="${toggleDownloadEnabled}"
+        />
+        <label for="trust-download">
+          ${state.translate('downloadTrustCheckbox', {
+            count: archive.manifest.files.length
+          })}
+        </label>
+      </div>
       <button
         id="download-btn"
-        class="btn rounded-lg mt-4 w-full flex-no-shrink focus:outline"
+        disabled
+        class="btn rounded-lg mt-4 w-full flex-shrink-0 focus:outline"
         title="${state.translate('downloadButtonLabel')}"
         onclick=${download}
       >
@@ -518,6 +558,13 @@ module.exports.preview = function(state, emit) {
     </send-archive>
   `;
 
+  function toggleDownloadEnabled(event) {
+    event.stopPropagation();
+    const checked = event.target.checked;
+    const btn = document.getElementById('download-btn');
+    btn.disabled = !checked;
+  }
+
   function download(event) {
     event.preventDefault();
     event.target.disabled = true;
@@ -531,10 +578,10 @@ module.exports.downloading = function(state) {
   const progressPercent = percent(progress);
   return html`
     <send-archive
-      class="flex flex-col bg-white rounded shadow-light p-4 w-full max-w-sm md:w-128"
+      class="flex flex-col bg-white rounded shadow-light p-4 w-full max-w-sm md:w-128 dark:bg-grey-90"
     >
       ${archiveInfo(archive)}
-      <div class="text-blue-dark text-sm font-medium mt-2">
+      <div class="link-blue text-sm font-medium mt-2">
         ${progressPercent}
       </div>
       <progress class="my-3" value="${progress}">${progressPercent}</progress>

app/ui/blank.js

@@ -4,7 +4,7 @@ module.exports = function() {
   return html`
     <main class="main">
       <section
-        class="h-full w-full p-6 md:flex md:flex-row md:rounded-lg md:shadow-big"
+        class="h-full w-full p-6 md:p-8 md:flex md:flex-row md:rounded-xl md:shadow-big"
       >
         <div class="md:mr-6 md:w-1/2 w-full"></div>
         <div class="md:w-1/2 mt-6 md:mt-0 w-full"></div>

app/ui/body.js

@@ -9,9 +9,8 @@ function banner(state) {
   }
   const show =
     !state.capabilities.standalone &&
-    !/firefox/i.test(navigator.userAgent) &&
-    document.querySelector('html').lang.startsWith('en') &&
-    !state.route.startsWith('/unsupported/');
+    !state.route.startsWith('/unsupported/') &&
+    state.locale === 'en-US';
   if (show) {
     return state.cache(Promo, 'promo').render();
   }
@@ -21,7 +20,7 @@ module.exports = function body(main) {
   return function(state, emit) {
     const b = html`
       <body
-        class="flex flex-col items-center font-sans md:h-screen md:bg-grey-lightest"
+        class="flex flex-col items-center font-sans md:h-screen md:bg-grey-10 dark:bg-black"
       >
         ${banner(state, emit)} ${state.cache(Header, 'header').render()}
         ${main(state, emit)} ${state.cache(Footer, 'footer').render()}

app/ui/copyDialog.js

@@ -2,34 +2,34 @@ const html = require('choo/html');
 const { copyToClipboard } = require('../utils');
 
 module.exports = function(name, url) {
-  return function(state, emit, close) {
+  const dialog = function(state, emit, close) {
     return html`
       <send-copy-dialog
         class="flex flex-col items-center text-center p-4 max-w-sm m-auto"
       >
-        <h1 class="font-bold my-4">
+        <h1 class="text-3xl font-bold my-4">
           ${state.translate('notifyUploadEncryptDone')}
         </h1>
-        <p class="font-normal leading-normal text-grey-darkest word-break-all">
+        <p class="font-normal leading-normal text-grey-80 dark:text-grey-40">
           ${state.translate('copyLinkDescription')} <br />
-          ${name}
+          <span class="word-break-all">${name}</span>
         </p>
         <input
           type="text"
           id="share-url"
-          class="w-full my-4 border rounded-lg leading-loose h-12 px-2 py-1"
+          class="w-full my-4 border rounded-lg leading-loose h-12 px-2 py-1 dark:bg-grey-80"
           value="${url}"
           readonly="true"
         />
         <button
-          class="btn rounded-lg w-full flex-no-shrink focus:outline"
+          class="btn rounded-lg w-full flex-shrink-0 focus:outline"
           onclick="${copy}"
           title="${state.translate('copyLinkButton')}"
         >
           ${state.translate('copyLinkButton')}
         </button>
         <button
-          class="text-blue-dark hover:text-blue-darker focus:text-blue-darker my-4 font-medium cursor-pointer focus:outline"
+          class="link-blue my-4 font-medium cursor-pointer focus:outline"
           onclick="${close}"
           title="${state.translate('okButton')}"
         >
@@ -45,4 +45,6 @@ module.exports = function(name, url) {
       setTimeout(close, 1000);
     }
   };
+  dialog.type = 'copy';
+  return dialog;
 };

app/ui/download.js

@@ -1,5 +1,6 @@
 /* global downloadMetadata */
 const html = require('choo/html');
+const assets = require('../../common/assets');
 const archiveTile = require('./archiveTile');
 const modal = require('./modal');
 const noStreams = require('./noStreams');
@@ -22,25 +23,60 @@ function downloading(state, emit) {
     <div
       class="flex flex-col w-full h-full items-center md:justify-center md:-mt-8"
     >
-      <h1 class="mb-4">${state.translate('downloadingTitle')}</h1>
+      <h1 class="text-3xl font-bold mb-4">
+        ${state.translate('downloadingTitle')}
+      </h1>
       ${archiveTile.downloading(state, emit)}
     </div>
   `;
 }
 
 function preview(state, emit) {
+  if (state.fileInfo.flagged) {
+    return html`
+      <div
+        class="flex flex-col w-full max-w-md h-full mx-auto items-center justify-center"
+      >
+        <h1 class="text-xl font-bold">${state.translate('downloadFlagged')}</h1>
+      </div>
+    `;
+  }
   if (!state.capabilities.streamDownload && state.fileInfo.size > BIG_SIZE) {
     return noStreams(state, emit);
   }
   return html`
-    <div
-      class="flex flex-col w-full max-w-md h-full mx-auto items-center justify-center"
-    >
-      <h1 class="mb-4">${state.translate('downloadTitle')}</h1>
-      <p class="w-full text-grey-darkest text-center leading-normal">
-        ${state.translate('downloadDescription')}
-      </p>
-      ${archiveTile.preview(state, emit)}
+    <div class="w-full md:flex md:flex-row items-stretch md:flex-1">
+      <div
+        class="px-2 w-full md:px-0 flex-half md:flex md:flex-col mt-12 md:pr-8 pb-4"
+      >
+        <h1 class="text-3xl font-bold mb-4 text-center md:text-left">
+          ${state.translate('downloadTitle')}
+        </h1>
+        <p
+          class="text-grey-80 leading-normal dark:text-grey-40 mb-4 text-center md:text-left"
+        >
+          ${state.translate('downloadDescription')}
+        </p>
+        <p
+          class="text-grey-80 leading-normal dark:text-grey-40 font-semibold text-center md:mb-8 md:text-left"
+        >
+          ${state.translate('downloadConfirmDescription')}
+        </p>
+        <img
+          class="hidden md:block dl-bg w-full"
+          src="${assets.get('intro.svg')}"
+        />
+      </div>
+      <div
+        class="w-full flex-half flex-half md:flex md:flex-col md:justify-center"
+      >
+        ${archiveTile.preview(state, emit)}
+        <a href="/report" class="link-blue mt-4 text-center block"
+          >${state.translate('reportFile', {
+            count: state.fileInfo.manifest.files.length
+          })}</a
+        >
+      </div>
     </div>
   `;
 }
@@ -49,9 +85,17 @@ module.exports = function(state, emit) {
   let content = '';
   if (!state.fileInfo) {
     state.fileInfo = createFileInfo(state);
-    if (!state.fileInfo.nonce) {
+    if (downloadMetadata.status === 404) {
       return notFound(state);
     }
+    if (!state.fileInfo.nonce) {
+      // coming from something like the browser back button
+      return location.reload();
+    }
+  }
+
+  if (state.fileInfo.dead) {
+    return notFound(state);
   }
 
   if (!state.transfer && !state.fileInfo.requiresPassword) {
@@ -76,7 +120,9 @@ module.exports = function(state, emit) {
   return html`
     <main class="main">
       ${state.modal && modal(state, emit)}
-      <section class="relative h-full w-full p-6 md:rounded-lg md:shadow-big">
+      <section
+        class="relative overflow-hidden h-full w-full p-6 md:p-8 md:rounded-xl md:shadow-big md:flex md:flex-col"
+      >
         ${content}
       </section>
     </main>

app/ui/downloadCompleted.js

@@ -2,23 +2,32 @@ const html = require('choo/html');
 const assets = require('../../common/assets');
 
 module.exports = function(state) {
+  const btnText = state.user.loggedIn ? 'okButton' : 'sendYourFilesLink';
   return html`
     <div
       id="download-complete"
-      class="flex flex-col items-center justify-center h-full w-full bg-white p-2"
+      class="flex flex-col items-center justify-center h-full w-full bg-white p-2 dark:bg-grey-90"
     >
-      <h1 class="text-center font-bold my-2">
+      <h1 class="text-center text-3xl font-bold my-2">
         ${state.translate('downloadFinish')}
       </h1>
-      <img src="${assets.get('completed.svg')}" class="my-12 h-48" />
-      <p class="text-grey-darkest leading-normal">
+      <img src="${assets.get('completed.svg')}" class="my-8 h-48" />
+      <p
+        class="text-grey-80 leading-normal dark:text-grey-40 ${state.user
+          .loggedIn
+          ? 'hidden'
+          : ''}"
+      >
         ${state.translate('trySendDescription')}
       </p>
       <p class="my-5">
         <a href="/" class="btn rounded-lg flex items-center mt-4" role="button"
-          >${state.translate('sendYourFilesLink')}</a
+          >${state.translate(btnText)}</a
         >
       </p>
+      <p class="">
+        <a href="/report" class="link-blue">${state.translate('reportFile')}</a>
+      </p>
     </div>
   `;
 };

app/ui/downloadDialog.js

@@ -0,0 +1,58 @@
+const html = require('choo/html');
+
+module.exports = function() {
+  return function(state, emit, close) {
+    const archive = state.fileInfo;
+    return html`
+      <send-download-dialog
+        class="flex flex-col w-full max-w-sm h-full mx-auto items-center justify-center"
+      >
+        <h1 class="text-3xl font-bold mb-4">
+          ${state.translate('downloadConfirmTitle')}
+        </h1>
+        <p
+          class="w-full text-grey-80 text-center leading-normal dark:text-grey-40 mb-8"
+        >
+          ${state.translate('downloadConfirmDescription')}
+        </p>
+        <div class="checkbox inline-block mr-3 mb-8">
+          <input
+            id="trust-download"
+            type="checkbox"
+            autocomplete="off"
+            onchange="${toggleDownloadEnabled}"
+          />
+          <label for="trust-download">
+            ${state.translate('downloadTrustCheckbox')}
+          </label>
+        </div>
+        <button
+          id="download-btn"
+          disabled
+          class="btn rounded-lg w-full flex-shrink-0"
+          onclick="${download}"
+          title="${state.translate('downloadButtonLabel')}"
+        >
+          ${state.translate('downloadButtonLabel')}
+        </button>
+        <a href="/report" class="link-blue mt-8"
+          >${state.translate('reportFile')}</a
+        >
+      </send-download-dialog>
+    `;
+
+    function toggleDownloadEnabled(event) {
+      event.stopPropagation();
+      const checked = event.target.checked;
+      const btn = document.getElementById('download-btn');
+      btn.disabled = !checked;
+    }
+
+    function download(event) {
+      event.preventDefault();
+      close();
+      event.target.disabled = true;
+      emit('download', archive);
+    }
+  };
+};

app/ui/downloadPassword.js

@@ -6,10 +6,14 @@ module.exports = function(state, emit) {
 
   const div = html`
     <div
-      class="h-full w-full flex flex-col items-center justify-center bg-white py-8 max-w-md mx-auto"
+      class="h-full w-full flex flex-col items-center justify-center bg-white py-8 max-w-md mx-auto dark:bg-grey-90"
     >
-      <h1 class="mb-4">${state.translate('downloadTitle')}</h1>
-      <p class="w-full mb-4 text-center text-grey-darkest leading-normal">
+      <h1 class="text-3xl font-bold mb-4">
+        ${state.translate('downloadTitle')}
+      </h1>
+      <p
+        class="w-full mb-4 text-center text-grey-80 dark:text-grey-40 leading-normal"
+      >
         ${state.translate('downloadDescription')}
       </p>
       <form
@@ -17,11 +21,17 @@ module.exports = function(state, emit) {
         onsubmit="${checkPassword}"
         data-no-csrf
       >
+        <input
+          id="autocomplete-decoy"
+          class="hidden"
+          type="password"
+          value="lol"
+        />
         <input
           id="password-input"
           class="w-full border-l border-t border-b rounded-l-lg rounded-r-none ${invalid
-            ? 'border-red'
-            : 'border-grey'} leading-loose px-2 py-1"
+            ? 'border-red dark:border-red-40'
+            : 'border-grey'} leading-loose px-2 py-1 dark:bg-grey-80"
           maxlength="32"
           autocomplete="off"
           placeholder="${state.translate('unlockInputPlaceholder')}"
@@ -32,7 +42,7 @@ module.exports = function(state, emit) {
           type="submit"
           id="password-btn"
           class="btn rounded-r-lg rounded-l-none ${invalid
-            ? 'bg-red hover:bg-red focus:bg-red'
+            ? 'bg-red hover:bg-red focus:bg-red dark:bg-red-40'
             : ''}"
           value="${state.translate('unlockButtonLabel')}"
           title="${state.translate('unlockButtonLabel')}"
@@ -40,7 +50,7 @@ module.exports = function(state, emit) {
       </form>
       <label
         id="password-error"
-        class="${invalid ? '' : 'invisible'} text-red my-4"
+        class="${invalid ? '' : 'invisible'} text-red dark:text-red-40 my-4"
         for="password-input"
       >
         ${state.translate('passwordTryAgain')}
@@ -59,8 +69,13 @@ module.exports = function(state, emit) {
     const input = document.getElementById('password-input');
     const btn = document.getElementById('password-btn');
     label.classList.add('invisible');
-    input.classList.remove('border-red');
-    btn.classList.remove('bg-red', 'hover:bg-red', 'focus:bg-red');
+    input.classList.remove('border-red', 'dark:border-red-40');
+    btn.classList.remove(
+      'bg-red',
+      'hover:bg-red',
+      'focus:bg-red',
+      'dark:bg-red-40'
+    );
   }
 
   function checkPassword(event) {
@@ -70,7 +85,9 @@ module.exports = function(state, emit) {
     const password = el.value;
     if (password.length > 0) {
       document.getElementById('password-btn').disabled = true;
-      state.fileInfo.url = window.location.href;
+      // Strip any url parameters between fileId and secretKey
+      const fileInfoUrl = window.location.href.replace(/\?.+#/, '#');
+      state.fileInfo.url = fileInfoUrl;
       state.fileInfo.password = password;
       emit('getMetadata');
     }

app/ui/error.js

@@ -3,22 +3,28 @@ const assets = require('../../common/assets');
 const modal = require('./modal');
 
 module.exports = function(state, emit) {
+  const btnText = state.user.loggedIn ? 'okButton' : 'sendYourFilesLink';
   return html`
     <main class="main">
       ${state.modal && modal(state, emit)}
       <section
-        class="flex flex-col items-center justify-center h-full w-full p-6 overflow-hidden md:rounded-lg md:shadow-big"
+        class="flex flex-col items-center justify-center h-full w-full p-6 md:p-8 overflow-hidden md:rounded-xl md:shadow-big"
       >
-        <h1 class="text-center font-bold my-2">
+        <h1 class="text-center text-3xl font-bold my-2">
           ${state.translate('errorPageHeader')}
         </h1>
         <img class="my-12 h-48" src="${assets.get('error.svg')}" />
-        <p class="max-w-md text-center text-grey-darkest leading-normal">
+        <p
+          class="max-w-md text-center text-grey-80 leading-normal dark:text-grey-40 ${state
+            .user.loggedIn
+            ? 'hidden'
+            : ''}"
+        >
           ${state.translate('trySendDescription')}
         </p>
         <p class="my-5">
           <a href="/" class="btn rounded-lg flex items-center" role="button"
-            >${state.translate('sendYourFilesLink')}</a
+            >${state.translate(btnText)}</a
           >
         </p>
       </section>

app/ui/footer.js

@@ -1,7 +1,5 @@
 const html = require('choo/html');
 const Component = require('choo/component');
-const version = require('../../package.json').version;
-const { browserName } = require('../utils');
 
 class Footer extends Component {
   constructor(name, state) {
@@ -15,20 +13,15 @@ class Footer extends Component {
 
   createElement() {
     const translate = this.state.translate;
-    const browser = browserName();
-    const feedbackUrl = `https://qsurvey.mozilla.com/s3/Firefox-Send-Product-Feedback?ver=${version}&browser=${browser}`;
     return html`
       <footer
-        class="flex flex-col md:flex-row items-start w-full flex-none self-start p-6 font-medium text-xs text-grey-dark md:items-center justify-between"
+        class="flex flex-col md:flex-row items-start w-full flex-none self-start p-6 md:p-8 font-medium text-xs text-grey-60 dark:text-grey-40 md:items-center justify-between"
       >
-        <a
-          class="mozilla-logo pb-10 md:pb-0 m-2"
-          href="https://www.mozilla.org/"
-        >
+        <a class="mozilla-logo m-2" href="https://www.mozilla.org/">
           Mozilla
         </a>
         <ul
-          class="list-reset flex flex-col md:flex-row items-start md:items-center md:justify-end"
+          class="flex flex-col md:flex-row items-start md:items-center md:justify-end"
         >
           <li class="m-2">
             <a href="https://www.mozilla.org/about/legal/terms/services/#send">
@@ -46,17 +39,6 @@ class Footer extends Component {
           <li class="m-2">
             <a href="https://github.com/mozilla/send">GitHub </a>
           </li>
-          <li class="m-2">
-            <a
-              href="${feedbackUrl}"
-              rel="noreferrer noopener"
-              class="feedback-link"
-              alt="Feedback"
-              target="_blank"
-            >
-              ${translate('siteFeedback')}
-            </a>
-          </li>
         </ul>
       </footer>
     `;

app/ui/header.js

@@ -16,19 +16,31 @@ class Header extends Component {
     this.account.render();
     return false;
   }
-
   createElement() {
     const title =
       platform() === 'android'
         ? html`
-            <a class=""><img src="${assets.get('logo.svg')}"/></a>
+            <a class="flex flex-row items-center">
+              <img src="${assets.get('icon.svg')}" />
+              <svg class="w-48">
+                <use xlink:href="${assets.get('wordmark.svg')}#logo" />
+              </svg>
+            </a>
           `
         : html`
-            <a class="" href="/"><img src="${assets.get('logo.svg')}"/></a>
+            <a class="flex flex-row items-center" href="/">
+              <img
+                alt="${this.state.translate('title')}"
+                src="${assets.get('icon.svg')}"
+              />
+              <svg viewBox="66 0 340 64" class="w-48 md:w-64">
+                <use xlink:href="${assets.get('wordmark.svg')}#logo" />
+              </svg>
+            </a>
           `;
     return html`
       <header
-        class="relative flex-none flex flex-row items-center justify-between w-full px-6 h-16 md:h-24 z-20 bg-transparent"
+        class="main-header relative flex-none flex flex-row items-center justify-between w-full px-6 md:px-8 h-16 md:h-24 z-20 bg-transparent"
       >
         ${title} ${this.account.render()}
       </header>

app/ui/home.js

@@ -5,6 +5,9 @@ const modal = require('./modal');
 const intro = require('./intro');
 
 module.exports = function(state, emit) {
+  if (state.user.loginRequired && !state.user.loggedIn) {
+    emit('signup-cta', 'required');
+  }
   const archives = state.storage.files
     .filter(archive => !archive.expired)
     .map(archive => archiveTile(state, emit, archive));
@@ -20,19 +23,15 @@ module.exports = function(state, emit) {
   const right =
     archives.length === 0
       ? intro(state)
-      : list(
-          archives,
-          'list-reset p-2 h-full overflow-y-auto w-full',
-          'mb-4 w-full'
-        );
+      : list(archives, 'p-2 h-full overflow-y-auto w-full', 'mb-4 w-full');
 
   return html`
     <main class="main">
       ${state.modal && modal(state, emit)}
       <section
-        class="h-full w-full p-6 overflow-hidden md:flex md:flex-row md:rounded-lg md:shadow-big"
+        class="h-full w-full p-6 md:p-8 overflow-hidden md:flex md:flex-row md:rounded-xl md:shadow-big"
       >
-        <div class="px-2 w-full md:px-0 md:mr-6 md:w-1/2">${left}</div>
+        <div class="px-2 w-full md:px-0 md:mr-8 md:w-1/2">${left}</div>
         <div class="mt-6 w-full md:w-1/2 md:-m-2">${right}</div>
       </section>
     </main>

app/ui/intro.js

@@ -4,13 +4,13 @@ const assets = require('../../common/assets');
 module.exports = function intro(state) {
   return html`
     <send-intro
-      class="flex flex-col items-center justify-center bg-white px-6 md:py-0 py-6 mb-0 h-full w-full"
+      class="flex flex-col items-center justify-center bg-white px-6 md:py-0 py-6 mb-0 h-full w-full dark:bg-grey-90"
     >
       <div class="mt-12 flex flex-col h-full">
-        <h1 class="font-bold">
+        <h1 class="text-3xl font-bold md:pb-2">
           ${state.translate('introTitle')}
         </h1>
-        <p class="max-w-sm leading-normal mt-6 md:mt-2 md:pr-16">
+        <p class="max-w-sm leading-loose mt-6 md:mt-2 md:pr-14">
           ${state.translate('introDescription')}
         </p>
         <img class="intro" src="${assets.get('intro.svg')}" />

app/ui/legal.js

@@ -2,22 +2,25 @@ const html = require('choo/html');
 const modal = require('./modal');
 
 module.exports = function(state, emit) {
+  state.modal = null;
   return html`
     <main class="main">
       ${state.modal && modal(state, emit)}
       <div
-        class="flex flex-col items-center bg-white m-4 px-6 py-8 border border-grey-light md:border-none md:px-12 md:py-16 shadow w-full md:h-full"
+        class="flex flex-col items-center bg-white m-4 px-6 py-8 border border-grey-30 md:border-none md:px-12 md:py-16 shadow w-full md:h-full dark:bg-grey-90"
       >
-        <h1 class="text-center">${state.translate('legalTitle')}</h1>
+        <h1 class="text-center text-3xl font-bold">
+          ${state.translate('legalTitle')}
+        </h1>
         <p class="mt-2">${state.translate('legalDateStamp')}</p>
-        <div class="overflow-scroll py-8 px-12">
+        <div class="overflow-y-scroll py-8 px-12">
           <p class="leading-normal">
             <span>When Mozilla receives information from you, our</span>
             <a
               href="https://www.mozilla.org/privacy/"
               target="__blank"
               rel="noopener noreferrer"
-              class="text-blue-dark hover:underline"
+              class="link-blue hover:underline"
               >Mozilla Privacy Policy</a
             >
             <span
@@ -29,7 +32,7 @@ module.exports = function(state, emit) {
               href="https://github.com/mozilla/send/blob/master/docs/metrics.md"
               target="__blank"
               rel="noopener noreferrer"
-              class="text-blue-dark hover:underline"
+              class="link-blue hover:underline"
               >here</a
             >.
           </p>

app/ui/modal.js

@@ -3,13 +3,12 @@ const html = require('choo/html');
 module.exports = function(state, emit) {
   return html`
     <send-modal
-      class="absolute pin flex items-center justify-center overflow-hidden z-40 bg-white md:rounded-lg md:my-8"
-      onclick="${close}"
+      class="absolute inset-0 flex items-center justify-center overflow-hidden z-40 bg-white md:rounded-xl md:my-8 dark:bg-grey-90"
     >
       <div
-        class="h-full w-full max-h-screen absolute pin-t flex items-center justify-center"
+        class="h-full w-full max-h-screen absolute top-0 flex justify-center md:items-center"
       >
-        <div class="w-full" onclick="${e => e.stopPropagation()}">
+        <div class="w-full">
           ${state.modal(state, emit, close)}
         </div>
       </div>
@@ -21,7 +20,6 @@ module.exports = function(state, emit) {
       event.preventDefault();
       event.stopPropagation();
     }
-    state.modal = null;
-    emit('render');
+    emit('closeModal');
   }
 };

app/ui/noStreams.js

@@ -8,18 +8,20 @@ module.exports = function(state, emit) {
     <div
       class="flex flex-col w-full max-w-md h-full mx-auto items-center justify-center"
     >
-      <h1 class="mb-4">${state.translate('downloadTitle')}</h1>
+      <h1 class="mb-4 text-3xl font-bold">${state.translate(
+        'downloadTitle'
+      )}</h1>
       <p
-        class="w-full p-2 border border-yellow-light rounded md:w-4/5 text-orange-dark bg-yellow-lighter text-center leading-normal"
+        class="w-full p-2 border border-yellow-50 rounded md:w-4/5 text-orange-60 bg-yellow-40 text-center leading-normal"
       >
         ⚠️ ${state.translate('noStreamsWarning')} ⚠️
       </p>
       <form class="md:w-128" onsubmit=${submit}>
         <fieldset class="border rounded p-4 my-4" onchange=${optionChanged}>
           <div class="flex items-center mb-2">
-            <img class="mr-3 flex-no-shrink" src="${assets.get(
-              'blue_file.svg'
-            )}"/>
+            <svg class="h-8 w-6 mr-3 flex-shrink-0 text-white dark:text-grey-90">
+              <use xlink:href="${assets.get('blue_file.svg')}#icon"/>
+            </svg>
             <p class="flex-grow">
               <h1 class="text-base font-medium word-break-all">${
                 archive.name
@@ -49,10 +51,15 @@ module.exports = function(state, emit) {
           </div>
         </fieldset>
         <input
-            class="btn rounded-lg w-full flex flex-no-shrink items-center justify-center"
+            class="btn rounded-lg w-full flex flex-shrink-0 items-center justify-center"
             value="${state.translate('copyLinkButton')}"
             title="${state.translate('copyLinkButton')}"
             type="submit" />
+            <p
+          class="text-grey-80 leading-normal dark:text-grey-40 font-semibold text-center md:my-8 md:text-left"
+        >
+          ${state.translate('downloadConfirmDescription')}
+        </p>
       </form>
     </div>
   `;
@@ -62,6 +69,7 @@ module.exports = function(state, emit) {
     const choice = event.target.value;
     const button = event.currentTarget.nextElementSibling;
     let title = button.title;
+    console.error(choice, title);
     switch (choice) {
       case 'copy':
         title = state.translate('copyLinkButton');

app/ui/notFound.js

@@ -3,22 +3,33 @@ const assets = require('../../common/assets');
 const modal = require('./modal');
 
 module.exports = function(state, emit) {
+  const btnText = state.user.loggedIn ? 'okButton' : 'sendYourFilesLink';
   return html`
     <main class="main">
       ${state.modal && modal(state, emit)}
       <section
-        class="flex flex-col items-center justify-center h-full w-full p-6 overflow-hidden md:rounded-lg md:shadow-big"
+        class="flex flex-col items-center justify-center h-full w-full p-6 md:p-8 overflow-hidden md:rounded-xl md:shadow-big"
       >
-        <h1 class="text-center font-bold my-2">
+        <h1 class="text-center text-3xl font-bold my-2">
           ${state.translate('expiredTitle')}
         </h1>
         <img src="${assets.get('notFound.svg')}" class="my-12" />
-        <p class="max-w-md text-center text-grey-darkest leading-normal">
+        <p
+          class="max-w-md text-center text-grey-80 leading-normal dark:text-grey-40 ${state
+            .user.loggedIn
+            ? 'hidden'
+            : ''}"
+        >
           ${state.translate('trySendDescription')}
         </p>
         <p class="my-5">
           <a href="/" class="btn rounded-lg flex items-center" role="button"
-            >${state.translate('sendYourFilesLink')}</a
+            >${state.translate(btnText)}</a
+          >
+        </p>
+        <p class="">
+          <a href="/report" class="link-blue"
+            >${state.translate('reportFile')}</a
           >
         </p>
       </section>

app/ui/okDialog.js

@@ -4,9 +4,11 @@ module.exports = function(message) {
   return function(state, emit, close) {
     return html`
       <send-ok-dialog class="flex flex-col max-w-sm p-4 m-auto">
-        <h2 class="text-center m-8 leading-normal">${message}</h2>
+        <h2 class="text-center text-xl font-bold m-8 leading-normal">
+          ${message}
+        </h2>
         <button
-          class="btn rounded-lg w-full flex-no-shrink"
+          class="btn rounded-lg w-full flex-shrink-0"
           onclick="${close}"
           title="${state.translate('okButton')}"
         >

app/ui/promo.js

@@ -3,8 +3,9 @@ const Component = require('choo/component');
 const assets = require('../../common/assets');
 
 class Promo extends Component {
-  constructor(name) {
+  constructor(name, state) {
     super(name);
+    this.state = state;
   }
 
   update() {
@@ -14,21 +15,20 @@ class Promo extends Component {
   createElement() {
     return html`
       <send-promo
-        class="w-full flex-none flex-row items-center content-center justify-center text-sm bg-grey-light leading-tight text-grey-darkest px-4 py-3 hidden md:flex"
+        class="w-full flex-row items-center content-center justify-center bg-white text-grey-80 px-4 py-3 flex border-b border-grey-banner leading-normal dark:bg-grey-90 dark:text-grey-20 dark:border-grey-80"
       >
         <div class="flex items-center mx-auto">
           <img
-            src="${assets.get('firefox_logo-only.svg')}"
-            class="w-6"
+            src="${assets.get('master-logo.svg')}"
+            class="w-6 h-6"
             alt="Firefox"
           />
-          <span class="ml-3"
-            >Send is brought to you by the all-new Firefox.${' '}
+          <span class="ml-2 sm:ml-4 text-xs sm:text-base">
+            ${`Like Firefox Send? You'll love our new full-device VPN. `}
             <a
-              class="text-blue"
-              href="https://www.mozilla.org/firefox/new/?utm_campaign=send-acquisition&utm_medium=referral&utm_source=send.firefox.com"
-            >
-              Download Firefox now ≫</a
+              class="underline link-blue"
+              href="https://vpn.mozilla.org/?utm_source=send.firefox.com&utm_medium=referral&utm_content=Try+Firefox+Private+Network&utm_campaign=top-bar"
+              >${`Get it today`}</a
             >
           </span>
         </div>

app/ui/report.js

@@ -0,0 +1,139 @@
+const html = require('choo/html');
+const raw = require('choo/html/raw');
+const assets = require('../../common/assets');
+
+const REPORTABLES = ['Malware', 'Pii', 'Abuse'];
+
+module.exports = function(state, emit) {
+  let submitting = false;
+  const file = state.fileInfo;
+  if (!file) {
+    return html`
+      <main class="main">
+        <section
+          class="flex flex-col items-center justify-center h-full w-full p-6 md:p-8 overflow-hidden md:rounded-xl md:shadow-big"
+        >
+          <p class="text-xl text-center mb-4 leading-normal">
+            ${state.translate('reportUnknownDescription')}
+          </p>
+          <p class="text-center">
+            ${raw(
+              replaceLinks(state.translate('reportReasonCopyright'), [
+                'https://www.mozilla.org/about/legal/report-infringement/'
+              ])
+            )}
+          </p>
+        </section>
+      </main>
+    `;
+  }
+  if (file.reported) {
+    return html`
+      <main class="main">
+        <section
+          class="flex flex-col items-center justify-center h-full w-full p-6 md:p-8 overflow-hidden md:rounded-xl md:shadow-big"
+        >
+          <h1 class="text-center text-3xl font-bold my-2">
+            ${state.translate('reportedTitle')}
+          </h1>
+          <p class="max-w-md text-center leading-normal">
+            ${state.translate('reportedDescription')}
+          </p>
+          <img src="${assets.get('notFound.svg')}" class="my-12" />
+          <p class="my-5">
+            <a href="/" class="btn rounded-lg flex items-center" role="button"
+              >${state.translate('okButton')}</a
+            >
+          </p>
+        </section>
+      </main>
+    `;
+  }
+  return html`
+    <main class="main">
+      <section
+        class="relative h-full w-full p-6 md:p-8 md:rounded-xl md:shadow-big"
+      >
+        <div
+          class="flex flex-col w-full max-w-sm h-full mx-auto items-center justify-center"
+        >
+          <h1 class="text-2xl font-bold mb-4">
+            ${state.translate('reportFile')}
+          </h1>
+          <p class="mb-4 leading-normal font-semibold">
+            ${state.translate('reportDescription')}
+          </p>
+          <form onsubmit="${report}" data-no-csrf>
+            <fieldset onchange="${optionChanged}">
+              <ul
+                class="list-none p-4 mb-6 rounded-sm bg-grey-10 dark:bg-black"
+              >
+                ${REPORTABLES.map(
+                  reportable =>
+                    html`
+                      <li class="mb-2 leading-normal">
+                        <label
+                          for="${reportable.toLowerCase()}"
+                          class="flex items-center"
+                        >
+                          <input
+                            type="radio"
+                            name="reason"
+                            id="${reportable.toLowerCase()}"
+                            value="${reportable.toLowerCase()}"
+                            class="mr-2 my-2 w-4 h-4 flex-none"
+                          />
+                          ${state.translate(`reportReason${reportable}`)}
+                        </label>
+                      </li>
+                    `
+                )}
+                <li class="mt-4 mb-2 leading-normal">
+                  ${raw(
+                    replaceLinks(state.translate('reportReasonCopyright'), [
+                      'https://www.mozilla.org/about/legal/report-infringement/'
+                    ])
+                  )}
+                </li>
+              </ul>
+            </fieldset>
+            <input
+              type="submit"
+              disabled
+              class="btn rounded-lg w-full flex-shrink-0 focus:outline"
+              title="${state.translate('reportButton')}"
+              value="${state.translate('reportButton')}"
+            />
+          </form>
+        </div>
+      </section>
+    </main>
+  `;
+
+  function optionChanged(event) {
+    event.stopPropagation();
+    const button = event.currentTarget.nextElementSibling;
+    button.disabled = false;
+  }
+
+  function report(event) {
+    event.stopPropagation();
+    event.preventDefault();
+    if (submitting) {
+      return;
+    }
+    submitting = true;
+    state.fileInfo.reported = true;
+    const form = event.target;
+    emit('report', { reason: form.reason.value });
+  }
+
+  function replaceLinks(str, urls) {
+    let i = 0;
+    const s = str.replace(
+      /<a>([^<]+)<\/a>/g,
+      (m, v) => `<a class="text-blue" href="${urls[i++]}">${v}</a>`
+    );
+    return `<p>${s}</p>`;
+  }
+};

app/ui/selectbox.js

@@ -6,7 +6,7 @@ module.exports = function(selected, options, translate, changed, htmlId) {
   return html`
     <select
       id="${htmlId}"
-      class="appearance-none cursor-pointer border rounded bg-grey-lightest hover:border-blue-dark focus:border-blue-dark pl-1 pr-8 py-1 my-1 h-8"
+      class="appearance-none cursor-pointer border rounded bg-grey-10 hover:border-blue-50 focus:border-blue-50 pl-1 pr-8 py-1 my-1 h-8 dark:bg-grey-80"
       onchange="${choose}"
     >
       ${options.map(

app/ui/shareDialog.js

@@ -1,40 +1,34 @@
 const html = require('choo/html');
 
-/* Possible strings for l10n
-shareLinkDescription = Share the link to your file:
-shareLinkButton = Share link
-shareMessage = Download "{ $name }" with { -send-brand }: simple, safe file sharing
- */
-
 module.exports = function(name, url) {
-  return function(state, emit, close) {
+  const dialog = function(state, emit, close) {
     return html`
       <send-share-dialog
         class="flex flex-col items-center text-center p-4 max-w-sm m-auto"
       >
-        <h1 class="font-bold my-4">
+        <h1 class="text-3xl font-bold my-4">
           ${state.translate('notifyUploadEncryptDone')}
         </h1>
-        <p class="font-normal leading-normal text-grey-darkest word-break-all">
-          Share the link to your file:<br />
-          ${name}
+        <p class="font-normal leading-normal text-grey-80 dark:text-grey-40">
+          ${state.translate('shareLinkDescription')}<br />
+          <span class="word-break-all">${name}</span>
         </p>
         <input
           type="text"
           id="share-url"
-          class="w-full my-4 border rounded-lg leading-loose h-12 px-2 py-1"
+          class="w-full my-4 border rounded-lg leading-loose h-12 px-2 py-1 dark:bg-grey-80"
           value="${url}"
           readonly="true"
         />
         <button
-          class="btn rounded-lg w-full flex-no-shrink focus:outline"
+          class="btn rounded-lg w-full flex-shrink-0 focus:outline"
           onclick="${share}"
-          title="Share link"
+          title="${state.translate('shareLinkButton')}"
         >
-          Share link
+          ${state.translate('shareLinkButton')}
         </button>
         <button
-          class="text-blue-dark hover:text-blue-darker focus:text-blue-darker my-4 font-medium cursor-pointer focus:outline"
+          class="link-blue my-4 font-medium cursor-pointer focus:outline"
           onclick="${close}"
           title="${state.translate('okButton')}"
         >
@@ -48,8 +42,7 @@ module.exports = function(name, url) {
       try {
         await navigator.share({
           title: state.translate('-send-brand'),
-          text: `Download "${name}" with Firefox Send: simple, safe file sharing`,
-          //state.translate('shareMessage', { name }),
+          text: state.translate('shareMessage', { name }),
           url
         });
       } catch (e) {
@@ -61,4 +54,6 @@ module.exports = function(name, url) {
       close();
     }
   };
+  dialog.type = 'share';
+  return dialog;
 };

app/ui/signupDialog.js

@@ -1,29 +1,23 @@
 const html = require('choo/html');
 const assets = require('../../common/assets');
-const { bytes, platform } = require('../utils');
+const { bytes } = require('../utils');
 const { canceledSignup, submittedSignup } = require('../metrics');
 
 module.exports = function(trigger) {
   return function(state, emit, close) {
     const DAYS = Math.floor(state.LIMITS.MAX_EXPIRE_SECONDS / 86400);
-    const hidden = platform() === 'android' ? 'hidden' : '';
     let submitting = false;
     return html`
       <send-signup-dialog
-        class="flex flex-col lg:flex-row justify-center px-8 md:px-24 w-full h-full"
+        class="flex flex-col justify-center my-16 md:my-0 px-8 md:px-24 w-full h-full"
       >
-        <img
-          src="${assets.get('firefox_logo-only.svg')}"
-          class="h-16 mt-1 mb-4"
-        />
-        <section
-          class="flex flex-col flex-no-shrink self-center lg:mx-6 lg:max-w-xs"
-        >
-          <h1 class="font-bold text-center lg:text-left">
+        <img src="${assets.get('master-logo.svg')}" class="h-16 mt-1 mb-4" />
+        <section class="flex flex-col flex-shrink-0 self-center">
+          <h1 class="text-3xl font-bold text-center">
             ${state.translate('accountBenefitTitle')}
           </h1>
           <ul
-            class="leading-normal text-grey-darkest my-2 mt-4 pl-4 md:self-center"
+            class="leading-normal list-disc text-grey-80 my-2 mt-4 pl-4 md:self-center dark:text-grey-40"
           >
             <li>
               ${state.translate('accountBenefitLargeFiles', {
@@ -35,34 +29,35 @@ module.exports = function(trigger) {
               ${state.translate('accountBenefitTimeLimit', { count: DAYS })}
             </li>
             <li>${state.translate('accountBenefitSync')}</li>
-            <li>${state.translate('accountBenefitMoz')}</li>
           </ul>
         </section>
-        <section
-          class="flex flex-col flex-grow m-4 md:self-center md:w-128 lg:max-w-xs"
-        >
+        <section class="flex flex-col flex-grow m-4 md:self-center md:w-128">
           <form onsubmit=${submitEmail} data-no-csrf>
             <input
               id="email-input"
               type="email"
-              class="${hidden} border rounded-lg w-full px-2 py-1 h-12 mb-3 text-lg text-grey-darker leading-loose"
+              class="hidden border rounded-lg w-full px-2 py-1 h-12 mb-3 text-lg text-grey-70 leading-loose dark:bg-grey-80 dark:text-white"
               placeholder=${state.translate('emailPlaceholder')}
             />
             <input
-              class="btn rounded-lg w-full flex flex-no-shrink items-center justify-center"
-              value="${state.translate('signInButton')}"
-              title="${state.translate('signInButton')}"
+              class="btn rounded-lg w-full flex flex-shrink-0 items-center justify-center"
+              value="${state.translate('signInOnlyButton')}"
+              title="${state.translate('signInOnlyButton')}"
               id="email-submit"
               type="submit"
             />
           </form>
-          <button
-            class="my-3 text-blue-dark hover:text-blue-darker focus:text-blue-darker font-medium"
-            title="${state.translate('deletePopupCancel')}"
-            onclick=${cancel}
-          >
-            ${state.translate('deletePopupCancel')}
-          </button>
+          ${state.user.loginRequired
+            ? ''
+            : html`
+                <button
+                  class="my-3 link-blue font-medium"
+                  title="${state.translate('deletePopupCancel')}"
+                  onclick=${cancel}
+                >
+                  ${state.translate('deletePopupCancel')}
+                </button>
+              `}
         </section>
       </send-signup-dialog>
     `;

app/ui/surveyDialog.js

@@ -0,0 +1,42 @@
+const html = require('choo/html');
+const version = require('../../package.json').version;
+const { browserName } = require('../utils');
+
+module.exports = function() {
+  return function(state, emit, close) {
+    const surveyUrl = `${
+      state.PREFS.surveyUrl
+    }?ver=${version}&browser=${browserName()}&anon=${
+      state.user.loggedIn
+    }&active_count=${state.storage.files.length}`;
+    return html`
+      <send-survey-dialog
+        class="flex flex-col items-center text-center p-4 max-w-sm m-auto"
+      >
+        <h1 class="text-3xl font-bold my-4">
+          Tell us what you think.
+        </h1>
+        <p class="font-normal leading-normal text-grey-80 px-4">
+          Love Firefox Send? Take a quick survey to let us know how we can make
+          it better.
+        </p>
+        <a
+          class="btn rounded-lg w-full flex-shrink-0 focus:outline my-5"
+          onclick="${() => emit('closeModal')}"
+          title="Give feedback"
+          href="${surveyUrl}"
+          target="_blank"
+        >
+          Give feedback
+        </a>
+        <button
+          class="link-blue font-medium cursor-pointer focus:outline"
+          onclick="${close}"
+          title="Skip"
+        >
+          Skip
+        </button>
+      </send-survey-dialog>
+    `;
+  };
+};

app/ui/unsupported.js

@@ -27,9 +27,9 @@ module.exports = function(state, emit) {
     <main class="main">
       ${state.modal && modal(state, emit)}
       <section
-        class="flex flex-col items-center justify-center text-center bg-white m-6 px-6 py-8 border border-grey-light md:border-none md:px-12 md:py-16 shadow w-full md:h-full"
+        class="flex flex-col items-center justify-center text-center bg-white m-6 px-6 py-8 border border-grey-30 md:border-none md:px-12 md:py-16 shadow w-full md:h-full dark:bg-grey-90"
       >
-        <h1 class="">${strings.header}</h1>
+        <h1 class="text-3xl font-bold">${strings.header}</h1>
         <p class="mt-4 mb-8 max-w-md leading-normal">${strings.description}</p>
         ${why}
         <a href="${url}" class="btn rounded-lg mt-8 px-8">

app/user.js

@@ -44,6 +44,14 @@ export default class User {
     this.storage.set('firstAction', action);
   }
 
+  get surveyed() {
+    return this.storage.get('surveyed');
+  }
+
+  set surveyed(yes) {
+    this.storage.set('surveyed', yes);
+  }
+
   get avatar() {
     const defaultAvatar = assets.get('user.svg');
     if (this.info.avatarDefault) {
@@ -68,6 +76,10 @@ export default class User {
     return this.info.access_token;
   }
 
+  get refreshToken() {
+    return this.info.refresh_token;
+  }
+
   get maxSize() {
     return this.loggedIn
       ? this.limits.MAX_FILE_SIZE
@@ -86,6 +98,10 @@ export default class User {
       : this.limits.ANON.MAX_DOWNLOADS;
   }
 
+  get loginRequired() {
+    return this.authConfig && this.authConfig.fxa_required;
+  }
+
   async metricId() {
     return this.loggedIn ? hashId(this.info.uid) : undefined;
   }
@@ -94,10 +110,12 @@ export default class User {
     return this.loggedIn ? hashId(this.storage.id) : hashId(anonId);
   }
 
-  async startAuthFlow(source, utms = {}) {
+  async startAuthFlow(trigger, utms = {}) {
+    this.utms = utms;
+    this.trigger = trigger;
     try {
       const params = new URLSearchParams({
-        entrypoint: `send-${source}`,
+        entrypoint: `send-${trigger}`,
         form_type: 'email',
         utm_source: utms.source || 'send',
         utm_campaign: utms.campaign || 'none'
@@ -111,12 +129,10 @@ export default class User {
       const { flowId, flowBeginTime } = await res.json();
       this.flowId = flowId;
       this.flowBeginTime = flowBeginTime;
-      this.utms = utms;
     } catch (e) {
       console.error(e);
       this.flowId = null;
       this.flowBeginTime = null;
-      this.utms = null;
     }
   }
 
@@ -127,6 +143,7 @@ export default class User {
     const code_challenge = await preparePkce(this.storage);
     const options = {
       action: 'email',
+      access_type: 'offline',
       client_id: this.authConfig.client_id,
       code_challenge,
       code_challenge_method: 'S256',
@@ -142,6 +159,9 @@ export default class User {
       options.flow_id = this.flowId;
       options.flow_begin_time = this.flowBeginTime;
     }
+    if (this.trigger) {
+      options.entrypoint = `send-${this.trigger}`;
+    }
     if (this.utms) {
       options.utm_campaign = this.utms.campaign || 'none';
       options.utm_content = this.utms.content || 'none';
@@ -181,12 +201,69 @@ export default class User {
     });
     const userInfo = await infoResponse.json();
     userInfo.access_token = auth.access_token;
+    userInfo.refresh_token = auth.refresh_token;
     userInfo.fileListKey = await getFileListKey(this.storage, auth.keys_jwe);
     this.info = userInfo;
     this.storage.remove('pkceVerifier');
   }
 
-  logout() {
+  async refresh() {
+    if (!this.refreshToken) {
+      return false;
+    }
+    try {
+      const tokenResponse = await fetch(this.authConfig.token_endpoint, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify({
+          client_id: this.authConfig.client_id,
+          grant_type: 'refresh_token',
+          refresh_token: this.refreshToken
+        })
+      });
+      if (tokenResponse.ok) {
+        const auth = await tokenResponse.json();
+        const info = { ...this.info, access_token: auth.access_token };
+        this.info = info;
+        return true;
+      }
+    } catch (e) {
+      console.error(e);
+    }
+    await this.logout();
+    return false;
+  }
+
+  async logout() {
+    try {
+      if (this.refreshToken) {
+        await fetch(this.authConfig.revocation_endpoint, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json'
+          },
+          body: JSON.stringify({
+            refresh_token: this.refreshToken
+          })
+        });
+      }
+      if (this.bearerToken) {
+        await fetch(this.authConfig.revocation_endpoint, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json'
+          },
+          body: JSON.stringify({
+            token: this.bearerToken
+          })
+        });
+      }
+    } catch (e) {
+      console.error(e);
+      // oh well, we tried
+    }
     this.storage.clearLocalFiles();
     this.info = {};
   }
@@ -200,6 +277,14 @@ export default class User {
     const key = b64ToArray(this.info.fileListKey);
     const sha = await crypto.subtle.digest('SHA-256', key);
     const kid = arrayToB64(new Uint8Array(sha)).substring(0, 16);
+    const retry = async () => {
+      const refreshed = await this.refresh();
+      if (refreshed) {
+        return await this.syncFileList();
+      } else {
+        return { incoming: true };
+      }
+    };
     try {
       const encrypted = await getFileList(this.bearerToken, kid);
       const decrypted = await streamToArrayBuffer(
@@ -208,8 +293,7 @@ export default class User {
       list = JSON.parse(textDecoder.decode(decrypted));
     } catch (e) {
       if (e.message === '401') {
-        this.logout();
-        return { incoming: true };
+        return retry(e);
       }
     }
     changes = await this.storage.merge(list);
@@ -225,7 +309,9 @@ export default class User {
       );
       await setFileList(this.bearerToken, kid, encrypted);
     } catch (e) {
-      //
+      if (e.message === '401') {
+        return retry(e);
+      }
     }
     return changes;
   }

app/utils.js

@@ -1,5 +1,10 @@
 /* global Android */
-const html = require('choo/html');
+let html;
+try {
+  html = require('choo/html');
+} catch (e) {
+  // running in the service worker
+}
 const b64 = require('base64-js');
 
 function arrayToB64(array) {
@@ -14,6 +19,10 @@ function b64ToArray(str) {
   return b64.toByteArray(str + '==='.slice((str.length + 3) % 4));
 }
 
+function locale() {
+  return document.querySelector('html').lang;
+}
+
 function loadShim(polyfill) {
   return new Promise((resolve, reject) => {
     const shim = document.createElement('script');
@@ -25,7 +34,7 @@ function loadShim(polyfill) {
 }
 
 function isFile(id) {
-  return /^[0-9a-fA-F]{10}$/.test(id);
+  return /^[0-9a-fA-F]{10,16}$/.test(id);
 }
 
 function copyToClipboard(str) {
@@ -67,8 +76,7 @@ function bytes(num) {
   let nStr = n.toFixed(decimalDigits);
   if (LOCALIZE_NUMBERS) {
     try {
-      const locale = document.querySelector('html').lang;
-      nStr = n.toLocaleString(locale, {
+      nStr = n.toLocaleString(locale(), {
         minimumFractionDigits: decimalDigits,
         maximumFractionDigits: decimalDigits
       });
@@ -85,8 +93,7 @@ function bytes(num) {
 function percent(ratio) {
   if (LOCALIZE_NUMBERS) {
     try {
-      const locale = document.querySelector('html').lang;
-      return ratio.toLocaleString(locale, { style: 'percent' });
+      return ratio.toLocaleString(locale(), { style: 'percent' });
     } catch (e) {
       // fall through
     }
@@ -96,8 +103,7 @@ function percent(ratio) {
 
 function number(n) {
   if (LOCALIZE_NUMBERS) {
-    const locale = document.querySelector('html').lang;
-    return n.toLocaleString(locale);
+    return n.toLocaleString(locale());
   }
   return n.toString();
 }
@@ -136,12 +142,16 @@ function openLinksInNewTab(links, should = true) {
 
 function browserName() {
   try {
+    // order of these matters
     if (/firefox/i.test(navigator.userAgent)) {
       return 'firefox';
     }
     if (/edge/i.test(navigator.userAgent)) {
       return 'edge';
     }
+    if (/edg/i.test(navigator.userAgent)) {
+      return 'edgium';
+    }
     if (/trident/i.test(navigator.userAgent)) {
       return 'ie';
     }
@@ -266,7 +276,16 @@ function setTranslate(t) {
   translate = t;
 }
 
+function concat(b1, b2) {
+  const result = new Uint8Array(b1.length + b2.length);
+  result.set(b1, 0);
+  result.set(b2, b1.length);
+  return result;
+}
+
 module.exports = {
+  concat,
+  locale,
   fadeOut,
   delay,
   allowedCopy,

app/zip.js

@@ -1,4 +1,4 @@
-import crc32 from 'crc/crc32';
+import crc32 from './crc32';
 
 const encoder = new TextEncoder();
 
@@ -50,7 +50,7 @@ class File {
     v.setUint32(0, 0x08074b50, true); // sig
     v.setUint32(4, this.crc, true); // crc32
     v.setUint32(8, this.size, true); // compressed size
-    v.setUint16(12, this.size, true); // uncompressed size
+    v.setUint32(12, this.size, true); // uncompressed size
     return new Uint8Array(dd);
   }
 
@@ -60,7 +60,7 @@ class File {
     v.setUint32(0, 0x02014b50, true); // sig
     v.setUint16(4, 20, true); // version made
     v.setUint16(6, 20, true); // version required
-    v.setUint16(8, 0, true); // bit flags
+    v.setUint16(8, 8, true); // bit flags (8 = use data descriptor)
     v.setUint16(10, 0, true); // compression
     v.setUint16(12, this.dateTime.time, true); // modified time
     v.setUint16(14, this.dateTime.date, true); // modified date

assets/addfiles.svg

@@ -1,9 +1,9 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24">
-  <defs>
-    <polygon id="addfiles-a" points="11.143 6 11.143 11.143 6 11.143 6 12.857 11.143 12.857 11.143 18 12.857 18 12.857 12.857 18 12.857 18 11.143 12.857 11.143 12.857 6"/>
-  </defs>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<symbol id="plus" viewBox="0 0 24 24">
   <g fill="none" fill-rule="evenodd">
-    <path fill="#0060df" fill-rule="nonzero" d="M12,22.6666667 C17.8910373,22.6666667 22.6666667,17.8910373 22.6666667,12 C22.6666667,6.10896267 17.8910373,1.33333333 12,1.33333333 C6.10896267,1.33333333 1.33333333,6.10896267 1.33333333,12 C1.33333333,17.8910373 6.10896267,22.6666667 12,22.6666667 Z M12,24 C5.372583,24 0,18.627417 0,12 C0,5.372583 5.372583,0 12,0 C18.627417,0 24,5.372583 24,12 C24,18.627417 18.627417,24 12,24 Z"/>
-    <use fill="#0060df" xlink:href="#addfiles-a"/>
+    <path fill="currentColor" fill-rule="nonzero" d="M12,22.6666667 C17.8910373,22.6666667 22.6666667,17.8910373 22.6666667,12 C22.6666667,6.10896267 17.8910373,1.33333333 12,1.33333333 C6.10896267,1.33333333 1.33333333,6.10896267 1.33333333,12 C1.33333333,17.8910373 6.10896267,22.6666667 12,22.6666667 Z M12,24 C5.372583,24 0,18.627417 0,12 C0,5.372583 5.372583,0 12,0 C18.627417,0 24,5.372583 24,12 C24,18.627417 18.627417,24 12,24 Z"/>
+    <polygon fill="currentColor" points="11.143 6 11.143 11.143 6 11.143 6 12.857 11.143 12.857 11.143 18 12.857 18 12.857 12.857 18 12.857 18 11.143 12.857 11.143 12.857 6"/>
   </g>
+  </symbol>
+  <use xlink:href="#plus"/>
 </svg>

assets/blue_file.svg

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="26px" height="32px" viewBox="0 0 26 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 53 (72520) - https://sketchapp.com -->
-    <title>6AF7DAB4-6456-44F2-AABE-F001D910B641</title>
-    <desc>Created with sketchtool.</desc>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <symbol id="icon" viewBox="0 0 26 32">
     <defs>
         <path d="M21.848475,31.6653183 L2.89005487,31.6653183 C1.32717435,31.6653183 0.104050469,30.3742431 0.104050469,28.8793139 L0.104050469,2.7860044 C0.104050469,1.22312388 1.39512568,0 2.89005487,0 L14.7135857,0 C15.4610503,0 16.2085149,0.271805307 16.6841742,0.815415921 L23.8190635,7.95030523 C24.3626741,8.49391584 24.6344794,9.17342911 24.6344794,9.9208937 L24.6344794,28.8793139 C24.6344794,30.3742431 23.4113555,31.6653183 21.848475,31.6653183 Z" id="path-1"></path>
     </defs>
@@ -14,14 +12,15 @@
                         <mask id="mask-2" fill="white">
                             <use xlink:href="#path-1"></use>
                         </mask>
-                        <use id="Mask" fill="#45A1FF" opacity="0.6" xlink:href="#path-1"></use>
-                        <path d="M24.3031318,10.6474633 L16.7826187,10.6474633 C15.2742552,10.6474633 14.051485,9.42469306 14.051485,7.91632957 L14.051485,0.395816478" id="Path" stroke="#FFFFFF" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
-                        <path d="M7.2830232,8.93885547 L8.91906464,8.93885547" id="Path" stroke="#0060DF" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
-                        <path d="M7.2830232,15.7798836 L17.5412669,15.7798836" id="Path" stroke="#0060DF" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
-                        <path d="M7.2830232,22.6209117 L17.5412669,22.6209117" id="Path" stroke="#0060DF" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
+                        <use id="Mask" fill="#45a1ff" xlink:href="#path-1"></use>
+                        <path d="M24.3031318,10.6474633 L16.7826187,10.6474633 C15.2742552,10.6474633 14.051485,9.42469306 14.051485,7.91632957 L14.051485,0.395816478" id="Path" stroke="currentColor" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
+                        <path d="M7.2830232,8.93885547 L8.91906464,8.93885547" id="Path" stroke="currentColor" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
+                        <path d="M7.2830232,15.7798836 L17.5412669,15.7798836" id="Path" stroke="currentColor" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
+                        <path d="M7.2830232,22.6209117 L17.5412669,22.6209117" id="Path" stroke="currentColor" stroke-width="2" stroke-linecap="round" mask="url(#mask-2)"></path>
                     </g>
                 </g>
             </g>
         </g>
     </g>
+    </symbol>
 </svg>

assets/close-16.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 16 16"><path fill="#4A4A4A" d="M9.414 8l5.293-5.293a1 1 0 0 0-1.414-1.414L8 6.586 2.707 1.293a1 1 0 0 0-1.414 1.414L6.586 8l-5.293 5.293a1 1 0 1 0 1.414 1.414L8 9.414l5.293 5.293a1 1 0 0 0 1.414-1.414z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 16 16"><path fill="#737373" d="M9.414 8l5.293-5.293a1 1 0 0 0-1.414-1.414L8 6.586 2.707 1.293a1 1 0 0 0-1.414 1.414L6.586 8l-5.293 5.293a1 1 0 1 0 1.414 1.414L8 9.414l5.293 5.293a1 1 0 0 0 1.414-1.414z"/></svg>

assets/copy-16.svg

@@ -1 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><path fill="#0060df" d="M14.707 8.293l-3-3A1 1 0 0 0 11 5h-1V4a1 1 0 0 0-.293-.707l-3-3A1 1 0 0 0 6 0H3a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h3v3a2 2 0 0 0 2 2h5a2 2 0 0 0 2-2V9a1 1 0 0 0-.293-.707zM12.586 9H11V7.414zm-5-5H6V2.414zM6 7v2H3V2h2v2.5a.5.5 0 0 0 .5.5H8a2 2 0 0 0-2 2zm2 7V7h2v2.5a.5.5 0 0 0 .5.5H13v4z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg">
+<symbol id="icon" viewBox="0 0 16 16">
+<path fill="currentColor" d="M14.707 8.293l-3-3A1 1 0 0 0 11 5h-1V4a1 1 0 0 0-.293-.707l-3-3A1 1 0 0 0 6 0H3a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h3v3a2 2 0 0 0 2 2h5a2 2 0 0 0 2-2V9a1 1 0 0 0-.293-.707zM12.586 9H11V7.414zm-5-5H6V2.414zM6 7v2H3V2h2v2.5a.5.5 0 0 0 .5.5H8a2 2 0 0 0-2 2zm2 7V7h2v2.5a.5.5 0 0 0 .5.5H13v4z"/>
+</symbol>
+</svg>

assets/dl.svg

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="12px" height="16px" viewBox="0 0 12 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 53 (72520) - https://sketchapp.com -->
-    <title>728D143F-562C-4AE5-80DA-9DBBD9D647D8</title>
-    <desc>Created with sketchtool.</desc>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Send_Sending" transform="translate(-770.000000, -481.000000)" fill="#0060DF">
-            <g id="List-Item-3" transform="translate(744.000000, 350.000000)">
-                <g id="Download-Icon" transform="translate(26.000000, 131.000000)">
-                    <path d="M5.293,12.707 C5.6835,13.097382 6.316501,13.097383 6.707001,12.707 L11.707,7.707 C12.08597,7.31462 12.08054,6.69092 11.69481,6.305189 C11.30908,5.91946 10.68538,5.91403 10.293,6.293 L7,9.586 L7,1 C7,0.44772 6.552285,0 6,0 C5.447715,0 5,0.44772 5,1 L5,9.586 L1.707,6.293 C1.314621,5.91403 0.690915,5.91945 0.305181,6.305182 C-0.080553,6.690915 -0.085973,7.314622 0.293,7.707001 L5.293,12.707 Z M11,14 L1,14 C0.447715,14 0,14.447715 0,15 C0,15.5522852 0.447715,16 1,16 L11,16 C11.55228,16 12,15.5522852 12,15 C12,14.447715 11.55229,14 11,14 Z" id="Fill-1"></path>
+<svg width="12px" height="16px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <symbol id="icon" viewBox="0 0 12 16">
+    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(-770.000000, -481.000000)" fill="currentColor">
+            <g transform="translate(744.000000, 350.000000)">
+                <g transform="translate(26.000000, 131.000000)">
+                    <path d="M5.293,12.707 C5.6835,13.097382 6.316501,13.097383 6.707001,12.707 L11.707,7.707 C12.08597,7.31462 12.08054,6.69092 11.69481,6.305189 C11.30908,5.91946 10.68538,5.91403 10.293,6.293 L7,9.586 L7,1 C7,0.44772 6.552285,0 6,0 C5.447715,0 5,0.44772 5,1 L5,9.586 L1.707,6.293 C1.314621,5.91403 0.690915,5.91945 0.305181,6.305182 C-0.080553,6.690915 -0.085973,7.314622 0.293,7.707001 L5.293,12.707 Z M11,14 L1,14 C0.447715,14 0,14.447715 0,15 C0,15.5522852 0.447715,16 1,16 L11,16 C11.55228,16 12,15.5522852 12,15 C12,14.447715 11.55229,14 11,14 Z"></path>
                 </g>
             </g>
         </g>
     </g>
+    </symbol>
 </svg>

assets/icon.svg

@@ -0,0 +1,41 @@
+<svg  viewBox="0 0 65 64" height="64" width="65" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<defs>
+<linearGradient id="linear-gradient" x1="46.37" y1="59.71" x2="15.42" y2="6.11" gradientTransform="matrix(1, 0, 0, -1, 0, 64)" gradientUnits="userSpaceOnUse">
+<stop offset="0" stop-color="#ff980e"/>
+<stop offset="0.21" stop-color="#ff7139"/>
+<stop offset="0.36" stop-color="#ff5854"/>
+<stop offset="0.46" stop-color="#ff4f5e"/>
+<stop offset="0.69" stop-color="#ff3750"/>
+<stop offset="0.86" stop-color="#f92261"/>
+<stop offset="1" stop-color="#f5156c"/>
+</linearGradient>
+<linearGradient id="linear-gradient-2" x1="46.37" y1="59.71" x2="15.42" y2="6.11" gradientTransform="matrix(1, 0, 0, -1, 0, 64)" gradientUnits="userSpaceOnUse">
+<stop offset="0" stop-color="#fff44f" stop-opacity="0.8"/>
+<stop offset="0.09" stop-color="#fff44f" stop-opacity="0.7"/>
+<stop offset="0.75" stop-color="#fff44f" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="linear-gradient-3" x1="40.19" y1="26.08" x2="54.32" y2="50.55" gradientTransform="matrix(1, 0, 0, -1, 0, 64)" gradientUnits="userSpaceOnUse">
+<stop offset="0" stop-color="#3a8ee6"/>
+<stop offset="0.24" stop-color="#5c79f0"/>
+<stop offset="0.63" stop-color="#9059ff"/>
+<stop offset="1" stop-color="#c139e6"/>
+</linearGradient>
+<linearGradient id="linear-gradient-4" x1="54.32" y1="50.58" x2="48.39" y2="40.31" gradientTransform="matrix(1, 0, 0, -1, 0, 64)" gradientUnits="userSpaceOnUse">
+<stop offset="0" stop-color="#6e008b" stop-opacity="0.5"/>
+<stop offset="0.5" stop-color="#c846cb" stop-opacity="0"/>
+</linearGradient>
+<linearGradient id="linear-gradient-5" x1="56.96" y1="22.5" x2="41.98" y2="37.46" gradientTransform="matrix(1, 0, 0, -1, 0, 64)" gradientUnits="userSpaceOnUse">
+<stop offset="0.14" stop-color="#6a2bea" stop-opacity="0"/>
+<stop offset="0.34" stop-color="#642de4" stop-opacity="0.03"/>
+<stop offset="0.55" stop-color="#5131d3" stop-opacity="0.12"/>
+<stop offset="0.76" stop-color="#3139b7" stop-opacity="0.27"/>
+<stop offset="0.98" stop-color="#054490" stop-opacity="0.48"/>
+<stop offset="1" stop-color="#00458b" stop-opacity="0.5"/>
+</linearGradient>
+</defs>
+<path d="M32.56,0C14.61,0,0,14.33,0,31.94a3.42,3.42,0,0,0,3.42,3.42H29.14V52.3l-8-8a3.42,3.42,0,1,0-4.84,4.84L30.14,63a2.73,2.73,0,0,0,.25.23l.23.17h.05l.24.14.27.13.28.1.29.07L32,64h1.27l.29-.07.29-.1.27-.13.24-.14.24-.17L35,63,48.8,49.18A3.43,3.43,0,0,0,44,44.34l-8,8v-17H61.7a3.42,3.42,0,0,0,3.42-3.42h0C65.12,14.33,50.51,0,32.56,0ZM7.09,28.51A25.54,25.54,0,0,1,32.56,6.85,25.55,25.55,0,0,1,58,28.51Z"  fill="url(#linear-gradient)"/>
+<path d="M32.56,0C14.61,0,0,14.33,0,31.94a3.42,3.42,0,0,0,3.42,3.42H29.14V52.3l-8-8a3.42,3.42,0,1,0-4.84,4.84L30.14,63a2.73,2.73,0,0,0,.25.23l.23.17h.05l.24.14.27.13.28.1.29.07L32,64h1.27l.29-.07.29-.1.27-.13.24-.14.24-.17L35,63,48.8,49.18A3.43,3.43,0,0,0,44,44.34l-8,8v-17H61.7a3.42,3.42,0,0,0,3.42-3.42h0C65.12,14.33,50.51,0,32.56,0ZM7.09,28.51A25.54,25.54,0,0,1,32.56,6.85,25.55,25.55,0,0,1,58,28.51Z"  fill="url(#linear-gradient-2)"/>
+<path d="M36,7.08A25.45,25.45,0,0,1,58,28.51H42.85A6.85,6.85,0,0,0,36,35.36H61.7a3.43,3.43,0,0,0,3.42-3.43c0-12.2-8.63-18.13-16-21.59A35.75,35.75,0,0,0,36,7.08Z" fill="url(#linear-gradient-3)"/>
+<path d="M57.89,27.76c2.31,1.86,4.63,3.71,6.9,5.61a3.27,3.27,0,0,0,.33-1.44c0-12.2-8.63-18.13-16-21.59A35.75,35.75,0,0,0,36,7.08,25.47,25.47,0,0,1,57.89,27.76Z" fill="url(#linear-gradient-4)"/>
+<path d="M57.5,28.51H42.85A6.85,6.85,0,0,0,36,35.36H61.7a3.36,3.36,0,0,0,2.64-1.28C62.09,32.19,59.79,30.36,57.5,28.51Z" opacity=".9" fill="url(#linear-gradient-5)"/>
+</svg>

assets/logo.svg

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="201px" height="36px" viewBox="0 0 201 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 53 (72520) - https://sketchapp.com -->
-    <title>56F8E94A-92C7-41A4-BF32-064D0F1FE0CE</title>
-    <desc>Created with sketchtool.</desc>
-    <defs>
-        <linearGradient x1="71.1627137%" y1="8.3795633%" x2="23.6307692%" y2="89.0750207%" id="linearGradient-1">
-            <stop stop-color="#FF980E" offset="0%"></stop>
-            <stop stop-color="#FF7139" offset="20.75%"></stop>
-            <stop stop-color="#FF5854" offset="36.33%"></stop>
-            <stop stop-color="#FF4F5E" offset="45.63%"></stop>
-            <stop stop-color="#FF3750" offset="69.29%"></stop>
-            <stop stop-color="#F92261" offset="85.75%"></stop>
-            <stop stop-color="#F5156C" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="71.1627137%" y1="8.3795633%" x2="23.6307692%" y2="89.0750207%" id="linearGradient-2">
-            <stop stop-color="#FFF44F" stop-opacity="0.8" offset="0%"></stop>
-            <stop stop-color="#FFF44F" stop-opacity="0" offset="75%"></stop>
-        </linearGradient>
-        <linearGradient x1="14.3945107%" y1="105.534329%" x2="62.8615752%" y2="24.3294529%" id="linearGradient-3">
-            <stop stop-color="#3A8EE6" offset="0%"></stop>
-            <stop stop-color="#5C79F0" offset="23.59%"></stop>
-            <stop stop-color="#9059FF" offset="62.93%"></stop>
-            <stop stop-color="#C139E6" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="62.8713604%" y1="29.0228725%" x2="42.5369928%" y2="60.7429512%" id="linearGradient-4">
-            <stop stop-color="#6E008B" stop-opacity="0.5" offset="0%"></stop>
-            <stop stop-color="#C846CB" stop-opacity="0" offset="50%"></stop>
-        </linearGradient>
-        <linearGradient x1="73.7626536%" y1="58.1514822%" x2="20.9130221%" y2="45.4476366%" id="linearGradient-5">
-            <stop stop-color="#6A2BEA" stop-opacity="0" offset="13.6%"></stop>
-            <stop stop-color="#662CE6" stop-opacity="0.09459748" offset="29.95%"></stop>
-            <stop stop-color="#592FDB" stop-opacity="0.1926" offset="46.89%"></stop>
-            <stop stop-color="#4534C9" stop-opacity="0.2923" offset="64.1%"></stop>
-            <stop stop-color="#283BAF" stop-opacity="0.393" offset="81.5%"></stop>
-            <stop stop-color="#03448D" stop-opacity="0.4936" offset="98.9%"></stop>
-            <stop stop-color="#00458B" stop-opacity="0.5" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Send_Home-With-Files" transform="translate(-24.000000, -31.000000)">
-            <g id="Header" transform="translate(24.000000, 24.000000)">
-                <g id="Send" transform="translate(0.000000, 7.000000)">
-                    <g id="FF_Send_Logo">
-                        <g id="Group">
-                            <g>
-                                <path d="M18.4801773,0.309677419 C8.4846097,0.309677419 0.34868259,8.28387097 0.34868259,18.0774194 C0.34868259,19.1225806 1.20101781,19.9741935 2.24706558,19.9741935 L16.5817943,19.9741935 L16.5817943,25.1612903 L16.5817943,25.1612903 L16.5817943,29.4193548 L12.1264056,25.0064516 C11.390298,24.2709677 10.1892801,24.2709677 9.41442994,25.0064516 C8.67832225,25.7419355 8.67832225,26.9419355 9.41442994,27.716129 L17.1241894,35.4193548 C17.162932,35.4580645 17.2016745,35.4967742 17.2791595,35.5354839 C17.2791595,35.5354839 17.2791595,35.5354839 17.317902,35.5354839 C17.3566445,35.5741935 17.395387,35.6129032 17.4341295,35.6129032 C17.4341295,35.6129032 17.4341295,35.6129032 17.472872,35.6129032 C17.5116145,35.6516129 17.5503571,35.6516129 17.5890996,35.6903226 C17.5890996,35.6903226 17.5890996,35.6903226 17.6278421,35.6903226 C17.6665846,35.7290323 17.7440696,35.7290323 17.7828121,35.7677419 C17.7828121,35.7677419 17.7828121,35.7677419 17.7828121,35.7677419 C17.8215546,35.8064516 17.8990396,35.8064516 17.9377822,35.8064516 C17.9377822,35.8064516 17.9377822,35.8064516 17.9377822,35.8064516 C17.9765247,35.8064516 18.0540097,35.8451613 18.0927522,35.8451613 C18.0927522,35.8451613 18.1314947,35.8451613 18.1314947,35.8451613 C18.1702372,35.8451613 18.2089797,35.8451613 18.2864647,35.883871 C18.3639498,35.883871 18.4026923,35.883871 18.4801773,35.883871 C18.5576623,35.883871 18.5964048,35.883871 18.6738898,35.883871 C18.7126324,35.883871 18.7513749,35.883871 18.8288599,35.8451613 C18.8288599,35.8451613 18.8676024,35.8451613 18.8676024,35.8451613 C18.9063449,35.8451613 18.9838299,35.8064516 19.0225724,35.8064516 C19.0225724,35.8064516 19.0225724,35.8064516 19.0225724,35.8064516 C19.0613149,35.8064516 19.1388,35.7677419 19.1775425,35.7290323 C19.1775425,35.7290323 19.1775425,35.7290323 19.1775425,35.7290323 C19.216285,35.6903226 19.29377,35.6903226 19.3325125,35.6516129 C19.3325125,35.6516129 19.3325125,35.6516129 19.3325125,35.6516129 C19.371255,35.6129032 19.4099975,35.6129032 19.44874,35.5741935 C19.44874,35.5741935 19.44874,35.5741935 19.4874826,35.5741935 C19.5262251,35.5354839 19.5649676,35.4967742 19.6037101,35.4967742 C19.6037101,35.4967742 19.6037101,35.4967742 19.6424526,35.4967742 C19.6811951,35.4580645 19.7199376,35.4193548 19.7974226,35.3806452 L27.5071821,27.6774194 C28.2432898,26.9419355 28.2432898,25.7419355 27.5071821,24.9677419 C26.7710744,24.2322581 25.5700566,24.2322581 24.7952064,24.9677419 L20.3785603,29.4193548 L20.3785603,20.0129032 L34.713289,20.0129032 C35.7593368,20.0129032 36.611672,19.1612903 36.611672,18.116129 C36.611672,8.28387097 28.4757449,0.309677419 18.4801773,0.309677419 Z M4.26167611,16.1806452 C5.23023886,9.40645161 11.2353279,4.14193548 18.4801773,4.14193548 C25.7250267,4.14193548 31.6913732,9.40645161 32.659936,16.1806452 L4.26167611,16.1806452 Z" id="Shape" fill="url(#linearGradient-1)" fill-rule="nonzero"></path>
-                                <path d="M18.4801773,0.309677419 C8.4846097,0.309677419 0.34868259,8.28387097 0.34868259,18.0774194 C0.34868259,19.1225806 1.20101781,19.9741935 2.24706558,19.9741935 L16.5817943,19.9741935 L16.5817943,25.1612903 L16.5817943,25.1612903 L16.5817943,29.4193548 L12.1264056,25.0064516 C11.390298,24.2709677 10.1892801,24.2709677 9.41442994,25.0064516 C8.67832225,25.7419355 8.67832225,26.9419355 9.41442994,27.716129 L17.1241894,35.4193548 C17.162932,35.4580645 17.2016745,35.4967742 17.2791595,35.5354839 C17.2791595,35.5354839 17.2791595,35.5354839 17.317902,35.5354839 C17.3566445,35.5741935 17.395387,35.6129032 17.4341295,35.6129032 C17.4341295,35.6129032 17.4341295,35.6129032 17.472872,35.6129032 C17.5116145,35.6516129 17.5503571,35.6516129 17.5890996,35.6903226 C17.5890996,35.6903226 17.5890996,35.6903226 17.6278421,35.6903226 C17.6665846,35.7290323 17.7440696,35.7290323 17.7828121,35.7677419 C17.7828121,35.7677419 17.7828121,35.7677419 17.7828121,35.7677419 C17.8215546,35.8064516 17.8990396,35.8064516 17.9377822,35.8064516 C17.9377822,35.8064516 17.9377822,35.8064516 17.9377822,35.8064516 C17.9765247,35.8064516 18.0540097,35.8451613 18.0927522,35.8451613 C18.0927522,35.8451613 18.1314947,35.8451613 18.1314947,35.8451613 C18.1702372,35.8451613 18.2089797,35.8451613 18.2864647,35.883871 C18.3639498,35.883871 18.4026923,35.883871 18.4801773,35.883871 C18.5576623,35.883871 18.5964048,35.883871 18.6738898,35.883871 C18.7126324,35.883871 18.7513749,35.883871 18.8288599,35.8451613 C18.8288599,35.8451613 18.8676024,35.8451613 18.8676024,35.8451613 C18.9063449,35.8451613 18.9838299,35.8064516 19.0225724,35.8064516 C19.0225724,35.8064516 19.0225724,35.8064516 19.0225724,35.8064516 C19.0613149,35.8064516 19.1388,35.7677419 19.1775425,35.7290323 C19.1775425,35.7290323 19.1775425,35.7290323 19.1775425,35.7290323 C19.216285,35.6903226 19.29377,35.6903226 19.3325125,35.6516129 C19.3325125,35.6516129 19.3325125,35.6516129 19.3325125,35.6516129 C19.371255,35.6129032 19.4099975,35.6129032 19.44874,35.5741935 C19.44874,35.5741935 19.44874,35.5741935 19.4874826,35.5741935 C19.5262251,35.5354839 19.5649676,35.4967742 19.6037101,35.4967742 C19.6037101,35.4967742 19.6037101,35.4967742 19.6424526,35.4967742 C19.6811951,35.4580645 19.7199376,35.4193548 19.7974226,35.3806452 L27.5071821,27.6774194 C28.2432898,26.9419355 28.2432898,25.7419355 27.5071821,24.9677419 C26.7710744,24.2322581 25.5700566,24.2322581 24.7952064,24.9677419 L20.3785603,29.4193548 L20.3785603,20.0129032 L34.713289,20.0129032 C35.7593368,20.0129032 36.611672,19.1612903 36.611672,18.116129 C36.611672,8.28387097 28.4757449,0.309677419 18.4801773,0.309677419 Z M4.26167611,16.1806452 C5.23023886,9.40645161 11.2353279,4.14193548 18.4801773,4.14193548 C25.7250267,4.14193548 31.6913732,9.40645161 32.659936,16.1806452 L4.26167611,16.1806452 Z" id="Shape" fill="url(#linearGradient-2)" fill-rule="nonzero"></path>
-                                <path d="M20.3785603,4.25806452 C26.7323319,5.10967742 31.7688582,9.98709677 32.659936,16.1806452 L24.2140688,16.1806452 C22.1219732,16.1806452 20.4173028,17.883871 20.4173028,19.9741935 L20.4173028,19.9741935 L34.713289,19.9741935 C35.7593368,19.9741935 36.611672,19.1225806 36.611672,18.0774194 C36.611672,11.3032258 31.8076008,7.97419355 27.7396372,6.07741935 C23.9816137,4.33548387 20.3785603,4.25806452 20.3785603,4.25806452 Z" id="Path" fill="url(#linearGradient-3)"></path>
-                                <path d="M32.582451,15.7548387 C33.8609538,16.8 35.1781991,17.8064516 36.4179595,18.8903226 C36.534187,18.6580645 36.611672,18.3870968 36.611672,18.0774194 C36.611672,11.3032258 31.8076008,7.97419355 27.7396372,6.07741935 C23.9816137,4.33548387 20.3785603,4.25806452 20.3785603,4.25806452 C26.5773619,5.07096774 31.5364032,9.79354839 32.582451,15.7548387 Z" id="Path" fill="url(#linearGradient-4)"></path>
-                            </g>
-                            <path d="M32.3499959,16.1806452 L24.2140688,16.1806452 C22.1219732,16.1806452 20.4173028,17.883871 20.4173028,19.9741935 L34.713289,19.9741935 C35.2944267,19.9741935 35.8368218,19.7032258 36.1855044,19.2774194 C34.9070016,18.2322581 33.6284987,17.2258065 32.3499959,16.1806452 Z" id="Path" fill="url(#linearGradient-5)" opacity="0.9"></path>
-                        </g>
-                        <g id="Group" transform="translate(50.365263, 8.129032)" fill="#220033">
-                            <polygon id="Path" points="0.30994008 1.74193548 11.6614955 1.74193548 11.6614955 4.99354839 3.71928097 4.99354839 3.71928097 9.09677419 11.6614955 9.09677419 11.6614955 12.2709677 3.71928097 12.2709677 3.71928097 19.3935484 0.27119757 19.3935484 0.27119757 1.74193548"></polygon>
-                            <path d="M13.7535911,2.67096774 C13.7535911,2.0516129 13.9473036,1.50967742 14.3734712,1.12258065 C14.7608963,0.696774194 15.3032915,0.503225806 15.8844291,0.503225806 C16.5430518,0.503225806 17.0467044,0.696774194 17.4341295,1.12258065 C17.8215546,1.5483871 18.0152672,2.0516129 18.0152672,2.67096774 C18.0152672,3.29032258 17.8215546,3.79354839 17.4341295,4.18064516 C17.0467044,4.56774194 16.5043093,4.8 15.8844291,4.8 C15.264549,4.8 14.7608963,4.60645161 14.3347287,4.18064516 C13.9473036,3.79354839 13.7535911,3.2516129 13.7535911,2.67096774 Z M14.1797587,6.3483871 L17.5890996,6.3483871 L17.5890996,19.3935484 L14.1797587,19.3935484 L14.1797587,6.3483871 Z" id="Shape" fill-rule="nonzero"></path>
-                            <path d="M20.2623328,6.3483871 L23.5554461,6.3483871 L23.5554461,8.36129032 C23.8653862,7.58709677 24.3302963,7.00645161 24.988919,6.65806452 C25.6087991,6.30967742 26.3449068,6.11612903 27.1584995,6.11612903 C27.5846672,6.11612903 28.0108348,6.15483871 28.3982599,6.27096774 C28.785685,6.3483871 29.0956251,6.50322581 29.3668226,6.61935484 L28.1658048,9.90967742 C27.9720923,9.79354839 27.7396372,9.67741935 27.4296971,9.6 C27.119757,9.52258065 26.7710744,9.48387097 26.4223919,9.48387097 C25.5700566,9.48387097 24.8726915,9.71612903 24.3690388,10.1806452 C23.8653862,10.6451613 23.5941886,11.4580645 23.5941886,12.5419355 L23.5941886,19.4322581 L20.2623328,19.4322581 L20.2623328,6.3483871 L20.2623328,6.3483871 Z" id="Path"></path>
-                            <path d="M36.4954445,19.6645161 C35.4493967,19.6645161 34.4808339,19.5096774 33.6284987,19.1612903 C32.7761635,18.8129032 32.0400558,18.3483871 31.4589182,17.7290323 C30.839038,17.1096774 30.3741279,16.4129032 30.0641878,15.5612903 C29.7542477,14.7483871 29.5992777,13.8580645 29.5992777,12.8903226 C29.5992777,11.9225806 29.7542477,11.0322581 30.1029303,10.2193548 C30.4516129,9.40645161 30.916523,8.67096774 31.5364032,8.0516129 C32.1562833,7.43225806 32.892391,6.96774194 33.7059837,6.61935484 C34.558319,6.27096774 35.4493967,6.07741935 36.4179595,6.07741935 C37.3865222,6.07741935 38.3163424,6.23225806 39.1299352,6.58064516 C39.9435279,6.92903226 40.6796356,7.39354839 41.2607732,7.97419355 C41.8419109,8.55483871 42.306821,9.2516129 42.6555036,10.1032258 C43.0041862,10.916129 43.1591562,11.8064516 43.1591562,12.7741935 L43.1591562,14.0129032 L32.7761635,14.0129032 C33.0086186,14.8645161 33.4347862,15.5225806 34.0934088,16.0258065 C34.7520315,16.5290323 35.5656242,16.7612903 36.534187,16.7612903 C37.3090372,16.7612903 37.9676599,16.6064516 38.510055,16.2967742 C39.0524501,15.9870968 39.4786177,15.5612903 39.7885578,15.0193548 L42.539276,16.6064516 C41.8806534,17.5354839 41.0670607,18.2709677 40.1372404,18.8129032 C39.1299352,19.3548387 37.9289173,19.6645161 36.4954445,19.6645161 Z M36.4179595,8.90322581 C35.5656242,8.90322581 34.8295165,9.13548387 34.2096364,9.56129032 C33.5897562,10.0258065 33.1635886,10.6064516 32.892391,11.3806452 L39.8660428,11.3806452 C39.6335878,10.5677419 39.2461627,9.9483871 38.6262825,9.52258065 C38.0064024,9.09677419 37.2702947,8.90322581 36.4179595,8.90322581 Z" id="Shape" fill-rule="nonzero"></path>
-                            <path d="M44.127719,6.3483871 L46.2972995,6.3483871 L46.2972995,5.88387097 C46.2972995,4.83870968 46.3747845,3.9483871 46.5684971,3.21290323 C46.7622096,2.51612903 47.0721497,1.93548387 47.4983173,1.50967742 C47.9244849,1.08387097 48.5056226,0.774193548 49.2029878,0.619354839 C49.9390955,0.425806452 50.8301732,0.348387097 51.876221,0.348387097 L52.7285562,0.348387097 L52.7285562,3.40645161 L52.186161,3.40645161 C51.6050234,3.40645161 51.1401133,3.44516129 50.7914307,3.48387097 C50.4427481,3.52258065 50.1715505,3.63870968 50.0165805,3.83225806 C49.8228679,3.98709677 49.7066404,4.21935484 49.6678979,4.52903226 C49.6291554,4.83870968 49.5904129,5.22580645 49.5904129,5.72903226 L49.5904129,6.3483871 L52.7285562,6.3483871 L52.7285562,9.32903226 L49.5904129,9.32903226 L49.5904129,19.3935484 L46.258557,19.3935484 L46.258557,9.32903226 L44.0889764,9.32903226 L44.0889764,6.3483871 L44.127719,6.3483871 Z" id="Path"></path>
-                            <path d="M60.3995732,19.6645161 C59.4310104,19.6645161 58.5011902,19.4709677 57.648855,19.1225806 C56.7965197,18.7741935 56.0991546,18.2709677 55.4792744,17.6516129 C54.8593942,17.0322581 54.3557416,16.2967742 54.0458015,15.483871 C53.6971189,14.6709677 53.5421489,13.7806452 53.5421489,12.8516129 C53.5421489,11.9225806 53.6971189,11.0322581 54.0458015,10.2193548 C54.3944841,9.40645161 54.8593942,8.67096774 55.4792744,8.0516129 C56.0991546,7.43225806 56.8352623,6.96774194 57.648855,6.61935484 C58.5011902,6.27096774 59.3922679,6.07741935 60.3995732,6.07741935 C61.3681359,6.07741935 62.2592137,6.27096774 63.1115489,6.61935484 C63.9638841,6.96774194 64.6999918,7.47096774 65.319872,8.0516129 C65.9397521,8.67096774 66.4434047,9.36774194 66.7920873,10.2193548 C67.1407699,11.0322581 67.3344825,11.9225806 67.3344825,12.8516129 C67.3344825,13.7806452 67.1407699,14.6709677 66.7920873,15.483871 C66.4434047,16.2967742 65.9397521,17.0322581 65.3586145,17.6516129 C64.7387343,18.2709677 64.0026266,18.7741935 63.1890339,19.1225806 C62.2979562,19.4709677 61.4068784,19.6645161 60.3995732,19.6645161 Z M60.4383157,16.4903226 C60.9419683,16.4903226 61.4068784,16.4129032 61.833046,16.2193548 C62.2592137,16.0258065 62.6466388,15.7548387 62.9565788,15.4451613 C63.2665189,15.1354839 63.5377165,14.7483871 63.731429,14.283871 C63.9251416,13.8580645 64.0026266,13.3548387 64.0026266,12.8516129 C64.0026266,12.3483871 63.9251416,11.883871 63.731429,11.4193548 C63.5377165,10.9548387 63.3052614,10.5677419 62.9565788,10.2580645 C62.6466388,9.9483871 62.2592137,9.67741935 61.833046,9.48387097 C61.4068784,9.29032258 60.9419683,9.21290323 60.4383157,9.21290323 C59.9346631,9.21290323 59.4697529,9.29032258 59.0435853,9.48387097 C58.6174177,9.67741935 58.2299926,9.9483871 57.9200525,10.2580645 C57.6101125,10.5677419 57.3389149,10.9548387 57.1452023,11.4193548 C56.9514898,11.883871 56.8740048,12.3483871 56.8740048,12.8516129 C56.8740048,13.3548387 56.9514898,13.8580645 57.1452023,14.283871 C57.3389149,14.7096774 57.5713699,15.0967742 57.9200525,15.4451613 C58.2299926,15.7548387 58.6174177,16.0258065 59.0435853,16.2193548 C59.4697529,16.3741935 59.9346631,16.4903226 60.4383157,16.4903226 Z" id="Shape" fill-rule="nonzero"></path>
-                            <polygon id="Path" points="72.3322663 12.6967742 67.7219076 6.3483871 71.6736436 6.3483871 74.4243618 10.2193548 77.17508 6.3483871 81.0880735 6.3483871 76.4389723 12.7354839 81.4367561 19.3935484 77.4075351 19.3935484 74.3856193 15.2903226 71.4411885 19.3935484 67.4119675 19.3935484"></polygon>
-                            <g transform="translate(89.107773, 0.000000)">
-                                <path d="M7.78724452,19.6258065 C6.00508906,19.6258065 4.49413117,19.2774194 3.25437084,18.6193548 C2.01461052,17.9612903 1.00730526,17.0709677 0.15497004,15.9483871 L1.89838299,14.5548387 C3.25437084,16.683871 5.19149635,17.7290323 7.7097595,17.7290323 C9.06574735,17.7290323 10.1117951,17.4193548 10.8479028,16.8 C11.545268,16.1806452 11.8939506,15.3677419 11.8939506,14.4 C11.8939506,13.8193548 11.7389805,13.3548387 11.467783,12.9677419 C11.1965854,12.5806452 10.8091603,12.3096774 10.3055077,12.0387097 C9.84059755,11.8064516 9.29820241,11.6129032 8.67832225,11.4580645 C8.05844209,11.3032258 7.39981942,11.1870968 6.74119675,11.0322581 C6.04383157,10.8774194 5.3852089,10.7225806 4.68784372,10.5290323 C4.02922105,10.3354839 3.40934088,10.0645161 2.90568825,9.75483871 C2.40203562,9.44516129 1.9371255,8.98064516 1.62718542,8.43870968 C1.27850283,7.89677419 1.12353279,7.2 1.12353279,6.3483871 C1.12353279,5.69032258 1.27850283,5.03225806 1.5497004,4.4516129 C1.82089797,3.87096774 2.24706558,3.32903226 2.75071821,2.90322581 C3.29311335,2.47741935 3.91299352,2.12903226 4.6103587,1.85806452 C5.34646639,1.58709677 6.1600591,1.47096774 7.05113683,1.47096774 C8.60083723,1.47096774 9.87934006,1.74193548 10.9253878,2.32258065 C11.9714356,2.90322581 12.9012558,3.63870968 13.676106,4.60645161 L12.0489206,5.88387097 C11.5065255,5.07096774 10.8479028,4.4516129 10.0730526,3.98709677 C9.29820241,3.52258065 8.29089715,3.29032258 7.08987934,3.29032258 C5.73389149,3.29032258 4.76532874,3.56129032 4.14544858,4.14193548 C3.52556842,4.72258065 3.21562833,5.41935484 3.21562833,6.30967742 C3.21562833,6.8516129 3.33185586,7.27741935 3.56431093,7.58709677 C3.79676599,7.93548387 4.14544858,8.20645161 4.57161619,8.4 C4.9977838,8.59354839 5.50143643,8.78709677 6.04383157,8.90322581 C6.62496922,9.01935484 7.20610687,9.17419355 7.86472954,9.32903226 C8.56209472,9.48387097 9.2594599,9.63870968 9.99556759,9.83225806 C10.7316753,10.0258065 11.390298,10.2967742 11.9714356,10.683871 C12.5525733,11.0322581 13.0562259,11.5354839 13.4049085,12.116129 C13.7923336,12.6967742 13.9860461,13.4322581 13.9860461,14.3612903 C13.9860461,15.0580645 13.8310761,15.716129 13.5598785,16.3354839 C13.2886809,16.9548387 12.8625133,17.5354839 12.3201182,18 C11.7777231,18.4645161 11.1578429,18.8516129 10.3829927,19.1612903 C9.60814249,19.4709677 8.75580727,19.6258065 7.78724452,19.6258065 Z" id="Path"></path>
-                                <path d="M23.4779611,19.6645161 C22.4319133,19.6645161 21.5020931,19.5096774 20.6497579,19.1612903 C19.7974226,18.8129032 19.0613149,18.3483871 18.4801773,17.7290323 C17.8602971,17.1096774 17.395387,16.4129032 17.0854469,15.6 C16.7755069,14.7870968 16.6205368,13.8967742 16.6205368,12.9290323 C16.6205368,11.9612903 16.7755069,11.0709677 17.1241894,10.2193548 C17.472872,9.40645161 17.9377822,8.67096774 18.5576623,8.0516129 C19.1775425,7.43225806 19.8749077,6.96774194 20.7272429,6.61935484 C21.5408356,6.27096774 22.4706558,6.07741935 23.4392186,6.07741935 C24.4077813,6.07741935 25.2601166,6.23225806 26.0737093,6.58064516 C26.887302,6.92903226 27.5846672,7.35483871 28.1658048,7.97419355 C28.7469425,8.55483871 29.2118526,9.2516129 29.5605352,10.0645161 C29.9092178,10.8774194 30.0641878,11.7677419 30.0641878,12.7354839 L30.0641878,13.6258065 L18.5189198,13.6258065 C18.5964048,14.2451613 18.7513749,14.8258065 19.0225724,15.3290323 C19.29377,15.8322581 19.6424526,16.2967742 20.0686202,16.683871 C20.4947878,17.0709677 20.9984404,17.3419355 21.5795781,17.5741935 C22.1607158,17.7677419 22.7805959,17.883871 23.4779611,17.883871 C24.5240089,17.883871 25.4150866,17.6516129 26.1124518,17.2258065 C26.809817,16.8 27.3909546,16.1806452 27.8558647,15.3677419 L29.5605352,16.3741935 C28.9019125,17.4193548 28.0495773,18.2322581 27.0810145,18.8129032 C26.1124518,19.3935484 24.9501765,19.6645161 23.4779611,19.6645161 Z M23.4392186,7.81935484 C22.8193384,7.81935484 22.2382008,7.93548387 21.6958056,8.12903226 C21.1534105,8.32258065 20.6885004,8.59354839 20.2623328,8.98064516 C19.8361651,9.32903226 19.4874826,9.75483871 19.216285,10.2580645 C18.9450874,10.7612903 18.7513749,11.3032258 18.6351473,11.883871 L28.0883198,11.883871 C27.9333497,10.6451613 27.4296971,9.67741935 26.6161044,8.94193548 C25.7637692,8.20645161 24.6789789,7.81935484 23.4392186,7.81935484 Z" id="Shape" fill-rule="nonzero"></path>
-                                <path d="M33.0473611,6.3483871 L34.9844866,6.3483871 L34.9844866,8.51612903 C35.4493967,7.78064516 36.0692769,7.2 36.8441271,6.73548387 C37.6189773,6.27096774 38.510055,6.07741935 39.5561028,6.07741935 C40.408438,6.07741935 41.1832882,6.19354839 41.8806534,6.46451613 C42.5780186,6.73548387 43.1591562,7.12258065 43.6240663,7.62580645 C44.0889764,8.12903226 44.4764015,8.7483871 44.7475991,9.48387097 C45.0187967,10.2193548 45.1350242,11.0322581 45.1350242,11.9612903 L45.1350242,19.3935484 L43.1204137,19.3935484 L43.1204137,12.0387097 C43.1204137,10.7612903 42.7717311,9.75483871 42.1131084,8.98064516 C41.4544858,8.20645161 40.4471805,7.85806452 39.1686777,7.85806452 C38.58754,7.85806452 38.0451449,7.97419355 37.5414922,8.16774194 C37.0378396,8.36129032 36.611672,8.67096774 36.2242469,9.05806452 C35.8368218,9.44516129 35.5656242,9.87096774 35.3719117,10.4129032 C35.1781991,10.9548387 35.0619716,11.4967742 35.0619716,12.1548387 L35.0619716,19.3935484 L33.0861036,19.3935484 L33.0861036,6.3483871 L33.0473611,6.3483871 Z" id="Path"></path>
-                                <path d="M54.5881967,19.6645161 C53.6583764,19.6645161 52.8060412,19.5096774 51.9924485,19.1612903 C51.1788558,18.8129032 50.4814906,18.3483871 49.8616104,17.7677419 C49.2804728,17.1483871 48.7768202,16.4516129 48.4281376,15.6 C48.079455,14.7870968 47.9244849,13.8580645 47.9244849,12.8516129 C47.9244849,11.8451613 48.079455,10.9548387 48.4281376,10.1032258 C48.7768202,9.29032258 49.2417303,8.55483871 49.8616104,7.93548387 C50.4814906,7.31612903 51.1788558,6.8516129 51.9924485,6.54193548 C52.8060412,6.19354839 53.6583764,6.03870968 54.5881967,6.03870968 C55.0531068,6.03870968 55.5180169,6.07741935 56.0216695,6.19354839 C56.4865797,6.30967742 56.9514898,6.46451613 57.3776574,6.69677419 C57.803825,6.92903226 58.1912501,7.16129032 58.5786752,7.50967742 C58.9273578,7.81935484 59.2372979,8.16774194 59.5084954,8.59354839 L59.5084954,0.309677419 L61.4843635,0.309677419 L61.4843635,19.3548387 L59.5084954,19.3548387 L59.5084954,17.0322581 C59.2372979,17.4193548 58.9273578,17.8064516 58.5786752,18.116129 C58.2299926,18.4258065 57.803825,18.6967742 57.3776574,18.9290323 C56.9514898,19.1612903 56.4865797,19.316129 56.0216695,19.4322581 C55.5180169,19.5870968 55.0531068,19.6645161 54.5881967,19.6645161 Z M54.7431667,17.7677419 C55.4405319,17.7677419 56.0991546,17.6516129 56.6802922,17.3806452 C57.2614299,17.1096774 57.803825,16.7612903 58.2299926,16.3354839 C58.6561602,15.9096774 59.0048428,15.3677419 59.2372979,14.7483871 C59.4697529,14.1290323 59.5859805,13.5096774 59.5859805,12.8129032 C59.5859805,12.1548387 59.4697529,11.4967742 59.2372979,10.8774194 C59.0048428,10.2580645 58.6561602,9.75483871 58.2299926,9.29032258 C57.803825,8.86451613 57.2614299,8.47741935 56.6802922,8.24516129 C56.0991546,7.97419355 55.4405319,7.85806452 54.7431667,7.85806452 C54.084544,7.85806452 53.4259214,7.97419355 52.8447837,8.24516129 C52.2636461,8.51612903 51.7599934,8.86451613 51.2950833,9.29032258 C50.8689157,9.71612903 50.5202331,10.2580645 50.2877781,10.8774194 C50.055323,11.4967742 49.9390955,12.116129 49.9390955,12.8129032 C49.9390955,13.5096774 50.055323,14.1677419 50.2877781,14.7870968 C50.5202331,15.4064516 50.8689157,15.9096774 51.2950833,16.3741935 C51.7212509,16.8 52.2249036,17.1483871 52.8447837,17.4193548 C53.4646639,17.6516129 54.084544,17.7677419 54.7431667,17.7677419 Z" id="Shape" fill-rule="nonzero"></path>
-                            </g>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>

assets/master-logo.svg

@@ -0,0 +1,99 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 80 80">
+  <defs>
+    <radialGradient id="a" cx="-1186.91" cy="-517.676" r="90.78" gradientTransform="translate(1258.441 534.061)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fff36e"/>
+      <stop offset=".5" stop-color="#fc4055"/>
+      <stop offset="1" stop-color="#e31587"/>
+    </radialGradient>
+    <radialGradient id="b" cx="-1251.812" cy="-513.921" r="53.726" gradientTransform="translate(1258.441 534.061)" gradientUnits="userSpaceOnUse">
+      <stop offset=".001" stop-color="#c60084"/>
+      <stop offset="1" stop-color="#fc4055" stop-opacity="0"/>
+    </radialGradient>
+    <radialGradient id="c" cx="-1179.15" cy="-522.842" r="106.599" gradientTransform="translate(1258.441 534.061)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ffde67" stop-opacity=".6"/>
+      <stop offset=".093" stop-color="#ffd966" stop-opacity=".581"/>
+      <stop offset=".203" stop-color="#ffca65" stop-opacity=".525"/>
+      <stop offset=".321" stop-color="#feb262" stop-opacity=".432"/>
+      <stop offset=".446" stop-color="#fe8f5e" stop-opacity=".302"/>
+      <stop offset=".573" stop-color="#fd6459" stop-opacity=".137"/>
+      <stop offset=".664" stop-color="#fc4055" stop-opacity="0"/>
+    </radialGradient>
+    <radialGradient id="d" cx="42.285" cy="44.499" r="137.521" gradientTransform="translate(0 -.095)" gradientUnits="userSpaceOnUse">
+      <stop offset=".153" stop-color="#810220"/>
+      <stop offset=".167" stop-color="#920b27" stop-opacity=".861"/>
+      <stop offset=".216" stop-color="#cb2740" stop-opacity=".398"/>
+      <stop offset=".253" stop-color="#ef394f" stop-opacity=".11"/>
+      <stop offset=".272" stop-color="#fc4055" stop-opacity="0"/>
+    </radialGradient>
+    <radialGradient id="e" cx="31.878" cy="42.77" r="137.521" gradientTransform="translate(0 -.095)" gradientUnits="userSpaceOnUse">
+      <stop offset=".113" stop-color="#810220"/>
+      <stop offset=".133" stop-color="#920b27" stop-opacity=".861"/>
+      <stop offset=".204" stop-color="#cb2740" stop-opacity=".398"/>
+      <stop offset=".257" stop-color="#ef394f" stop-opacity=".11"/>
+      <stop offset=".284" stop-color="#fc4055" stop-opacity="0"/>
+    </radialGradient>
+    <linearGradient id="f" x1="-1212.61" y1="-525.103" x2="-1189.052" y2="-484.299" gradientTransform="translate(1258.441 532.89)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ffbd4f"/>
+      <stop offset=".508" stop-color="#ff9640" stop-opacity="0"/>
+    </linearGradient>
+    <radialGradient id="g" cx="-1255.933" cy="-77.395" r="88.863" gradientTransform="matrix(.959 0 0 .961 1273.896 86.468)" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#ff9640"/>
+      <stop offset=".8" stop-color="#fc4055"/>
+    </radialGradient>
+    <radialGradient id="h" cx="-1255.933" cy="-77.395" r="88.863" gradientTransform="matrix(.959 0 0 .961 1273.896 86.468)" gradientUnits="userSpaceOnUse">
+      <stop offset=".084" stop-color="#ffde67"/>
+      <stop offset=".147" stop-color="#ffdc66" stop-opacity=".968"/>
+      <stop offset=".246" stop-color="#ffd562" stop-opacity=".879"/>
+      <stop offset=".369" stop-color="#ffcb5d" stop-opacity=".734"/>
+      <stop offset=".511" stop-color="#ffbc55" stop-opacity=".533"/>
+      <stop offset=".667" stop-color="#ffaa4b" stop-opacity=".28"/>
+      <stop offset=".822" stop-color="#ff9640" stop-opacity="0"/>
+    </radialGradient>
+    <radialGradient id="i" cx="49.941" cy="38.654" r="41.79" gradientTransform="matrix(.247 .971 -1.011 .259 76.681 -19.851)" gradientUnits="userSpaceOnUse">
+      <stop offset=".363" stop-color="#fc4055"/>
+      <stop offset=".443" stop-color="#fd604d" stop-opacity=".633"/>
+      <stop offset=".545" stop-color="#fe8644" stop-opacity=".181"/>
+      <stop offset=".59" stop-color="#ff9640" stop-opacity="0"/>
+    </radialGradient>
+    <radialGradient id="j" cx="42.737" cy="42.193" r="41.79" gradientTransform="translate(0 -.095)" gradientUnits="userSpaceOnUse">
+      <stop offset=".216" stop-color="#fc4055" stop-opacity=".8"/>
+      <stop offset=".267" stop-color="#fd5251" stop-opacity=".633"/>
+      <stop offset=".41" stop-color="#fe8345" stop-opacity=".181"/>
+      <stop offset=".474" stop-color="#ff9640" stop-opacity="0"/>
+    </radialGradient>
+    <radialGradient id="k" cx="-1238.198" cy="-87.433" r="150.195" gradientTransform="matrix(.959 0 0 .961 1273.896 86.468)" gradientUnits="userSpaceOnUse">
+      <stop offset=".054" stop-color="#fff36e"/>
+      <stop offset=".457" stop-color="#ff9640"/>
+      <stop offset=".639" stop-color="#ff9640"/>
+    </radialGradient>
+    <linearGradient id="l" x1="59.052" y1="7.083" x2="18.155" y2="77.92" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fff36e" stop-opacity=".8"/>
+      <stop offset=".094" stop-color="#fff36e" stop-opacity=".699"/>
+      <stop offset=".752" stop-color="#fff36e" stop-opacity="0"/>
+    </linearGradient>
+    <linearGradient id="m" x1="40.585" y1="-.67" x2="62.3" y2="62.203" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#b833e1"/>
+      <stop offset=".371" stop-color="#9059ff"/>
+      <stop offset=".614" stop-color="#5b6df8"/>
+      <stop offset="1" stop-color="#0090ed"/>
+    </linearGradient>
+    <linearGradient id="n" x1="-1230.731" y1="-532.566" x2="-1190.37" y2="-492.205" gradientTransform="translate(1258.441 532.89)" gradientUnits="userSpaceOnUse">
+      <stop offset=".805" stop-color="#722291" stop-opacity="0"/>
+      <stop offset="1" stop-color="#592acb" stop-opacity=".5"/>
+    </linearGradient>
+  </defs>
+  <path d="M71.944 15.7A39.47 39.47 0 0 0 41.588.009C32.3-.177 25.884 2.614 22.254 4.858 27.111 2.041 34.14.443 40.294.522c15.83.2 32.832 10.981 35.357 30.413 2.9 22.306-12.637 40.923-34.493 40.98-24.045.061-38.67-21.229-34.847-40.352a19.735 19.735 0 0 1 .413-2.787 37.815 37.815 0 0 1 4.193-14.018c-2.769 1.433-6.295 5.965-8.035 10.163A41.355 41.355 0 0 0 .284 45.1c.06.518.114 1.035.182 1.549A40.062 40.062 0 1 0 71.944 15.7zm-63.4 3.487z" fill="url(#a)"/>
+  <path d="M71.944 15.7A39.47 39.47 0 0 0 41.588.009C32.3-.177 25.884 2.614 22.254 4.858 27.111 2.041 34.14.443 40.294.522c15.83.2 32.832 10.981 35.357 30.413 2.9 22.306-12.637 40.923-34.493 40.98-24.045.061-38.67-21.229-34.847-40.352a19.735 19.735 0 0 1 .413-2.787 37.815 37.815 0 0 1 4.193-14.018c-2.769 1.433-6.295 5.965-8.035 10.163A41.355 41.355 0 0 0 .284 45.1c.06.518.114 1.035.182 1.549A40.062 40.062 0 1 0 71.944 15.7zm-63.4 3.487z" fill="url(#b)" opacity=".67"/>
+  <path d="M71.944 15.7A39.47 39.47 0 0 0 41.588.009C32.3-.177 25.884 2.614 22.254 4.858 27.111 2.041 34.14.443 40.294.522c15.83.2 32.832 10.981 35.357 30.413 2.9 22.306-12.637 40.923-34.493 40.98-24.045.061-38.67-21.229-34.847-40.352a19.735 19.735 0 0 1 .413-2.787 37.815 37.815 0 0 1 4.193-14.018c-2.769 1.433-6.295 5.965-8.035 10.163A41.355 41.355 0 0 0 .284 45.1c.06.518.114 1.035.182 1.549A40.062 40.062 0 1 0 71.944 15.7zm-63.4 3.487z" fill="url(#c)"/>
+  <path d="M71.944 15.7A39.47 39.47 0 0 0 41.588.009C32.3-.177 25.884 2.614 22.254 4.858 27.111 2.041 34.14.443 40.294.522c15.83.2 32.832 10.981 35.357 30.413 2.9 22.306-12.637 40.923-34.493 40.98-24.045.061-38.67-21.229-34.847-40.352a19.735 19.735 0 0 1 .413-2.787 37.815 37.815 0 0 1 4.193-14.018c-2.769 1.433-6.295 5.965-8.035 10.163A41.355 41.355 0 0 0 .284 45.1c.06.518.114 1.035.182 1.549A40.062 40.062 0 1 0 71.944 15.7zm-63.4 3.487z" fill="url(#d)"/>
+  <path d="M71.944 15.7A39.47 39.47 0 0 0 41.588.009C32.3-.177 25.884 2.614 22.254 4.858 27.111 2.041 34.14.443 40.294.522c15.83.2 32.832 10.981 35.357 30.413 2.9 22.306-12.637 40.923-34.493 40.98-24.045.061-38.67-21.229-34.847-40.352a19.735 19.735 0 0 1 .413-2.787 37.815 37.815 0 0 1 4.193-14.018c-2.769 1.433-6.295 5.965-8.035 10.163A41.355 41.355 0 0 0 .284 45.1c.06.518.114 1.035.182 1.549A40.062 40.062 0 1 0 71.944 15.7zm-63.4 3.487z" fill="url(#e)"/>
+  <path d="M75.651 30.935a41.01 41.01 0 0 1 .3 7.247q1.99-.3 3.987-.53A40.01 40.01 0 0 0 71.944 15.7 39.47 39.47 0 0 0 41.588.009C32.3-.177 25.884 2.614 22.254 4.858 27.111 2.041 34.14.443 40.294.522 56.124.724 73.126 11.5 75.651 30.935z" fill="url(#f)"/>
+  <path d="M76.625 29.826C74.374 9.518 56.263.39 40.294.522c-6.155.05-13.183 1.519-18.04 4.336a19.7 19.7 0 0 0-3.56 2.7c.129-.107.514-.424 1.152-.862l.063-.043.056-.038a26.655 26.655 0 0 1 7.692-3.572A43.5 43.5 0 0 1 40.84 1.5a33.254 33.254 0 0 1 31.25 31.993C72.457 46.7 61.648 57.23 49.188 57.84c-9.062.444-17.6-3.941-21.77-12.713a21.68 21.68 0 0 1-1.964-6.333c-1.976-13.35 6.989-24.735 15.21-27.554-4.435-3.874-15.548-3.611-23.819 2.474-5.956 4.382-9.82 11.049-11.1 19a32.945 32.945 0 0 0 2.34 18 35.3 35.3 0 0 0 30.089 21.443q1.489.114 2.984.113c26.462 0 37.942-20.087 35.467-42.444z" fill="url(#g)"/>
+  <path d="M76.625 29.826C74.374 9.518 56.263.39 40.294.522c-6.155.05-13.183 1.519-18.04 4.336a19.7 19.7 0 0 0-3.56 2.7c.129-.107.514-.424 1.152-.862l.063-.043.056-.038a26.655 26.655 0 0 1 7.692-3.572A43.5 43.5 0 0 1 40.84 1.5a33.254 33.254 0 0 1 31.25 31.993C72.457 46.7 61.648 57.23 49.188 57.84c-9.062.444-17.6-3.941-21.77-12.713a21.68 21.68 0 0 1-1.964-6.333c-1.976-13.35 6.989-24.735 15.21-27.554-4.435-3.874-15.548-3.611-23.819 2.474-5.956 4.382-9.82 11.049-11.1 19a32.945 32.945 0 0 0 2.34 18 35.3 35.3 0 0 0 30.089 21.443q1.489.114 2.984.113c26.462 0 37.942-20.087 35.467-42.444z" fill="url(#h)"/>
+  <path d="M76.625 29.826C74.374 9.518 56.263.39 40.294.522c-6.155.05-13.183 1.519-18.04 4.336a19.7 19.7 0 0 0-3.56 2.7c.129-.107.514-.424 1.152-.862l.063-.043.056-.038a26.655 26.655 0 0 1 7.692-3.572A43.5 43.5 0 0 1 40.84 1.5a33.254 33.254 0 0 1 31.25 31.993C72.457 46.7 61.648 57.23 49.188 57.84c-9.062.444-17.6-3.941-21.77-12.713a21.68 21.68 0 0 1-1.964-6.333c-1.976-13.35 6.989-24.735 15.21-27.554-4.435-3.874-15.548-3.611-23.819 2.474-5.956 4.382-9.82 11.049-11.1 19a32.945 32.945 0 0 0 2.34 18 35.3 35.3 0 0 0 30.089 21.443q1.489.114 2.984.113c26.462 0 37.942-20.087 35.467-42.444z" style="mix-blend-mode:multiply" opacity=".53" fill="url(#i)"/>
+  <path d="M76.625 29.826C74.374 9.518 56.263.39 40.294.522c-6.155.05-13.183 1.519-18.04 4.336a19.7 19.7 0 0 0-3.56 2.7c.129-.107.514-.424 1.152-.862l.063-.043.056-.038a26.655 26.655 0 0 1 7.692-3.572A43.5 43.5 0 0 1 40.84 1.5a33.254 33.254 0 0 1 31.25 31.993C72.457 46.7 61.648 57.23 49.188 57.84c-9.062.444-17.6-3.941-21.77-12.713a21.68 21.68 0 0 1-1.964-6.333c-1.976-13.35 6.989-24.735 15.21-27.554-4.435-3.874-15.548-3.611-23.819 2.474-5.956 4.382-9.82 11.049-11.1 19a32.945 32.945 0 0 0 2.34 18 35.3 35.3 0 0 0 30.089 21.443q1.489.114 2.984.113c26.462 0 37.942-20.087 35.467-42.444z" style="mix-blend-mode:multiply" opacity=".53" fill="url(#j)"/>
+  <path d="M49.188 57.84c17.1-1.04 24.42-15.2 24.879-25.245C74.783 16.9 65.472-.02 40.84 1.5a43.5 43.5 0 0 0-13.183 1.546 28.855 28.855 0 0 0-7.692 3.572l-.056.038-.063.043q-.574.4-1.123.842A33.482 33.482 0 0 1 39.7 3.605c14.142 1.856 27.072 12.857 27.072 27.373 0 11.169-8.631 19.7-18.738 19.087-15.015-.9-18.8-16.3-10.989-22.954-2.106-.453-6.064.435-8.82 4.555-2.473 3.7-2.333 9.41-.807 13.461a22.118 22.118 0 0 0 21.77 12.713z" fill="url(#k)"/>
+  <path d="M71.944 15.7a39.958 39.958 0 0 0-3.482-3.982 31.342 31.342 0 0 0-3.177-2.926 24.393 24.393 0 0 1 1.849 1.79 22.466 22.466 0 0 1 4.882 8.144c2.089 6.329 1.953 14.25-2.036 20.471a23.539 23.539 0 0 1-20.855 10.895c-.361 0-.725 0-1.091-.027-15.015-.9-18.8-16.3-10.988-22.954-2.107-.453-6.065.435-8.821 4.555-2.473 3.7-2.333 9.41-.807 13.461a21.679 21.679 0 0 1-1.963-6.333c-1.977-13.35 6.988-24.735 15.209-27.554-4.435-3.874-15.548-3.611-23.819 2.474a27.845 27.845 0 0 0-10.087 14.6 38.5 38.5 0 0 1 4.159-13.553c-2.769 1.433-6.295 5.965-8.035 10.163A41.355 41.355 0 0 0 .284 45.1c.06.518.114 1.035.182 1.549A40.062 40.062 0 1 0 71.944 15.7z" fill="url(#l)"/>
+  <path d="M72.016 18.726a22.458 22.458 0 0 0-4.882-8.144 30.224 30.224 0 0 0-9.094-6.493A40.518 40.518 0 0 0 49.1.92a39.834 39.834 0 0 0-16.565-.1c-5.683 1.2-10.68 3.659-13.841 6.733a32.1 32.1 0 0 1 8.031-3.2 33.565 33.565 0 0 1 31.173 8.1 27.01 27.01 0 0 1 4.329 5.3c4.895 7.959 4.432 17.965.615 23.866-2.835 4.384-8.907 8.5-14.572 8.452A23.629 23.629 0 0 0 69.98 39.2c3.989-6.224 4.125-14.145 2.036-20.474z" fill="url(#m)"/>
+  <path d="M72.016 18.726a22.458 22.458 0 0 0-4.882-8.144 30.224 30.224 0 0 0-9.094-6.493A40.518 40.518 0 0 0 49.1.92a39.834 39.834 0 0 0-16.565-.1c-5.683 1.2-10.68 3.659-13.841 6.733a32.1 32.1 0 0 1 8.031-3.2 33.565 33.565 0 0 1 31.173 8.1 27.01 27.01 0 0 1 4.329 5.3c4.895 7.959 4.432 17.965.615 23.866-2.835 4.384-8.907 8.5-14.572 8.452A23.629 23.629 0 0 0 69.98 39.2c3.989-6.224 4.125-14.145 2.036-20.474z" fill="url(#n)"/>
+</svg>

assets/select-arrow.svg

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="8px" height="6px" viewBox="0 0 8 6" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: sketchtool 53 (72520) - https://sketchapp.com -->
-    <title>37845F0A-2932-4C2D-98E1-89BE1B168092</title>
-    <desc>Created with sketchtool.</desc>
     <defs>
         <path d="M6,8.48771202 C5.73480519,8.48765538 5.48049273,8.3822614 5.293,8.19471202 L2.293,5.19471202 C1.91402779,4.80233313 1.91944763,4.17862724 2.30518142,3.79289345 C2.69091522,3.40715965 3.31462111,3.40173981 3.707,3.78071202 L6,6.07371202 L8.293,3.78071202 C8.68537889,3.40173981 9.30908478,3.40715965 9.69481858,3.79289345 C10.0805524,4.17862724 10.0859722,4.80233313 9.707,5.19471202 L6.707,8.19471202 C6.51950727,8.3822614 6.26519481,8.48765538 6,8.48771202 Z" id="path-1"></path>
     </defs>
@@ -14,7 +11,7 @@
                     <mask id="mask-2" fill="white">
                         <use xlink:href="#path-1"></use>
                     </mask>
-                    <use id="Shape" fill="#0C0C0D" fill-rule="nonzero" opacity="0.599283854" xlink:href="#path-1"></use>
+                    <use id="Shape" fill="#b1b1b3" fill-rule="nonzero" opacity="0.599283854" xlink:href="#path-1"></use>
                 </g>
             </g>
         </g>

assets/share-24.svg

@@ -1,4 +1,5 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg width="20" height="20" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M18 9a3 3 0 1 0-2.977-2.63l-6.94 3.47a3 3 0 1 0 0 4.319l6.94 3.47a3 3 0 1 0 .895-1.789l-6.94-3.47a3.03 3.03 0 0 0 0-.74l6.94-3.47C16.456 8.68 17.19 9 18 9z" fill="#0060df" fill-opacity=".8"></path></svg>
+<svg xmlns="http://www.w3.org/2000/svg">
+<symbol id="icon" viewBox="0 0 24 24"><path fill-rule="evenodd" clip-rule="evenodd" d="M18 9a3 3 0 1 0-2.977-2.63l-6.94 3.47a3 3 0 1 0 0 4.319l6.94 3.47a3 3 0 1 0 .895-1.789l-6.94-3.47a3.03 3.03 0 0 0 0-.74l6.94-3.47C16.456 8.68 17.19 9 18 9z" fill="currentColor"></path></symbol></svg>

assets/wordmark.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<symbol id="logo">
+<path d="M84,48h5.83V35.87H103.3V30.45H89.83V23.51H103.3V18H84Zm23.57,0h5.79V25.81h-5.79Zm2.88-32.12a3.46,3.46,0,0,0-2.59,1,3.62,3.62,0,0,0-1,2.65,3.57,3.57,0,0,0,1,2.59,3.52,3.52,0,0,0,2.61,1,3.46,3.46,0,0,0,3.65-3.26c0-.12,0-.23,0-.35a3.71,3.71,0,0,0-1-2.65,3.5,3.5,0,0,0-2.67-1Zm19.14,9.53a7.22,7.22,0,0,0-3.72.93,5.82,5.82,0,0,0-2.4,2.89V25.81h-5.59V48h5.63V36.29a5.27,5.27,0,0,1,1.31-4,4.94,4.94,0,0,1,3.49-1.21,6.33,6.33,0,0,1,1.73.23,4,4,0,0,1,1.23.55l2-5.59a7.51,7.51,0,0,0-1.66-.61,8.11,8.11,0,0,0-2-.26Zm23.94,3.19a11.15,11.15,0,0,0-3.61-2.37,12.08,12.08,0,0,0-4.6-.86,11.62,11.62,0,0,0-8.3,3.37,11.17,11.17,0,0,0-2.44,3.67,11.59,11.59,0,0,0-.89,4.54,12.24,12.24,0,0,0,.83,4.52,10.52,10.52,0,0,0,2.36,3.66,10.93,10.93,0,0,0,3.71,2.44,12.75,12.75,0,0,0,4.85.88,12.15,12.15,0,0,0,6.12-1.39,13.25,13.25,0,0,0,4.11-3.74L151,40.6a6.23,6.23,0,0,1-2.18,2.15,6.36,6.36,0,0,1-3.33.8,6.7,6.7,0,0,1-4.13-1.25,6,6,0,0,1-2.23-3.43h17.62V36.74a11.71,11.71,0,0,0-.87-4.56,10.5,10.5,0,0,0-2.35-3.59Zm-14.21,5.85a6.38,6.38,0,0,1,2.26-3.12,6.11,6.11,0,0,1,3.74-1.15,6.26,6.26,0,0,1,3.73,1.08,5.56,5.56,0,0,1,2.1,3.19ZM167,16.08a6.05,6.05,0,0,0-2.91,1.54,6.15,6.15,0,0,0-1.56,2.89,18.1,18.1,0,0,0-.48,4.52v.78H158.4v5.1h3.65V48h5.63V30.91H173v-5.1h-5.3V24.75a13.34,13.34,0,0,1,.12-2,2,2,0,0,1,.6-1.19,2.45,2.45,0,0,1,1.33-.57,15.25,15.25,0,0,1,2.34-.15H173V15.63h-1.48A19.06,19.06,0,0,0,167,16.08Zm27.4,12.65a12,12,0,0,0-16.72,0,10.87,10.87,0,0,0-2.46,3.67,11.61,11.61,0,0,0-.89,4.5,11.46,11.46,0,0,0,7.07,10.64,11.73,11.73,0,0,0,4.64.9,12,12,0,0,0,4.66-.9,11.26,11.26,0,0,0,3.72-2.49,11.83,11.83,0,0,0,2.46-3.67,11.31,11.31,0,0,0,.9-4.48A11.43,11.43,0,0,0,194.4,28.73ZM191.7,39.3a5.88,5.88,0,0,1-1.29,2,6.53,6.53,0,0,1-1.93,1.31,6,6,0,0,1-4.76,0,6.34,6.34,0,0,1-1.93-1.31,6.06,6.06,0,0,1-1.3-2,6.48,6.48,0,0,1,0-4.86,5.76,5.76,0,0,1,1.3-2,6.08,6.08,0,0,1,1.93-1.32,6,6,0,0,1,4.76,0,6.37,6.37,0,0,1,1.93,1.32,5.73,5.73,0,0,1,1.29,2A6.39,6.39,0,0,1,191.7,39.3Zm29.47-13.49h-6.65l-4.68,6.57-4.64-6.57h-6.74l7.84,10.8L198,48h6.82l5-6.94L214.89,48h6.86l-8.46-11.34Zm34,7.46a12.88,12.88,0,0,0-3.37-1.44c-1.25-.34-2.46-.63-3.63-.88l-3.08-.7a10.64,10.64,0,0,1-2.51-.86A4.54,4.54,0,0,1,240.87,28a3.61,3.61,0,0,1-.62-2.19,4.8,4.8,0,0,1,1.58-3.7c1.06-1,2.73-1.44,5-1.44a9.84,9.84,0,0,1,5.07,1.17,10.47,10.47,0,0,1,3.39,3.23l2.79-2.18A15.22,15.22,0,0,0,253.45,19a13.8,13.8,0,0,0-6.59-1.44,12.13,12.13,0,0,0-4.14.66A10.33,10.33,0,0,0,239.53,20a7.53,7.53,0,0,0-2.05,2.63,7.41,7.41,0,0,0-.72,3.24,6.7,6.7,0,0,0,.84,3.53,7.06,7.06,0,0,0,2.2,2.22A11.11,11.11,0,0,0,242.86,33c1.13.32,2.29.6,3.47.84l3.26.74a12.63,12.63,0,0,1,2.8,1,5.86,5.86,0,0,1,2,1.56,3.88,3.88,0,0,1,.74,2.42,5.2,5.2,0,0,1-1.81,4.09A7.83,7.83,0,0,1,248,45.2a11,11,0,0,1-9.89-5.38l-3,2.34a15.86,15.86,0,0,0,5.23,4.54,16.06,16.06,0,0,0,7.7,1.7,12.58,12.58,0,0,0,4.38-.72,10.14,10.14,0,0,0,3.3-2,8.79,8.79,0,0,0,2.1-2.85,8.09,8.09,0,0,0,.74-3.39,6.94,6.94,0,0,0-1-3.8,7.71,7.71,0,0,0-2.42-2.37Zm27.51-4.72a10.53,10.53,0,0,0-3.58-2.34,11.89,11.89,0,0,0-4.49-.84,11.6,11.6,0,0,0-4.62.9,11.35,11.35,0,0,0-3.66,2.46A11.84,11.84,0,0,0,263,37a12.21,12.21,0,0,0,.82,4.51,10.53,10.53,0,0,0,2.36,3.64,11.24,11.24,0,0,0,3.7,2.42,12.41,12.41,0,0,0,4.82.88A11.68,11.68,0,0,0,280.82,47,12.84,12.84,0,0,0,285,42.82l-2.88-1.69a7.85,7.85,0,0,1-7.43,4.27,9,9,0,0,1-3.22-.53,8.21,8.21,0,0,1-2.55-1.5,8,8,0,0,1-1.78-2.28,7.79,7.79,0,0,1-.87-2.91h19.59V36.66a11.75,11.75,0,0,0-.86-4.54,10.92,10.92,0,0,0-2.35-3.57ZM266.4,35.22a8.88,8.88,0,0,1,1-2.73,8.55,8.55,0,0,1,1.79-2.18,8,8,0,0,1,2.44-1.43,8.31,8.31,0,0,1,3-.52,7.45,7.45,0,0,1,7.84,6.86ZM308.82,28a8.11,8.11,0,0,0-3-2,10.89,10.89,0,0,0-3.92-.67,9.06,9.06,0,0,0-4.58,1.14,8.76,8.76,0,0,0-3.14,3V25.82h-3.29V48h3.37V35.67a7.92,7.92,0,0,1,.53-2.93,7,7,0,0,1,1.48-2.3,6.46,6.46,0,0,1,2.22-1.5,7,7,0,0,1,2.75-.54,6.33,6.33,0,0,1,5,1.93A7.46,7.46,0,0,1,308,35.51V48h3.41V35.34a12.46,12.46,0,0,0-.66-4.19A8.68,8.68,0,0,0,308.82,28Zm27-12.42v14.1a8.14,8.14,0,0,0-1.58-1.83,10.08,10.08,0,0,0-2-1.36,10.39,10.39,0,0,0-2.3-.84,10.22,10.22,0,0,0-2.4-.28,11.63,11.63,0,0,0-4.4.84,11.09,11.09,0,0,0-3.59,2.38,11.3,11.3,0,0,0-2.42,3.65,12.81,12.81,0,0,0,0,9.32,11.56,11.56,0,0,0,2.4,3.66,10.58,10.58,0,0,0,3.59,2.38,11.77,11.77,0,0,0,4.42.84,9.69,9.69,0,0,0,2.4-.31,11,11,0,0,0,2.3-.86,9.72,9.72,0,0,0,2-1.37,8.75,8.75,0,0,0,1.58-1.85v4h3.33V15.59Zm-.37,24.58a8.3,8.3,0,0,1-10.85,4.47h0a7.68,7.68,0,0,1-2.6-1.76,7.88,7.88,0,0,1-1.73-2.67,8.93,8.93,0,0,1-.62-3.35,8.67,8.67,0,0,1,.62-3.3A8,8,0,0,1,322,30.89a8.17,8.17,0,0,1,2.6-1.79,8.27,8.27,0,0,1,6.51,0,8.64,8.64,0,0,1,2.63,1.81,7.85,7.85,0,0,1,1.72,2.67,8.67,8.67,0,0,1,.62,3.26,8.86,8.86,0,0,1-.65,3.33Z" fill="currentColor"/>
+</symbol>
+<use xlink:href="#logo"/>
+</svg>

browserslist

@@ -2,4 +2,5 @@ last 2 chrome versions
 last 2 firefox versions
 last 2 safari versions
 last 2 edge versions
+edge 18
 firefox esr

build/readme.md

@@ -1,8 +1,8 @@
 # Custom Loaders
 
-## Generate Asset Map
+## Android Index Plugin
 
-This loader enumerates all the files in `assets/` so that `common/assets.js` can provide mappings from the source filename to the hashed filename used on the site.
+Generates the `index.html` page for the native android client
 
 ## Version Plugin
 

build/version_plugin.js

@@ -1,6 +1,14 @@
-const commit = require('git-rev-sync').short();
+const gitRevSync = require('git-rev-sync');
 const pkg = require('../package.json');
 
+let commit = 'unknown';
+
+try {
+  commit = gitRevSync.short();
+} catch (e) {
+  console.warn('Error fetching current git commit: ' + e);
+}
+
 const version = JSON.stringify({
   commit,
   source: pkg.homepage,

common/assets.js

@@ -1,4 +1,4 @@
-const genmap = require('../build/generate_asset_map');
+const genmap = require('./generate_asset_map');
 const isServer = typeof genmap === 'function';
 let prefix = '';
 let manifest = {};

common/readme.md

@@ -1,3 +1,7 @@
 # Common Code
 
-This directory contains code loaded by both the frontend `app` and backend `server`. The code here can be challenging to understand at first because the contexts for the two (three counting the dev server) environments that include them are quite different, but the purpose of these modules are quite simple, to provide mappings from the source assets (`copy-16.png`) to the concrete production assets (`copy-16.db66e0bf.svg`).
+This directory contains code loaded by both the frontend `app` and backend `server`. The code here can be challenging to understand at first because the contexts for the two (three counting the dev server) environments that include them are quite different, but the purpose of these modules are quite simple, to provide mappings from the source assets (`copy-16.png`) to the concrete production assets (`copy-16.db66e0bf.svg`).
+
+## Generate Asset Map
+
+This loader enumerates all the files in `assets/` so that `common/assets.js` can provide mappings from the source filename to the hashed filename used on the site.

docs/build.md

@@ -2,7 +2,7 @@ Send has two build configurations, development and production. Both can be run v
 
 # Development
 
-`npm start` launches a `webpack-dev-server` on port 8080 that compiles the assets and watches files for changes. It also serves the backend API and frontend unit tests via the `server/bin/dev.js` entrypoint. The frontend tests can be run in the browser by navigating to http://localhost:8080/test and will rerun automatically as the watched files are saved with changes.
+`npm start` launches a `webpack-dev-server` on port 1337 that compiles the assets and watches files for changes. It also serves the backend API and frontend unit tests via the `server/bin/dev.js` entrypoint. The frontend tests can be run in the browser by navigating to http://localhost:8080/test and will rerun automatically as the watched files are saved with changes.
 
 # Production
 
@@ -19,4 +19,4 @@ Send has two build configurations, development and production. Both can be run v
 
 # Custom Loaders
 
-The `build/` directory contains custom webpack loaders specific to Send. See [build/readme.md](../build/readme.md) for details on each loader.
+The `build/` directory contains custom webpack loaders specific to Send. See [build/readme.md](../build/readme.md) for details on each loader.

docs/deployment.md

@@ -0,0 +1,68 @@
+## Requirements
+This document describes how to do a full deployment of Firefox Send on your own Linux server. You will need:
+
+* A working (and ideally somewhat recent) installation of NodeJS and NPM
+* GIT
+* An Apache webserver
+* Optionally telnet, to be able to quickly check your installation
+
+For Debian/Ubuntu systems this probably just means something like this:
+
+* apt install git apache2 nodejs npm telnet
+
+## Building
+* We assume an already configured virtual-host on your webserver with an existing empty htdocs folder
+* First, remove that htdocs folder - we will replace it with Firefox Send's version now
+* git clone https://github.com/mozilla/send.git htdocs
+* Make now sure you are NOT root but rather the user your webserver is serving files under (e.g. "su www-data" or whoever the owner of your htdocs folder is)
+* npm install
+* npm run build
+
+## Running
+To have a permanently running version of Firefox Send as a background process:
+
+* Create a file "run.sh" with:
+```
+#!/bin/bash
+nohup su www-data -c "npm run prod" 2>/dev/null &
+```
+* chmod +x run.sh
+* ./run.sh
+
+Now the Firefox Send backend should be running on port 1443. You can check with:
+* telnet localhost 1443
+
+## Reverse Proxy
+Of course, we don't want to expose the service on port 1443. Instead we want our normal webserver to forward all requests to Firefox send ("Reverse proxy").
+
+# Apache webserver
+
+* a2enmod proxy
+* a2enmod proxy_http
+* a2enmod proxy_wstunnel
+
+In your Apache virtual host configuration file, insert this:
+
+```
+    # Enable rewrite engine
+    RewriteEngine on
+
+    # Make sure the original domain name is forwarded to Send
+    # Otherwise the generated URLs will be wrong
+    ProxyPreserveHost on
+
+    # Make sure the generated URL is https://
+    RequestHeader set X-Forwarded-Proto https
+
+    # If it's a normal file (e.g. PNG, CSS) just return it
+    RewriteCond %{REQUEST_FILENAME} -f
+    RewriteRule .* - [L]
+
+    # If it's a websocket connection, redirect it to a Send WS connection
+    RewriteCond %{HTTP:Upgrade} =websocket [NC]
+    RewriteRule /(.*) ws://127.0.0.1:1443/$1 [P,L]
+
+    # Otherwise redirect it to a normal HTTP connection
+    RewriteRule ^/(.*)$ http://127.0.0.1:1443/$1 [P,QSA]
+    ProxyPassReverse  "/" "http://127.0.0.1:1443"
+```

docs/docker.md

@@ -1,13 +1,6 @@
 ## Setup
 
-Before building the Docker image, you must build the production assets:
-
-```sh
-npm run build
-```
-
-Then you can run either `docker build` or `docker-compose up`.
-
+Run `docker build -t send:latest .` to create an image or `docker-compose up` to run a full testable stack. *We don't recommend using docker-compose for production.*
 
 ## Environment variables:
 
@@ -20,6 +13,7 @@ Then you can run either `docker build` or `docker-compose up`.
 | `SENTRY_DSN` | Sentry DSN
 | `MAX_FILE_SIZE` | in bytes (defaults to 2147483648)
 | `NODE_ENV`       | "production"
+| `BASE_URL`       | The HTTPS URL where traffic will be served (e.g. `https://send.firefox.com`)
 
 ## Example:
 
@@ -29,5 +23,6 @@ $ docker run --net=host -e 'NODE_ENV=production' \
   -e 'REDIS_HOST=dyf9s2r4vo3.bolxr4.0001.usw2.cache.amazonaws.com' \
   -e 'SENTRY_CLIENT=https://51e23d7263e348a7a3b90a5357c61cb2@sentry.prod.mozaws.net/168' \
   -e 'SENTRY_DSN=https://51e23d7263e348a7a3b90a5357c61cb2:65e23d7263e348a7a3b90a5357c61c44@sentry.prod.mozaws.net/168' \
+  -e 'BASE_URL=https://send.firefox.com' \
   mozilla/send:latest
 ```

docs/encryption.md

@@ -7,8 +7,8 @@ Send use 128-bit AES-GCM encryption via the [Web Crypto API](https://developer.m
 ### Uploading
 
 1. A new secret key is generated with `crypto.getRandomValues`
-2. The secret key is used to derive 3 more keys via HKDF SHA-256
-    - an encryption key for the file (AES-GCM)
+2. The secret key is used to derive more keys via HKDF SHA-256
+    - a series of encryption keys for the file, via [ECE](https://tools.ietf.org/html/rfc8188) (AES-GCM)
     - an encryption key for the file metadata (AES-GCM)
     - a signing key for request authentication (HMAC SHA-256)
 3. The file and metadata are encrypted with their corresponding keys

docs/faq.md

@@ -1,6 +1,6 @@
 ## How big of a file can I transfer with Firefox Send?
 
-There is a 2GB file size limit built in to Send, however, in practice you may
+There is a 2.5GB file size limit built in to Send(1GB for non-signed in users), however, in practice you may
 be unable to send files that large.  Send encrypts and decrypts the files in
 the browser which is great for security but will tax your system resources.  In
 particular you can expect to see your memory usage go up by at least the size

docs/metrics.md

@@ -68,6 +68,7 @@ Server events allow us to aggregate data about file lifecycle without collecting
 * `event_properties`
   * `download_count` downloads completed
   * `ttl` time remaining before expiry truncated to hour
+  * `agent` the browser name or first 6 characters of the user agent that made the request
 
 ### Client Events
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "firefox-send",
   "description": "File Sharing Experiment",
-  "version": "3.0.6",
+  "version": "3.0.22",
   "author": "Mozilla (https://mozilla.org)",
   "repository": "mozilla/send",
   "homepage": "https://github.com/mozilla/send/",
@@ -23,11 +23,11 @@
     "release": "npm-run-all contributors changelog",
     "test": "npm-run-all test:*",
     "test:backend": "nyc --reporter=lcovonly mocha --reporter=min test/backend",
-    "test:frontend": "cross-env NODE_ENV=development node test/frontend/runner.js",
+    "test:frontend": "cross-env NODE_ENV=development FXA_REQUIRED=false node test/frontend/runner.js",
     "test:report": "nyc report --reporter=html",
     "test-integration": "cross-env NODE_ENV=development wdio test/wdio.docker.conf.js",
-    "circleci-test-integration": "cross-env NODE_ENV=development wdio test/wdio.circleci.conf.js",
-    "start": "npm run clean && cross-env NODE_ENV=development FXA_CLIENT_ID=fced6b5e3f4c66b9 BASE_URL=http://localhost:8080 webpack-dev-server --mode=development",
+    "circleci-test-integration": "echo 'webdriverio tests need to be updated to node 12'",
+    "start": "npm run clean && cross-env NODE_ENV=development L10N_DEV=true FXA_CLIENT_ID=fced6b5e3f4c66b9 BASE_URL=http://localhost:1337 webpack-dev-server --port=1337 --mode=development",
     "android": "cross-env ANDROID=1 npm start",
     "prod": "node server/bin/prod.js"
   },
@@ -35,7 +35,8 @@
     "hooks": {
       "pre-commit": "lint-staged",
       "pre-push": "npm test",
-      "post-merge": "npm install"
+      "post-merge": "npm install",
+      "post-checkout": "scripts/sync-npm-dependencies.sh"
     }
   },
   "lint-staged": {
@@ -57,109 +58,107 @@
     "cache": true
   },
   "engines": {
-    "node": ">=10.0.0"
+    "node": "^12.16.3"
   },
   "devDependencies": {
-    "@babel/core": "^7.3.4",
-    "@babel/plugin-proposal-class-properties": "^7.3.4",
+    "@babel/core": "^7.12.0",
+    "@babel/plugin-proposal-class-properties": "^7.10.4",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/preset-env": "^7.3.4",
-    "@dannycoates/webcrypto-liner": "^0.1.34",
-    "@dannycoates/webpack-dev-server": "^3.1.4",
-    "@fullhuman/postcss-purgecss": "^1.1.0",
+    "@babel/preset-env": "^7.12.0",
+    "@dannycoates/webcrypto-liner": "^0.1.37",
+    "@fullhuman/postcss-purgecss": "^1.3.0",
     "@mattiasbuelens/web-streams-polyfill": "0.2.1",
+    "@sentry/browser": "^5.26.0",
     "asmcrypto.js": "^0.22.0",
-    "babel-loader": "^8.0.5",
-    "babel-plugin-istanbul": "^5.1.1",
-    "base64-js": "^1.3.0",
+    "babel-loader": "^8.0.6",
+    "babel-plugin-istanbul": "^5.2.0",
+    "base64-js": "^1.3.1",
     "content-disposition": "^0.5.3",
-    "copy-webpack-plugin": "^5.0.0",
-    "core-js": "^2.6.5",
-    "crc": "^3.8.0",
-    "cross-env": "^5.2.0",
-    "css-loader": "^2.1.1",
+    "copy-webpack-plugin": "^5.1.2",
+    "core-js": "^3.4.0",
+    "cross-env": "^6.0.3",
+    "css-loader": "^3.6.0",
     "css-mqpacker": "^7.0.0",
     "cssnano": "^4.1.10",
-    "eslint": "^5.15.1",
-    "eslint-plugin-mocha": "^5.3.0",
-    "eslint-plugin-node": "^8.0.1",
+    "eslint": "^6.6.0",
+    "eslint-config-prettier": "^6.12.0",
+    "eslint-plugin-mocha": "^6.2.1",
+    "eslint-plugin-node": "^10.0.0",
     "eslint-plugin-security": "^1.4.0",
     "expose-loader": "^0.7.5",
-    "extract-loader": "^3.1.0",
+    "extract-loader": "^3.2.0",
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
-    "fast-text-encoding": "^1.0.0",
-    "file-loader": "^3.0.1",
-    "fluent-intl-polyfill": "^0.1.0",
+    "fast-text-encoding": "^1.0.3",
+    "file-loader": "^4.2.0",
     "git-rev-sync": "^1.12.0",
     "html-loader": "^0.5.5",
     "http_ece": "^1.1.0",
-    "husky": "^1.3.1",
-    "lint-staged": "^8.1.5",
-    "mocha": "^6.0.2",
+    "husky": "^3.0.9",
+    "intl-pluralrules": "^1.2.2",
+    "lint-staged": "^9.4.2",
+    "mocha": "^6.2.2",
     "morgan": "^1.9.1",
     "nanobus": "^4.4.0",
-    "nanohtml": "^1.4.0",
+    "nanohtml": "^1.9.0",
     "nanotiming": "^7.3.1",
     "npm-run-all": "^4.1.5",
-    "nyc": "^13.3.0",
+    "nyc": "^14.1.1",
     "postcss-loader": "^3.0.0",
-    "postcss-preset-env": "^6.6.0",
-    "prettier": "^1.16.4",
-    "proxyquire": "^2.1.0",
-    "puppeteer": "1.11.0",
-    "raven-js": "^3.27.0",
-    "raw-loader": "^1.0.0",
-    "redis-mock": "^0.43.0",
-    "rimraf": "^2.6.3",
+    "postcss-preset-env": "^6.7.0",
+    "prettier": "^1.19.1",
+    "proxyquire": "^2.1.3",
+    "puppeteer": "^2.0.0",
+    "raw-loader": "^3.1.0",
+    "redis-mock": "^0.47.0",
+    "rimraf": "^3.0.0",
     "script-loader": "^0.7.2",
-    "sinon": "^7.2.7",
+    "sinon": "^7.5.0",
     "string-hash": "^1.1.3",
-    "stylelint": "^9.10.1",
-    "stylelint-config-standard": "^18.2.0",
+    "stylelint": "^11.1.1",
+    "stylelint-config-standard": "^19.0.0",
     "stylelint-no-unsupported-browser-features": "^3.0.2",
-    "svgo": "^1.2.0",
-    "svgo-loader": "^2.2.0",
-    "tailwindcss": "^0.7.4",
+    "svgo": "^1.3.2",
+    "svgo-loader": "^2.2.1",
+    "tailwindcss": "^1.9.2",
     "val-loader": "^1.1.1",
-    "wdio-docker-service": "^1.4.2",
-    "wdio-dot-reporter": "0.0.10",
-    "wdio-firefox-profile-service": "^0.1.3",
-    "wdio-mocha-framework": "^0.6.3",
-    "wdio-sauce-service": "^0.4.14",
-    "wdio-selenium-standalone-service": "0.0.12",
-    "wdio-spec-reporter": "^0.1.5",
-    "webdriverio": "^4.14.3",
-    "webpack": "4.28.4",
-    "webpack-cli": "^3.2.3",
-    "webpack-dev-middleware": "^3.6.1",
-    "webpack-manifest-plugin": "^2.0.4",
+    "webpack": "4.38.0",
+    "webpack-cli": "^3.3.12",
+    "webpack-dev-middleware": "^3.7.2",
+    "webpack-dev-server": "^3.11.0",
+    "webpack-manifest-plugin": "^2.2.0",
     "webpack-unassert-loader": "^1.2.0"
   },
   "dependencies": {
-    "@google-cloud/storage": "^2.4.2",
-    "aws-sdk": "^2.417.0",
-    "body-parser": "^1.18.3",
-    "choo": "^6.12.1",
-    "cldr-core": "^34.0.0",
-    "convict": "^4.4.1",
-    "express": "^4.16.3",
-    "express-ws": "github:dannycoates/express-ws",
-    "fluent": "^0.11.0",
-    "fluent-langneg": "^0.1.1",
-    "fxa-geodb": "^1.0.4",
-    "helmet": "^3.15.1",
+    "@dannycoates/express-ws": "^5.0.3",
+    "@fluent/bundle": "^0.13.0",
+    "@fluent/langneg": "^0.3.0",
+    "@google-cloud/storage": "^5.3.0",
+    "@peculiar/webcrypto": "^1.1.3",
+    "@sentry/node": "^5.26.0",
+    "aws-sdk": "^2.771.0",
+    "body-parser": "^1.19.0",
+    "choo": "^7.0.0",
+    "cldr-core": "^35.1.0",
+    "configstore": "github:dannycoates/configstore#master",
+    "convict": "^5.2.0",
+    "express": "^4.17.1",
+    "helmet": "^3.23.3",
     "mkdirp": "^0.5.1",
     "mozlog": "^2.2.0",
-    "node-fetch": "^2.3.0",
-    "raven": "^2.6.4",
-    "redis": "^2.8.0",
-    "selenium-standalone": "^6.15.6",
-    "ua-parser-js": "^0.7.19",
-    "websocket-stream": "^5.1.2"
+    "node-fetch": "^2.6.1",
+    "redis": "^3.0.2",
+    "selenium-standalone": "^6.20.1",
+    "ua-parser-js": "^0.7.22"
   },
   "availableLanguages": [
     "en-US",
-    "bn-BD",
+    "an",
+    "ar",
+    "ast",
+    "azz",
+    "be",
+    "bn",
+    "br",
     "ca",
     "cak",
     "cs",
@@ -167,33 +166,61 @@
     "da",
     "de",
     "dsb",
+    "el",
     "en-CA",
     "en-GB",
     "es-AR",
+    "es-CL",
     "es-ES",
     "es-MX",
+    "et",
+    "eu",
+    "fa",
+    "fi",
     "fr",
     "fy-NL",
+    "gn",
+    "he",
     "hr",
     "hsb",
     "hu",
+    "hus",
+    "hy-AM",
+    "ia",
     "id",
     "it",
     "ja",
     "ka",
+    "kab",
+    "ko",
     "lt",
+    "meh",
+    "mix",
+    "ml",
+    "nb-NO",
     "nl",
     "nn-NO",
+    "oc",
+    "pa-IN",
+    "pl",
+    "ppl",
     "pt-BR",
     "pt-PT",
+    "quc",
     "ro",
     "ru",
     "sk",
     "sl",
+    "sq",
+    "sr",
+    "su",
     "sv-SE",
+    "te",
+    "th",
     "tr",
     "uk",
     "vi",
+    "zgh",
     "zh-CN",
     "zh-TW"
   ]

postcss.config.js

@@ -6,7 +6,7 @@ class TailwindExtractor {
 
 const options = {
   plugins: [
-    require('tailwindcss')('./tailwind.js'),
+    require('tailwindcss')('./tailwind.config.js'),
     require('postcss-preset-env')
   ]
 };

public/locales/an/send.ftl

@@ -0,0 +1,185 @@
+# Firefox Send is a brand name and should not be localized.
+title = Firefox Send
+importingFile = Se ye importando…
+encryptingFile = Se ye cifrando…
+decryptingFile = Se ye descifrando…
+downloadCount =
+    { $num ->
+        [one] 1 descarga
+       *[other] { $num } descargas
+    }
+timespanHours =
+    { $num ->
+        [one] hora
+       *[other] { $num } horas
+    }
+copiedUrl = Copiau!
+unlockInputPlaceholder = Clau
+unlockButtonLabel = Desblocar
+downloadButtonLabel = Descargar
+downloadFinish = Descarga completa
+fileSizeProgress = ({ $partialSize } de { $totalSize })
+sendYourFilesLink = Preba Firefox Send
+errorPageHeader = I ha habiu bell problema!
+fileTooBig = Ixe fichero ye masiau gran pa cargar-lo. Ha de tener menos de { $size }
+linkExpiredAlt = Lo vinclo ye caducau
+notSupportedHeader = Lo suyo navegador no ye compatible
+notSupportedLink = Per qué no ye compatible lo mío navegador?
+notSupportedOutdatedDetail = Esta versión de Firefox no admite la tecnolochía web con que funciona lo Firefox Send. Habrás d'esviellar lo navegador.
+updateFirefox = Esviellar Firefox
+deletePopupCancel = Cancelar
+deleteButtonHover = Borrar
+footerLinkLegal = Aviso legal
+footerLinkPrivacy = Privacidat
+footerLinkCookies = Cookies
+passwordTryAgain = La contrasenya ye incorrecta. Torne-lo a intentar.
+javascriptRequired = Firefox Send necesita JavaScript
+whyJavascript = Per qué Firefox Send necesita JavaScript?
+enableJavascript = Activa JavaScript y torna-lo a intentar.
+# A short representation of a countdown timer containing the number of hours and minutes remaining as digits, example "13h 47m"
+expiresHoursMinutes = { $hours } h { $minutes } min
+# A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
+expiresMinutes = { $minutes } min
+# A short status message shown when the user enters a long password
+maxPasswordLength = Maxima lonchitut d'a clau: { $length }
+# A short status message shown when there was an error setting the password
+passwordSetError = No s'ha puesto definir la clau
+
+## Send version 2 strings
+
+# Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
+-send-brand = Firefox Send
+-send-short-brand = Send
+-firefox = Firefox
+-mozilla = Mozilla
+introTitle = Compartición de fichers simpla y privada
+introDescription = { -send-brand } te permite de compartir fichers cifraus de cabo a cabo, y tamién un vinclo que expira automaticament. Asinas, puetz mantener en privau lo que compartes y asegurar-te de que los tuyos contenius no se quedan pa cutio en linia.
+notifyUploadEncryptDone = Lo fichero s'ha cifrau y ye presto pa ninviar-se
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = Caduca dimpués de { $downloadCount } u { $timespan }
+timespanMinutes =
+    { $num ->
+        [one] 1 minuto
+       *[other] { $num } minutos
+    }
+timespanDays =
+    { $num ->
+        [one] 1 día
+       *[other] { $num } días
+    }
+timespanWeeks =
+    { $num ->
+        [one] 1 semana
+       *[other] { $num } semanas
+    }
+fileCount =
+    { $num ->
+        [one] 1 fichero
+       *[other] { $num } fichers
+    }
+# byte abbreviation
+bytes = B
+# kibibyte abbreviation
+kb = KB
+# mebibyte abbreviation
+mb = MB
+# gibibyte abbreviation
+gb = GB
+# localized number and byte abbreviation. example "2.5MB"
+fileSize = { $num }{ $units }
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+totalSize = Mida total: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = Copiar lo vinclo que quiers compartir
+copyLinkButton = Copiar lo vinclo
+downloadTitle = Descargar los fichers
+downloadDescription = Este fichero s'ha compartiu per medio de { -send-brand } con cifrau de cabo a cabo y un vinclo que caduca automaticament.
+trySendDescription = Preba { -send-brand } pa una compartición de fichers simpla y segura.
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [one] Nomás se puet puyar 1 fitxer de vez.
+       *[other] Nomás se pueden puyar  { $count } fichers de vez.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [one] Nomás se permite 1 ficher.
+       *[other] Nomás se permiten { $count } fichers.
+    }
+expiredTitle = Este vinclo ye caducau.
+notSupportedDescription = { -send-brand } no funcionará con este navegador. { -send-short-brand } funciona millor con a zaguera versión de { -firefox } y funcionará con a versión mas recient d'a mayor parte de navegadors.
+downloadFirefox = Descargar { -firefox }
+legalTitle = Aviso de privacidat de { -send-short-brand }
+legalDateStamp = Versió 1.0, con data d'o 12 de marzo de 2019
+# A short representation of a countdown timer containing the number of days, hours, and minutes remaining as digits, example "2d 11h 56m"
+expiresDaysHoursMinutes = { $days } d { $hours } h { $minutes } min
+addFilesButton = Triar los fichers a cargar
+trustWarningMessage = Asegura-te de que confías en o destinatario quan compartas datos confidencials.
+uploadButton = Cargar
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = Arrociega y suelta los fichers
+# the second part of the string 'Drag and drop files or click to send up to 1GB'
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+orClickWithSize = u fes clic aquí pa ninviar dica { $size }
+addPassword = Protecher con una clau
+emailPlaceholder = Escribe la tuya adreza de correu
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+signInSizeBump = Inicia una sesión pa ninviar dica { $size }
+signInOnlyButton = Iniciar la sesión
+accountBenefitTitle = Crea una cuenta de { -firefox } u dentra-ie
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+accountBenefitLargeFiles = Compartir fichers dica { $size }
+accountBenefitDownloadCount = Compartir fichers con mas chent
+accountBenefitTimeLimit =
+    { $count ->
+        [one] Mantiene los vinclos activos dica 1 dia
+       *[other] Mantiene los vinclos activos dica { $count } días
+    }
+accountBenefitSync = Chestiona los fichers compartius dende qualsequier dispositivo
+accountBenefitMoz = Descubre mas cosas sobre los atros servicios de { -mozilla }
+signOut = Zarrar la sesión
+okButton = Vale
+downloadingTitle = Se ye descargando
+noStreamsWarning = Este navegador talment no pueda descifrar un fichero tant gran.
+noStreamsOptionCopy = Copia lo vinclo pa ubrir-lo en belatro navegador
+noStreamsOptionFirefox = Preba lo nuestro navegador favorito
+noStreamsOptionDownload = Continar con este navegador
+downloadFirefoxPromo = Lo nuevo { -firefox } t'ofreix { -send-short-brand }.
+# the next line after the colon contains a file name
+shareLinkDescription = Comparte lo vinclo enta lo tuyo fichero:
+shareLinkButton = Compartir lo vinclo
+# $name is the name of the file
+shareMessage = Baixa-te «{ $name }» con { -send-brand }: compartición de fiches simpla y segura
+trailheadPromo = I hai una manera de protecher la tuya privacidat. Une-te a Firefox.
+learnMore = Mas información
+downloadFlagged = Este vinclo s'ha desactivau per violar las condiciones d'uso.
+downloadConfirmTitle = Una coseta mas
+downloadConfirmDescription = Asegura-te de que confías en a persona que t'ha ninviau este fichero, perque no podemos verificar que no danyará lo tuyo dispositivo.
+# This string has a special case for '1' and [other] (default). If necessary for
+# your language, you can add {$count} to your translations and use the
+# standard CLDR forms, or only use the form for [other] if both strings should
+# be identical.
+downloadTrustCheckbox =
+    { $count ->
+        [one] Confío en a persona que ha ninviau este fichero
+       *[other] Confío en a persona que ha ninviau estes fichers
+    }
+# This string has a special case for '1' and [other] (default). If necessary for
+# your language, you can add {$count} to your translations and use the
+# standard CLDR forms, or only use the form for [other] if both strings should
+# be identical.
+reportFile =
+    { $count ->
+        [one] Sinyalar este fichero como sospeitoso
+       *[other] Sinyalar estes fichers como sospeitoso
+    }
+reportDescription = Aduya-nos a comprender qué ha pasau. Quál creyes que ye lo problema con estes fichers?
+reportUnknownDescription = Vest ta la URL d'o vinclo que quiers sinyalar y fe clic en « { reportFile } ».
+reportButton = Informar
+reportReasonMalware = Estes fichers contienen malware u fan parte d'un ataque de phishing.
+reportReasonPii = Estes fichers contienen información personal identificable sobre yo.
+reportReasonAbuse = Estes fichers contienen conteniu ilegal u abusivo.
+reportReasonCopyright = Pa informar sobre una violación de dreitos d'autor u de marca, sigue lo procedimiento descrito en <a>esta pachina</a>.
+reportedTitle = Fichers sinyalaus
+reportedDescription = Gracias. Hemos recibiu lo tuyo informe sobre estes fichers.

public/locales/ar/send.ftl

@@ -1,31 +1,9 @@
 # Firefox Send is a brand name and should not be localized.
 title = فَيَرفُكس سِنْد
-siteSubtitle = تجربة وِبّيّة
 siteFeedback = الانطباعات
-uploadPageHeader = شارِك ملفاتك بخصوصية وتعمية
-uploadPageExplainer = أرسل الملفات عبر رابط آمن خاص ومعمّى تنتهي صلاحيته تلقائيا لتضمن عدم بقاء ما ترسله إلى الأبد.
-uploadPageLearnMore = اطّلع على المزيد
-uploadPageDropMessage = أسقِط ملفّك هنا لبدء الرفع
-uploadPageSizeMessage = لتتحصل على أفضل تجربة، من المستحسن أن يكون الملف أصغر من 1 غ.بايت
-uploadPageBrowseButton = اختر ملفًا على حاسوبك
-uploadPageBrowseButton1 = اختر ملفّا لرفعه
-uploadPageMultipleFilesAlert = رفع عدة ملفات (أو رفع مجلد) ليس مدعوما حاليا.
-uploadPageBrowseButtonTitle = ارفع ملفًا
-uploadingPageProgress = يرفع { $filename } ({ $size })
 importingFile = يستورد…
-verifyingFile = يتحقق…
 encryptingFile = يعمّي…
 decryptingFile = يفك التعمية…
-notifyUploadDone = انتهى الرفع.
-uploadingPageMessage = ما إن يُرفع الملف سيُتاح ضبط خيارات انتهاء صلاحيته.
-uploadingPageCancel = ألغِ الرفع
-uploadCancelNotification = أُلغي الرفع.
-uploadingPageLargeFileMessage = هذا الملف كبير الحجم وسيأخذ رفعه وقتا. انتظر رجاءً.
-uploadingFileNotification = أعلِمني عندما يكتمل الرفع.
-uploadSuccessConfirmHeader = جاهز للإرسال
-uploadSvgAlt = ارفع
-uploadSuccessTimingHeader = ستنتهي صلاحية الرابط الذي يشير إلى الملف في حال: نُزِّل لأول مرة، أو مرّ ٢٤ ساعة على رفعه.
-expireInfo = ستنتهي صلاحية رابط الملف بعد { $downloadCount } أو { $timespan }.
 downloadCount =
     { $num ->
         [zero] لا تنزيلات
@@ -44,76 +22,26 @@ timespanHours =
         [many] { $num } ساعة
        *[other] { $num } ساعة
     }
-copyUrlFormLabelWithName = انسخ الرابط وشاركه لإرسال الملف: { $filename }
-copyUrlFormButton = انسخ إلى الحافظة
 copiedUrl = نُسخ!
-deleteFileButton = احذف الملف
-sendAnotherFileLink = أرسِل ملفًا آخر
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = نزّل
-downloadsFileList = التنزيلات
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = الوقت
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = نزّل { $filename }
-downloadFileSize = ({ $size })
-unlockInputLabel = أدخل كلمة السر
 unlockInputPlaceholder = كلمة السر
 unlockButtonLabel = افتح القفل
-downloadFileTitle = نزِّل الملف المعمّى
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = يُرسل إليك صديقك ملفا عبر «فَيَرفُكس سِنْد»، وهي خدمة تتيح لك مشاركة الملفات عبر رابط آمن وخاص ومعمّى، حيث تنتهي صلاحياتها تلقائيا لتضمن عدم بقاء ما ترسله إلى الأبد.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = نزّل
-downloadNotification = لقد اكتمل التنزيل.
 downloadFinish = اكتمل التنزيل
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
 fileSizeProgress = ({ $partialSize } من أصل { $totalSize })
-# Firefox Send is a brand name and should not be localized.
 sendYourFilesLink = جرِّب «فَيَرفُكس سِنْد»
-downloadingPageProgress = ينزّل { $filename } ({ $size })
-downloadingPageMessage = رجاء أبقِ هذا اللسان مفتوحا حتى نجلب الملف ونفك تعميته.
-errorAltText = خطأ أثناء الرفع
 errorPageHeader = حدث خطب ما.
-errorPageMessage = حدث خطب ما أثناء رفع الملف.
-errorPageLink = أرسل ملفا آخر
 fileTooBig = حجم الملف كبير للغاية لرفعه. يجب أن يكون أصغر من { $size }.
 linkExpiredAlt = انتهت صلاحية الرابط
-expiredPageHeader = انتهت صلاحية هذا الرابط أو لم يكن موجودا في المقام الأول!
 notSupportedHeader = متصفحك غير مدعوم.
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = للأسف فإن متصفحك لا يدعم تقنية الوِب التي يعتمد عليها «فَيَرفُكس سِنْد». عليك تجربة متصفح آخر، ونحن ننصحك بِفَيَرفُكس!
 notSupportedLink = لماذا متصفحي غير مدعوم؟
 notSupportedOutdatedDetail = للأسف فإن إصدارة فَيَرفُكس هذه لا تدعم تقنية الوِب التي يعتمد عليها «فَيَرفُكس سِنْد». عليك تحديث متصفحك.
 updateFirefox = حدّث فَيَرفُكس
-downloadFirefoxButtonSub = تنزيل مجاني
-uploadedFile = ملف
-copyFileList = انسخ الرابط
-# expiryFileList is used as a column header
-expiryFileList = ينتهي في
-deleteFileList = احذف
-nevermindButton = لا بأس
-legalHeader = الشروط والخصوصية
-legalNoticeTestPilot = «فَيَرفُكس سِنْد» جزء من اختبار تجريبي حاليًا و يخضع <a>لبنود خدمة</a> الاختبار التجريبي و <a>تنويه الخصوصية</a>. يمكنك التعرف على مزيد من المعلومات حول هذه التجربة وجمع البيانات<a>هنا</a>.
-legalNoticeMozilla = يخضع استخدام موقع «فَيَرفُكس سِنْد» إلى<a>تنويه خصوصية المواقع</a> و <a>بنود خدمة المواقع</a>.
-deletePopupText = أأحذف هذا الملف؟
-deletePopupYes = نعم
 deletePopupCancel = ألغِ
 deleteButtonHover = احذف
-copyUrlHover = انسخ الرابط
 footerLinkLegal = القانونية
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = حول الاختبار التجريبي
 footerLinkPrivacy = الخصوصية
-footerLinkTerms = الشروط
 footerLinkCookies = الكعكات
-requirePasswordCheckbox = اطلب كلمة سر لتنزيل هذا الملف
-addPasswordButton = أضِف كلمة سر
-changePasswordButton = غيّر
 passwordTryAgain = كلمة السر خاطئة. أعِد المحاولة.
-reportIPInfringement = أبلغ عن انتهاك للملكية الفكرية
 javascriptRequired = يتطلب فَيَرفُكس سِنْد جافاسكربت
 whyJavascript = لماذا يتطلب فَيَرفُكس سِنْد جافاسكربت؟
 enableJavascript = رجاء فعّل جافاسكربت ثم أعد المحاولة.
@@ -121,9 +49,143 @@ enableJavascript = رجاء فعّل جافاسكربت ثم أعد المحاو
 expiresHoursMinutes = { $hours }س { $minutes }د
 # A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
 expiresMinutes = { $minutes }د
-# A short status message shown when a password is successfully set
-passwordIsSet = ضُبطت كلمة السر
 # A short status message shown when the user enters a long password
 maxPasswordLength = أقصر طول لكلمة السر: { $length }
 # A short status message shown when there was an error setting the password
 passwordSetError = يجب ألا تُضبط كلمة السر هذه
+
+## Send version 2 strings
+
+# Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
+-send-brand = Firefox Send
+-send-short-brand = Send
+-firefox = Firefox
+-mozilla = Mozilla
+introTitle = شارِك ملفاتك بلا عناء وبخصوصية تامة
+introDescription = يتيح لك { -send-brand } مشاركة الملفات عبر تعميتها من الطرفين وإتاحتها في رابط ينقضي أجله تلقائيا. هكذا يمكنك إبقاء ما شاركته خاصًا فتضمن بأن ملفاتك لن تبقى في الوِب أبد الدهر.
+notifyUploadEncryptDone = اكتملت تعمية الملف وأصبح جاهزًا لإرساله
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = ينقضي بعد { $downloadCount } أو { $timespan }
+timespanMinutes =
+    { $num ->
+        [zero] أقل من دقيقة
+        [one] دقيقة واحدة
+        [two] دقيقتين اثنتين
+        [few] { $num } دقائق
+        [many] { $num } دقيقة
+       *[other] { $num } دقيقة
+    }
+timespanDays =
+    { $num ->
+        [zero] أقل من يوم
+        [one] يوم واحد
+        [two] يومين اثنين
+        [few] { $num } أيام
+        [many] { $num } يومًا
+       *[other] { $num } يوم
+    }
+timespanWeeks =
+    { $num ->
+        [zero] أقل من أسبوع
+        [one] أسبوع واحد
+        [two] أسبوعين اثنين
+        [few] { $num } أسابيع
+        [many] { $num } أسبوعًا
+       *[other] { $num } أسبوع
+    }
+fileCount =
+    { $num ->
+        [zero] { $num } ملف
+        [one] ملف واحد
+        [two] ملفان اثنان
+        [few] { $num } ملفات
+        [many] { $num } ملفًا
+       *[other] { $num } ملف
+    }
+# byte abbreviation
+bytes = بايت
+# kibibyte abbreviation
+kb = ك.بايت
+# mebibyte abbreviation
+mb = م.بايت
+# gibibyte abbreviation
+gb = ج.بايت
+# localized number and byte abbreviation. example "2.5MB"
+fileSize = { $num } { $units }
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+totalSize = إجمالي الحجم: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = انسخ هذا الرابط لتُشارك الملف:
+copyLinkButton = انسخ الرابط
+downloadTitle = نزّل الملفات
+downloadDescription = شارك أحد هذا الملف معك عبر { -send-brand } وعمّاه بتعمية من الطرفين وبرابط ينقضي أجله تلقائيا.
+trySendDescription = جرِّب { -send-brand } وشارِك ملفاتك بلا عناء وبخصوصية تامة.
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [zero] لا يمكنك تنزيل أي ملف في آن واحد.
+        [one] لا يمكنك تنزيل ما يزيد على ملف واحد في آن واحد.
+        [two] لا يمكنك تنزيل ما يزيد على ملفين اثنين في آن واحد.
+        [few] لا يمكنك تنزيل ما يزيد على { $count } ملفات في آن واحد.
+        [many] لا يمكنك تنزيل ما يزيد على { $count } ملفًا في آن واحد.
+       *[other] لا يمكنك تنزيل ما يزيد على { $count } ملف في آن واحد.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [zero] الأرشيفات ممنوعة.
+        [one] لا يُسمح إلا بأرشيف واحد.
+        [two] لا يُسمح إلا بأرشيفين اثنين.
+        [few] لا يُسمح إلا ب‍ { $count } أرشيفات.
+        [many] لا يُسمح إلا ب‍ { $count } أرشيفًا.
+       *[other] لا يُسمح إلا ب‍ { $count } أرشيف.
+    }
+expiredTitle = انقضى وقت الرابط.
+notSupportedDescription = لن يعمل { -send-brand } في هذا المتصفح. أفضل المتصفحات التي يعمل معها { -send-short-brand } هو { -firefox } بآخر إصدارة، كما وأحدث إصدارة من أغلب المتصفحات الموجودة.
+downloadFirefox = نزِّل { -firefox }
+legalTitle = تنويه خصوصية { -send-short-brand }
+legalDateStamp = الإصدارة ١٫٠ بتاريخ ١٢ مارس ٢٠١٩
+# A short representation of a countdown timer containing the number of days, hours, and minutes remaining as digits, example "2d 11h 56m"
+expiresDaysHoursMinutes = { $days }يوم { $hours }سا { $minutes }دق
+addFilesButton = حدّد الملفات التي تريد رفعها
+uploadButton = ارفع
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = اسحب الملفات وأفلِتها هنا
+# the second part of the string 'Drag and drop files or click to send up to 1GB'
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+orClickWithSize = أو انقر لإرسال ملفات يصل حجمها { $size }
+addPassword = احمِه بكلمة سر
+emailPlaceholder = أدخل بريدك الإلكتروني
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+signInSizeBump = لِج وأرسِل ملفات يصل حجمها { $size }
+signInOnlyButton = لِج
+accountBenefitTitle = أنشِئ حساب { -firefox } أو لِج إلى حسابك
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+accountBenefitLargeFiles = شارِك ملفات يصل حجمها { $size }
+accountBenefitDownloadCount = شارِك الملفات مع أناس أكثر وأكثر
+accountBenefitTimeLimit =
+    { $count ->
+        [zero] لا تُبقِ أي روابط نشطة
+        [one] أبقِ الروابط نشطة لمدة تصل إلى يوم واحد
+        [two] أبقِ الروابط نشطة لمدة تصل إلى يومين اثنين
+        [few] أبقِ الروابط نشطة لمدة تصل إلى { $count } أيام
+        [many] أبقِ الروابط نشطة لمدة تصل إلى { $count } يومًا
+       *[other] أبقِ الروابط نشطة لمدة تصل إلى { $count } يوم
+    }
+accountBenefitSync = أدِر ملفاتك التي شاركتها من أيّ جهاز تريد
+accountBenefitMoz = اطّلع على المزيد حول خدمات { -mozilla }
+signOut = اخرج
+okButton = حسنًا
+downloadingTitle = يجري التنزيل
+noStreamsWarning = هناك احتمال بألا يقدر هذا المتصفح على فكّ تعمية الملفات الكبيرة كهذا.
+noStreamsOptionCopy = انسخ الرابط لتفتحه في متصفح آخر
+noStreamsOptionFirefox = جرّب متصفّحنا المفضل
+noStreamsOptionDownload = واصِل بهذا المتصفح
+downloadFirefoxPromo = ‏{ -send-short-brand } تقدمة { -firefox } الجديد الأنيق.
+# the next line after the colon contains a file name
+shareLinkDescription = شارِك الرابط الذي يصل إلى الملف:
+shareLinkButton = شارِك الرابط
+# $name is the name of the file
+shareMessage = نزِّل ”{ $name }“ عبر { -send-brand }: خدمة لمشاركة الملفات بلا عناء وبخصوصية تامة
+trailheadPromo = يمكنك حماية خصوصيتك، طبعا. انضم إلى فَيَرفُكس.
+learnMore = اطّلع على المزيد.

public/locales/ast/send.ftl

@@ -1,31 +1,8 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = esperimentu web
-siteFeedback = Feedback
-uploadPageHeader = Compartición privada y cifrada de ficheros
-uploadPageExplainer = Unvia ficheros pente un enllaz seguru, priváu y cifráu que caduca automáticamente p'asegurar que les tos coses nun queden siempres na rede.
-uploadPageLearnMore = Deprendi más
-uploadPageDropMessage = Suelta equí'l to ficheru p'aniciar la xuba
-uploadPageSizeMessage = Pal meyor funcionamientu, lo meyor ye que'l to ficheru seya menor de 1GB
-uploadPageBrowseButton = Esbilla un ficheru nel to ordenador
-uploadPageBrowseButton1 = Esbilla un ficheru pa unviar
-uploadPageMultipleFilesAlert = Anguaño nun se sofita la xuba múltiple de ficheros o carpetes.
-uploadPageBrowseButtonTitle = Xubir ficheru
-uploadingPageProgress = Xubiendo { $filename } ({ $size })
 importingFile = Importando...
-verifyingFile = Verificando...
 encryptingFile = Cifrando...
 decryptingFile = Descifrando...
-notifyUploadDone = Finó la to xuba.
-uploadingPageMessage = Namái que'l ficheru xuba, sedrás a afitar les opciones de caducidá.
-uploadingPageCancel = Encaboxar xuba
-uploadCancelNotification = Encaboxóse la to xuba.
-uploadingPageLargeFileMessage = Esti ficheru ye grande y pue entardar daqué en xubir. ¡Paciencia!
-uploadingFileNotification = Avísame cuando se complete la xuba.
-uploadSuccessConfirmHeader = Preparáu pa unviar
-uploadSvgAlt = Xubir
-uploadSuccessTimingHeader = L'enllaz del to ficheru caducará dempués d'una descarga o en 24 hores.
-expireInfo = L'enllaz al ficheru va caducar tres { $downloadCount } o { $timespan }.
 downloadCount =
     { $num ->
         [one] 1 descarga
@@ -36,75 +13,26 @@ timespanHours =
         [one] 1 hora
        *[other] { $num } hores
     }
-copyUrlFormLabelWithName = Copia y comparti l'enllaz pa unviar el to ficheru: { $filename }
-copyUrlFormButton = Copiar al cartafueyu
 copiedUrl = ¡Copióse!
-deleteFileButton = Desaniciar ficheru
-sendAnotherFileLink = Unviar otru ficheru
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = Baxar
-downloadsFileList = Descargues
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = Tiempu
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = Baxar { $filename }
-downloadFileSize = ({ $size })
-unlockInputLabel = Introducir contraseña
 unlockInputPlaceholder = Contraseña
 unlockButtonLabel = Desbloquiar
-downloadFileTitle = Baxar ficheru cifráu
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = El to collaciu unvióte un ficheru usando Firefox Send, un serviciu que te permite compartir ficheros con un enllaz seguru, priváu y cifráu que caduca automáticamente p'asegurar que les to coses nun queden siempres na rede.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = Baxar
-downloadNotification = Completóse la to descarga.
-downloadFinish = Descarga completada
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
+downloadFinish = Completóse la descarga
 fileSizeProgress = ({ $partialSize } de { $totalSize })
-# Firefox Send is a brand name and should not be localized.
-sendYourFilesLink = Prueba Firefox Send
-downloadingPageProgress = Baxando { $filename } ({ $size })
-downloadingPageMessage = Dexa esta llingüeta abierta entrín vamos en cata del to ficheru y lu desciframos, por favor.
-errorAltText = Fallu de xuba
-errorPageHeader = ¡Daqué foi mal!
-errorPageMessage = Hebo un fallu xubiendo'l ficheru.
-errorPageLink = Unviar otru ficheru
+sendYourFilesLink = Probar Firefox Send
+errorPageHeader = ¡Asocedió daqué malo!
 fileTooBig = Esti ficheru ye mui grande como pa xubilu. Debería tener menos de { $size }.
-linkExpiredAlt = Enllaz caducáu
-expiredPageHeader = ¡Esti enllaz caducó o enxamás nun esistó!
+linkExpiredAlt = Caducó l'enllaz
 notSupportedHeader = El to restolador nun ta sofitáu.
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = Desafortunadamente esti restolador nun sofita la teunoloxía web qu'usa Firefox Send. Precisarás d'usar otru restolador. ¡Aconseyámoste Firefox!
 notSupportedLink = ¿Por qué'l mio restolador nun ta sofitáu?
-notSupportedOutdatedDetail = Desafortunadamente esta versión de Firefox nun sofita la teunoloxía web qu'usa Firefox Send. Precisarás d'anovar Firefox.
+notSupportedOutdatedDetail = Desafortunadamente esta versión de Firefox nun sofita la teunoloxía web qu'usa Firefox Send. Vas precisar anovar el restolador.
 updateFirefox = Anovar Firefox
-downloadFirefoxButtonSub = Descarga de baldre
-uploadedFile = Ficheru
-copyFileList = Copiar URL
-# expiryFileList is used as a column header
-expiryFileList = Caduca en
-deleteFileList = Desaniciar
-nevermindButton = Nun m'importa
-legalHeader = Términos y privacidá
-legalNoticeTestPilot = Anguaño Firefox Send ye un esperimentu de Test Pilot y ta suxetu a los <a>Términos de serviciu</a> y l'<a>Avisu de privacidá</a> de Test Pilot. <a>Equí</a> pues deprender más tocante a esti esperimentu y la so recoyida de datos.
-legalNoticeMozilla = L'usu de Firefox Send tamién ta suxetu al <a>Avisu de privacidá</a> y a los <a>Términos d'usu de la páxina web</a> de Mozilla.
-deletePopupText = ¿Desaniciar esti ficheru?
-deletePopupYes = Sí
 deletePopupCancel = Encaboxar
 deleteButtonHover = Desaniciar
-copyUrlHover = Copiar URL
 footerLinkLegal = Llegal
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = Tocante a Test Pilot
 footerLinkPrivacy = Privacidá
-footerLinkTerms = Términos
 footerLinkCookies = Cookies
-requirePasswordCheckbox = Riquir una contraseña pa baxar esti ficheru
-addPasswordButton = Amestar contraseña
-changePasswordButton = Camudar
-passwordTryAgain = Contraseña incorreuta. Volvi tentalo.
+passwordTryAgain = La contraseña ye incorreuta. Volvi tentalo.
 javascriptRequired = Firefox Send rique JavaScript
 whyJavascript = ¿Por qué Firefox Send rique JavaScript?
 enableJavascript = Activa JavaScript y volvi tentalo, por favor.
@@ -112,9 +40,113 @@ enableJavascript = Activa JavaScript y volvi tentalo, por favor.
 expiresHoursMinutes = { $hours }h { $minutes }m
 # A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
 expiresMinutes = { $minutes }m
-# A short status message shown when a password is successfully set
-passwordIsSet = Afitóse la contraseña
 # A short status message shown when the user enters a long password
 maxPasswordLength = Llargor máximu de la contraseña: { $length }
 # A short status message shown when there was an error setting the password
 passwordSetError = Nun pudo afitase esta contraseña
+
+## Send version 2 strings
+
+# Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
+-send-brand = Firefox Send
+-send-short-brand = Send
+-firefox = Firefox
+-mozilla = Mozilla
+introTitle = Compartición de ficheros privada y cenciella
+introDescription = { -send-brand } déxate compartir ficheros con cifráu puntu a puntu y un enllaz que caduca automáticamente. D'esti mou, asegúreste de que lo que compartes ye privao y nun va tar siempres en llinia.
+notifyUploadEncryptDone = El ficheru ta cifráu y preparáu pa unviase
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = Caduca dempués de { $downloadCount } ó { $timespan }
+timespanMinutes =
+    { $num ->
+        [one] 1 minutu
+       *[other] { $num } minutos
+    }
+timespanDays =
+    { $num ->
+        [one] 1 día
+       *[other] { $num } díes
+    }
+timespanWeeks =
+    { $num ->
+        [one] 1 selmana
+       *[other] { $num } selmanes
+    }
+fileCount =
+    { $num ->
+        [one] 1 ficheru
+       *[other] { $num } ficheros
+    }
+# byte abbreviation
+bytes = B
+# kibibyte abbreviation
+kb = KB
+# mebibyte abbreviation
+mb = MB
+# gibibyte abbreviation
+gb = GB
+# localized number and byte abbreviation. example "2.5MB"
+fileSize = { $num }{ $units }
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+totalSize = Tamañu total: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = Copia l'enllaz pa compartir el ficheru:
+copyLinkButton = Copiar l'enllaz
+downloadTitle = Descarga de ficheros
+downloadDescription = Esti ficheru compartióse per { -send-brand } con cifráu puntu a puntu y un enllaz que caduca automáticamente.
+trySendDescription = Prueba { -send-brand } pa una compartición de ficheros cenciella y segura.
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [one] Namás pue xubise 1 ficheru al empar.
+       *[other] Namás puen xubise { $count } ficheros al empar.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [one] Namás se permite 1 archivu
+       *[other] Namás se permiten { $count } archivos
+    }
+expiredTitle = Esti enllaz caducó.
+notSupportedDescription = { -send-brand } nun va funcionar con esti restolador. { -send-short-brand } funciona meyor cola última versión de { -firefox } y l'actual de la mayoría de restoladores.
+downloadFirefox = Baxar { -firefox }
+legalTitle = Avisu de privacidá de { -send-short-brand }
+legalDateStamp = Versión 1.0, con data del 12 de marzu de 2019
+# A short representation of a countdown timer containing the number of days, hours, and minutes remaining as digits, example "2d 11h 56m"
+expiresDaysHoursMinutes = { $days }d { $hours }h { $minutes }m
+addFilesButton = Esbillar los ficheros a unviar
+trustWarningMessage = Asegúrate de que t'enfotes nel destinatariu al compartir datos sensibles.
+uploadButton = Xubir
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = Arrastra y suelta ficheros
+# the second part of the string 'Drag and drop files or click to send up to 1GB'
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+orClickWithSize = o calca pa unviar hasta { $size }
+addPassword = Protexer con una contraseña
+emailPlaceholder = Introduz el to corréu
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+signInSizeBump = Anicia sesión pa unviar hasta { $size }
+signInOnlyButton = Aniciar sesión
+accountBenefitTitle = Creación d'una cuenta de { -firefox } o aniciu de sesión nella
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+accountBenefitLargeFiles = Comparti ficheros d'hasta { $size }
+accountBenefitDownloadCount = Comparti ficheros con más xente
+accountBenefitTimeLimit =
+    { $count ->
+        [one] Caltién activos los enllaces demientres 1 día
+       *[other] Caltién activos los enllaces demientres { $count } díes
+    }
+accountBenefitSync = Xestiona los ficheros compartíos dende cualesquier preséu
+accountBenefitMoz = Deprendi más tocante a otros servicios de { -mozilla }
+signOut = Zarrar sesión
+okButton = Aceutar
+downloadingTitle = Baxando
+noStreamsWarning = Esti restolador quiciabes nun seya a descifrar un ficheru d'esti tamañu.
+trailheadPromo = Hai un mou de protexer la to privacidá. Xúnite a Firefox.
+learnMore = Deprender más.
+downloadFlagged = Esti enllaz desactivóse por violar los términos del serviciu.
+downloadConfirmTitle = Una cosa más
+reportReasonMalware = Estos ficheros contienen malware o son parte d'un ataque de phishing
+reportReasonPii = Estos ficheros contienen información que m'identifica.
+reportReasonAbuse = Estos ficheros contienen conteníu illegal o abusivu.
+reportedDescription = Gracies. Recibiemos l'informe tocante a estos ficheros.

public/locales/az/send.ftl

@@ -1,31 +1,9 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = web eksperiment
 siteFeedback = Geri dönüş
-uploadPageHeader = Məxfi, Şifrələnmiş Fayl Paylaşma
-uploadPageExplainer = Fayllarınızı təhlükəsiz, məxfi, şifrələnmiş və daima onlayn qalmaması üçün avtomatik silinən keçidlə göndərin.
-uploadPageLearnMore = Ətraflı öyrən
-uploadPageDropMessage = Yükləmək üçün faylınızı buraya daşıyın
-uploadPageSizeMessage = Xidmətin daha yaxşı işləməsi üçün faylınız 1 GB-dan az olmalıdır
-uploadPageBrowseButton = Kompüterinizdən fayl seçin
-uploadPageBrowseButton1 = Yüklənəcək faylı seçin
-uploadPageMultipleFilesAlert = Birdən çox fayl və ya qovluq yükləmə hələlik dəstəklənmir.
-uploadPageBrowseButtonTitle = Fayl yüklə
-uploadingPageProgress = { $filename } ({ $size }) yüklənir
 importingFile = İdxal edilir…
-verifyingFile = Təsdiqlənir…
 encryptingFile = Şifrələnir...
 decryptingFile = Şifrə açılır...
-notifyUploadDone = Yükləməniz hazırdır.
-uploadingPageMessage = Faylınız yükləndikdən sonra vaxtı çıxma seçimlərini qura biləcəksiz.
-uploadingPageCancel = Yükləməni ləğv et
-uploadCancelNotification = Yükləməniz ləğv edildi.
-uploadingPageLargeFileMessage = Fayl böyükdür və yükləmək çox vaxt ala bilər. Səbirli olun!
-uploadingFileNotification = Yükləmə bitdiyində xəbər ver.
-uploadSuccessConfirmHeader = Göndərməyə hazır
-uploadSvgAlt = Yüklə
-uploadSuccessTimingHeader = Faylınızın keçidinin 1 endirmədən və ya 24 saatdan sonra vaxtı çıxacaq.
-expireInfo = Faylınız üçün keçidin vaxtı { $downloadCount } sonra və ya { $timespan } tarixində keçəcək.
 downloadCount =
     { $num ->
         [one] 1 endirmə
@@ -36,76 +14,26 @@ timespanHours =
         [one] 1 saat
        *[other] { $num } saat
     }
-copyUrlFormLabelWithName = Faylınızı göndərmək üçün keçidi köçürün: { $filename }
-copyUrlFormButton = Buferə köçür
 copiedUrl = Köçürüldü!
-deleteFileButton = Faylı sil
-sendAnotherFileLink = Başqa fayl göndər
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = Endir
-downloadsFileList = Endirmələr
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = Vaxt
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = { $filename } faylını endir
-downloadFileSize = ({ $size })
-unlockInputLabel = Parol daxil edin
 unlockInputPlaceholder = Parol
 unlockButtonLabel = Aç
-downloadFileTitle = Şifrələnmiş Faylı Endir
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = Yoldaşınız Firefox Send ilə sizə fayl göndərir, fayllarınızı təhlükəsiz, məxfi, şifrələnmiş və daima onlayn qalmaması üçün avtomatik silən fayl göndərmə xidməti.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = Endir
-downloadNotification = Endirməniz tamamlandı.
 downloadFinish = Endirmə Tamamlandı
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
 fileSizeProgress = ({ $partialSize } / { $totalSize })
-# Firefox Send is a brand name and should not be localized.
 sendYourFilesLink = Firefox Send Yoxla
-downloadingPageProgress = { $filename } faylı ({ $size }) endirilir
-downloadingPageMessage = Lütfən faylı endirib şifrəsini açarkən vərəqi açıq buraxın.
-errorAltText = Yükləmə xətası
 errorPageHeader = Nəsə səhv getdi!
-errorPageMessage = Faylı yüklərkən xəta baş verdi.
-errorPageLink = Başqa fayl göndər
 fileTooBig = Fayl yükləmək üçün çox böyükdür. Fayl { $size }-dan az olmalıdır.
 linkExpiredAlt = Keçidin vaxtı çıxıb
-expiredPageHeader = Keçidin vaxtı çıxıb və ya heç vaxt olmayıb!
 notSupportedHeader = Səyyahınız dəstəklənmir.
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = Heyf ki, bu səyyah Firefox Send-ə güc verən web texnologiyalarını dəstəkləmir. Fərqli bir səyyah yoxlamalısınız. Biz Firefox məsləhət görürük!
 notSupportedLink = Səyyahım niyə dəstəklənmir?
 notSupportedOutdatedDetail = Heyf ki, Firefox səyyahının bu versiyası Firefox Send-ə güc verən web texnologiyalarını dəstəkləmir. Səyyahınızı yeniləməlisiniz.
 updateFirefox = Firefox-u Yenilə
-downloadFirefoxButtonSub = Pulsuz Endir
-uploadedFile = Fayl
-copyFileList = Keçidi Köçürt
-# expiryFileList is used as a column header
-expiryFileList = Vaxtı çıxma tarixi
-deleteFileList = Sil
-nevermindButton = Vacib deyil
-legalHeader = Şərtlər və Məxfilik
-legalNoticeTestPilot = Firefox Send Test Pilot eksperimentidir, Test Pilot <a>Xidmət Şərtləri</a> və <a>Məxfilik Bildirişi</a>-nə tabedir. Bu eksperiment və məlumat yığma haqqında <a>buradan</a> öyrənə bilərsiz.
-legalNoticeMozilla = Firefox Send saytının istifadəsi həmçinin Mozilla-nın <a>Saytlar üçün Məxfilik Bildirişi</a> və <a>Sayt İstifadə Şərtləri</a>-nə tabedir.
-deletePopupText = Fayl silinsin?
-deletePopupYes = Bəli
 deletePopupCancel = Ləğv et
 deleteButtonHover = Sil
-copyUrlHover = Keçidi Köçürt
 footerLinkLegal = Hüquqi
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = Test Pilot Haqqında
 footerLinkPrivacy = Məxfilik
-footerLinkTerms = Şərtlər
 footerLinkCookies = Çərəzlər
-requirePasswordCheckbox = Bu faylı endirmək üçün parol tələb et
-addPasswordButton = Parol əlavə et
-changePasswordButton = Dəyişdir
 passwordTryAgain = Səhv parol. Təkrar yoxlayın.
-reportIPInfringement = Əqli-mülkiyyət pozuntusu bildir
 javascriptRequired = Firefox Send üçün JavaScript lazımdır
 whyJavascript = Firefox Send niyə JavaScript tələb edir?
 enableJavascript = Lütfən JavaScript-i aktiv edib təkrar yoxlayın.
@@ -113,9 +41,32 @@ enableJavascript = Lütfən JavaScript-i aktiv edib təkrar yoxlayın.
 expiresHoursMinutes = { $hours } saat { $minutes } dəq
 # A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
 expiresMinutes = { $minutes } dəq
-# A short status message shown when a password is successfully set
-passwordIsSet = Parol quruldu
 # A short status message shown when the user enters a long password
 maxPasswordLength = Maksimum parol uzunluğu: { $length }
 # A short status message shown when there was an error setting the password
 passwordSetError = Parol qurula bilmədi
+
+## Send version 2 strings
+
+# Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
+-send-brand = Firefox Send
+-send-short-brand = Send
+-firefox = Firefox
+-mozilla = Mozilla
+# byte abbreviation
+bytes = B
+# kibibyte abbreviation
+kb = KB
+# mebibyte abbreviation
+mb = MB
+# gibibyte abbreviation
+gb = GB
+# localized number and byte abbreviation. example "2.5MB"
+fileSize = { $num }{ $units }
+copyLinkButton = Keçidi köçür
+uploadButton = Yüklə
+signInOnlyButton = Daxil ol
+signOut = Çıx
+okButton = Tamam
+downloadingTitle = Endirilir
+shareLinkButton = Keçidi paylaş

public/locales/azz/send.ftl

@@ -0,0 +1,146 @@
+# Firefox Send is a brand name and should not be localized.
+title = Firefox Send
+siteFeedback = Nikan uelis tikijkuilos tein tiknemilijtos
+importingFile = Mokalakijtok…
+encryptingFile = Motatijtok…
+decryptingFile = Kichiujtok se uelis kiixtajtoltis ya…
+downloadCount =
+    { $num ->
+       *[undefined] 1 kitemouijtok / { $num } kintemouijtok
+    }
+timespanHours =
+    { $num ->
+       *[undefined] 1 hora / { $num } hora
+    }
+copiedUrl = ¡Moixkopinak!
+unlockInputPlaceholder = Ichtakatajtol
+unlockButtonLabel = Xikajchiua tein amo kikaua maj tekiti
+downloadButtonLabel = Xiktemoui
+downloadFinish = Nochi motemouij ya
+fileSizeProgress = ({ $partialSize } itech { $totalSize })
+sendYourFilesLink = Xikejeko Firefox Send
+errorPageHeader = ¡Tensa amo kuali kisak!
+fileTooBig = Nejin tajkuilol semi ueyi. Moneki amo panos { $size }
+linkExpiredAlt = Nejin tein tikpatskilij amo tekititok ya
+notSupportedHeader = Monavegador amo kualtia.
+notSupportedLink = ¿Keyej nonavegador amo kualtia?
+notSupportedOutdatedDetail = Tetayokoltij, Firefox tein tikuitok amo kiselia tepostekitilis tecnología web tein ika tekiti Firefox Send. Moneki tikyankuilis monavegador.
+updateFirefox = Maj Firefox  moyankuili
+deletePopupCancel = Maj motsakuili uan amo tami tein kichiujtok
+deleteButtonHover = Maj majchiua
+footerLinkLegal = Keniuj motekitiltis
+footerLinkPrivacy = Keniuj tikyekpiaj tein tikseliaj
+footerLinkCookies = Cookies
+passwordTryAgain = Amo yektik ichtakatajtol. Oksepa xikijkuilo.
+javascriptRequired = Firefox Send kineki maj moajsi JavaScript
+whyJavascript = ¿Keyej Firefox Send kineki maj moajsi JavaScript?
+enableJavascript = Se kualtakayot, xikaua maj peua tekiti JavaScript uan oksepa xikejeko.
+# A short representation of a countdown timer containing the number of hours and minutes remaining as digits, example "13h 47m"
+expiresHoursMinutes = { $hours }h { $minutes }m
+# A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
+expiresMinutes = { $minutes }m
+# A short status message shown when the user enters a long password
+maxPasswordLength = Keniuj ueyak ichtakatajtol, maj amo pano: { $length }
+# A short status message shown when there was an error setting the password
+passwordSetError = Nejin ichtakatajtol amo uel kiixtaliani
+
+## Send version 2 strings
+
+# Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
+-send-brand = Firefox Send
+-send-short-brand = Xiktitani
+-firefox = Firefox
+-mozilla = Mozilla
+introTitle = Amo ouij uan ichtaka xikinpanoltili oksekin motajkuiloluan archivos
+introDescription = { -send-brand } mitspaleuia uan ijkon tikinpanoltilis oksekin motajkuiloluan archivos ika tapoualmej tein amo aksa uelis kiajsikamatis, uan no kitemaka kampa se kipatskilis tein niman ixpoliui. Ijkuin uelis tikichtakaeuas tein tikintitanilis oksekin uan tikyekmatis tein moaxka amo nochipaya mokauas itech Internet.
+notifyUploadEncryptDone = Moarchivo moijkuiloj ya kemej amo akin uelis kiixtajtoltis uan se uelis kititanis ya
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = Poliui ijkuak tiajsis { $downloadCount } oso { $timespan }
+timespanMinutes =
+    { $num ->
+       *[undefined] 1 minuto / { $num } minuto
+    }
+timespanDays =
+    { $num ->
+       *[undefined] 1 tonal / { $num } tonalmej
+    }
+timespanWeeks =
+    { $num ->
+       *[undefined] 1 semana / { $num } semana
+    }
+fileCount =
+    { $num ->
+       *[undefined] 1 archivo / { $num } archivos
+    }
+# byte abbreviation
+bytes = B
+# kibibyte abbreviation
+kb = KB
+# mebibyte abbreviation
+mb = MB
+# gibibyte abbreviation
+gb = GB
+# localized number and byte abbreviation. example "2.5MB"
+fileSize = { $num }{ $units }
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+totalSize = Nochi tamachiua: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = Xikixkopina tein se kipatskilis uan xikinpanoltili oksekin moarchivo:
+copyLinkButton = Xikixkopina tein se kipatskilis
+downloadTitle = Xiktemoui tajkuilolmej archivos
+downloadDescription = Nejin archivo mopanoltij itechkopa { -send-brand } ika tapoualmej tein amo aksa uelis kiajsikamatis, uan no tein ika se kipatskilis tein niman ixpoliui.
+trySendDescription = Xikejeko { -send-brand } ijkon amo ouij uelis tikinpanoltilis oksekin motajkuiloluan archivos uan tikyekmatis ke amo tej kipanos.
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+       *[other] Sayoj { $count } tajkuilolmej archivos uelis tikolochtejkoltis saj.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+       *[other] Sayoj { $count } tajkuilolmej archivos uelis moajsiskej saj.
+    }
+expiredTitle = Nejin tein tikpatskilij amo tekititos ok.
+notSupportedDescription = { -send-brand } amo tekiti ika nejin navegador. { -send-short-brand } okachi kuali tekiti tein ika okachi yankuik { -firefox }, uan no tekitis tein ika okachi yankuikej tel miak navegadores.
+downloadFirefox = Xiktemoui { -firefox }
+legalTitle = { -send-short-brand } tanauatia ika yekpialis tein moaxka itech tepos
+legalDateStamp = Versión 1.0 tein kikixtijkej 12 tonal metsti marzo 2019
+# A short representation of a countdown timer containing the number of days, hours, and minutes remaining as digits, example "2d 11h 56m"
+expiresDaysHoursMinutes = { $days }t { $hours }h { $minutes }m
+addFilesButton = Xikinixpejpena tajkuilolmej archivos tein  tikintejkoltis
+uploadButton = Xiktejkolti
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = Xikintilana uan xikinkajkaua tajkuilolmej archivos
+# the second part of the string 'Drag and drop files or click to send up to 1GB'
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+orClickWithSize = oso xikpatskili uan tiktitanis, sayoj tein amo panoua  { $size }
+addPassword = Xikyekpia ika se ichtakatajtol
+emailPlaceholder = Xikijkuilo mocorreo itech tepos
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+signInSizeBump = Xikalakteua uan uelis tiktitanis tein amo panos { $size }
+signInOnlyButton = Kampa se kalakteua
+accountBenefitTitle = Ximochiuili se cuenta itech { -firefox } oso xikalakteua
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+accountBenefitLargeFiles = Xikintitani tajkuilolmej archivos tein amo panouaj  { $size }
+accountBenefitDownloadCount = Xikintitanili tajkuilolmej archivos oksekin
+accountBenefitTimeLimit =
+    { $count ->
+       *[undefined] Kampa se kipatskilis maj kisentokakan kualtiakan se tonal ok / { $count } tonalmej ok
+    }
+accountBenefitSync = Itech tein yeski tepos xikixyekana motajkuiloluan archivos tein tikinpanoltilij oksekin
+accountBenefitMoz = Okachi tikmatis okseki tapaleuilmej tein kitemaka { -mozilla }
+signOut = Kampa se kisa
+okButton = Kuali yetok
+downloadingTitle = Kitemouijtok
+noStreamsWarning = Xa navegador amo uelis kitalij nejin tajkuilol archivo tein tel ueyi kemej se uelis kiyekixtajtoltis ya.
+noStreamsOptionCopy = Xikixkopina tein se kipatskilis uan ijkon se uelis kitatapos itech okse navegador
+noStreamsOptionFirefox = Xikejeko navegador tein semi techuelita
+noStreamsOptionDownload = Maj niksentoka niktatekiujti nejin navegador
+downloadFirefoxPromo = Yankuik { -firefox } mitsixpantilia { -send-short-brand }.
+# the next line after the colon contains a file name
+shareLinkDescription = Xikinpanoltili oksekin tein se kipatskilis uan teuika motajkuilol archivo:
+shareLinkButton = Kampa se kipatskilis tein uelis tikinpanoltilis oksekin
+# $name is the name of the file
+shareMessage = Xiktemoui “{ $name }” ika { -send-brand }: amo ouij uelis tikinpanoltilis oksekin motajkuiloluan archivos uan tikyekmatis ke amo tej kipanos
+trailheadPromo = Kemaj, uelis tikyekpias tein moaxka itech tepos. Xipoui Firefox.
+learnMore = Xiktemoui tajkuilolmej archivos.

public/locales/be/send.ftl

@@ -0,0 +1,196 @@
+# Firefox Send is a brand name and should not be localized.
+title = Firefox Send
+importingFile = Імпартаванне...
+encryptingFile = Зашыфроўка...
+decryptingFile = Расшыфроўка...
+downloadCount =
+    { $num ->
+        [one] { $num } сцягванне
+        [few] { $num } сцягванні
+       *[many] { $num } сцягванняў
+    }
+timespanHours =
+    { $num ->
+        [one] { $num } гадзіна
+        [few] { $num } гадзіны
+       *[many] { $num } гадзін
+    }
+copiedUrl = Скапіявана!
+unlockInputPlaceholder = Пароль
+unlockButtonLabel = Разблакаваць
+downloadButtonLabel = Сцягнуць
+downloadFinish = Сцягванне скончана
+fileSizeProgress = ({ $partialSize } з { $totalSize })
+sendYourFilesLink = Паспрабуйце Firefox Send
+errorPageHeader = Нешта пайшло не так!
+fileTooBig = Гэты файл надта вялікі. Ён мусіць быць меншым за { $size }
+linkExpiredAlt = Тэрмін дзеяння спасылкі сышоў
+notSupportedHeader = Ваш браўзер не падтрымліваецца.
+notSupportedLink = Чаму мой браўзер не падтрымліваецца?
+notSupportedOutdatedDetail = На жаль, гэтая версія Firefox не падтрымлівае вэб-тэхналогію, што забяспечвае працу Firefox Send. Вам трэба абнавіць свой браўзер.
+updateFirefox = Абнавіць Firefox
+deletePopupCancel = Скасаваць
+deleteButtonHover = Выдаліць
+footerLinkLegal = Прававыя звесткі
+footerLinkPrivacy = Прыватнасць
+footerLinkCookies = Кукі
+passwordTryAgain = Некарэктны пароль. Паспрабуйце зноў.
+javascriptRequired = Для Firefox Send неабходны JavaScript
+whyJavascript = Чаму для Firefox Send неабходны JavaScript?
+enableJavascript = Калі ласка, уключыце JavaScript і паспрабуйце зноў.
+# A short representation of a countdown timer containing the number of hours and minutes remaining as digits, example "13h 47m"
+expiresHoursMinutes = { $hours } г. { $minutes } хв.
+# A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
+expiresMinutes = { $minutes } хв.
+# A short status message shown when the user enters a long password
+maxPasswordLength = Максімальная даўжыня пароля: { $length }
+# A short status message shown when there was an error setting the password
+passwordSetError = Гэты пароль немагчыма паставіць
+
+## Send version 2 strings
+
+# Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
+-send-brand = Firefox Send
+-send-short-brand = Send
+-firefox = Firefox
+-mozilla = Mozilla
+introTitle = Просты і прыватны абмен файламі
+introDescription = { -send-brand } дазваляе вам абменьвацца файламі са скразным шыфраваннем і спасылкамі з абмежаваным тэрмінам дзеяння. Такім чынам, вы можаце дзяліцца файламі прыватна і быць упэўненым, што яны не застануцца ў сеціве назаўжды.
+notifyUploadEncryptDone = Ваш файл зашыфраваны і гатовы да адпраўкі
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = Тэрмін дзеяння сыдзе праз { $downloadCount } або { $timespan }
+timespanMinutes =
+    { $num ->
+        [one] { $num } хвіліна
+        [few] { $num } хвіліны
+       *[many] { $num } хвілін
+    }
+timespanDays =
+    { $num ->
+        [one] { $num } дзень
+        [few] { $num } дні
+       *[many] { $num } дзён
+    }
+timespanWeeks =
+    { $num ->
+        [one] { $num } тыдзень
+        [few] { $num } тыдні
+       *[many] { $num } тыдняў
+    }
+fileCount =
+    { $num ->
+        [one] { $num } файл
+        [few] { $num } файлы
+       *[many] { $num } файлаў
+    }
+# byte abbreviation
+bytes = Б
+# kibibyte abbreviation
+kb = КБ
+# mebibyte abbreviation
+mb = МБ
+# gibibyte abbreviation
+gb = ГБ
+# localized number and byte abbreviation. example "2.5MB"
+fileSize = { $num } { $units }
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+totalSize = Агульны памер: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = Скапіруйце спасылку, каб падзяліцца сваім файлам:
+copyLinkButton = Скапіраваць спасылку
+downloadTitle = Сцягнуць файлы
+downloadDescription = Гэтым файлам падзяліліся праз { -send-brand } са скразным шыфраваннем і спасылкай з абмежаваным тэрмінам дзеяння.
+trySendDescription = Паспрабуйце { -send-brand } для простага і бяспечнага абмену файламі.
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [one] Толькі { $count } файл можна загрузіць за раз.
+        [few] Толькі { $count } файлы можна загрузіць за раз.
+       *[many] Толькі { $count } файлаў можна загрузіць за раз.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [one] Толькі { $count } архіў дазволены.
+        [few] Толькі { $count } архівы дазволены.
+       *[many] Толькі { $count } архіваў дазволена.
+    }
+expiredTitle = Тэрмін дзеяння гэтай спасылкі сышоў.
+notSupportedDescription = { -send-brand } не будзе працаваць у гэтым браўзеры. Лепей за ўсё { -send-short-brand } працуе з апошняй версіяй { -firefox } і будзе працаваць з бягучай версіяй большасці браўзераў.
+downloadFirefox = Сцягнуць { -firefox }
+legalTitle = Палітыка прыватнасці { -send-short-brand }
+legalDateStamp = Версія 1.0 ад 12 сакавіка 2019
+# A short representation of a countdown timer containing the number of days, hours, and minutes remaining as digits, example "2d 11h 56m"
+expiresDaysHoursMinutes = { $days } д. { $hours } г. { $minutes } хв.
+addFilesButton = Выберыце файлы для загрузкі
+trustWarningMessage = Пераканайцеся, што давяраеце атрымальніку, калі дзеліцеся канфідэнцыяльнымі звесткамі.
+uploadButton = Загрузіць
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = Перацягніце файлы сюды
+# the second part of the string 'Drag and drop files or click to send up to 1GB'
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+orClickWithSize = або клікніце, каб адправіць да { $size }:
+addPassword = Абараніць паролем
+emailPlaceholder = Увядзіце сваю электронную пошту
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+signInSizeBump = Увайдзіце, каб адпраўляць да { $size }
+signInOnlyButton = Увайсці
+accountBenefitTitle = Стварыце ўліковы запіс { -firefox } або ўвайдзіце
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+accountBenefitLargeFiles = Дзяліцеся файламі да { $size }
+accountBenefitDownloadCount = Дзяліцеся файламі з большай колькасцю людзей
+accountBenefitTimeLimit =
+    { $count ->
+        [one] Трымайце спасылкі актыўнымі да { $count } дня
+        [few] Трымайце спасылкі актыўнымі да { $count } дзён
+       *[many] Трымайце спасылкі актыўнымі да { $count } дзён
+    }
+accountBenefitSync = Кіруйце адпраўленымі файламі з любой прылады
+accountBenefitMoz = Даведайцеся пра іншыя сэрвісы { -mozilla }
+signOut = Выйсці
+okButton = ОК
+downloadingTitle = Сцягваецца
+noStreamsWarning = Гэты браўзер не мае магчымасці расшыфраваць такі вялікі файл.
+noStreamsOptionCopy = Скапіруйце спасылку, каб адкрыць у іншым браўзеры
+noStreamsOptionFirefox = Паспрабуйце наш любімы браўзер
+noStreamsOptionDownload = Працягнуць з гэтым браўзерам
+downloadFirefoxPromo = { -send-short-brand } прыйшоў да вас з цалкам новага { -firefox }.
+# the next line after the colon contains a file name
+shareLinkDescription = Падзяліцеся спасылкай на свой файл:
+shareLinkButton = Падзяліцца спасылкай
+# $name is the name of the file
+shareMessage = Сцягніце «{ $name }» з { -send-brand }: простага і бяспечнага файлаабменніка
+trailheadPromo = Ёсць спосаб абараніць вашу прыватнасць. Далучайцеся да Firefox.
+learnMore = Падрабязней.
+downloadFlagged = Гэта спасылка адключана за парушэнне ўмоў прадастаўлення паслуг.
+downloadConfirmTitle = Яшчэ адна рэч
+downloadConfirmDescription = Пераканайцеся, што давяраеце адпраўніку гэтага файла, бо мы не можам пераканацца, што ён не нашкодзіць Вашай прыладзе.
+# This string has a special case for '1' and [other] (default). If necessary for
+# your language, you can add {$count} to your translations and use the
+# standard CLDR forms, or only use the form for [other] if both strings should
+# be identical.
+downloadTrustCheckbox =
+    { $count ->
+        [one] Я давяраю адпраўніку гэтага файла
+        [few] Я давяраю адпраўніку гэтых файлаў
+       *[many] Я давяраю адпраўніку гэтых файлаў
+    }
+# This string has a special case for '1' and [other] (default). If necessary for
+# your language, you can add {$count} to your translations and use the
+# standard CLDR forms, or only use the form for [other] if both strings should
+# be identical.
+reportFile =
+    { $count ->
+        [one] Паведаміць, што гэты файл падазроныя
+        [few] Паведаміць, што гэтыя файлы падазроныя
+       *[many] Паведаміць, што гэтыя файлы падазроныя
+    }
+reportDescription = Дапамажыце нам зразумець, што адбываецца. Як вы лічыце, што не так з гэтымі файламі?
+reportUnknownDescription = Калі ласка, перайдзіце да адрасу спасылкі, пра якую хочаце паведаміць, і націсніце “{ reportFile }”.
+reportButton = Паведаміць
+reportReasonMalware = Гэтыя файлы ўтрымліваюць шкоднасныя праграмы альбо з'яўляюцца часткай фішынг-атакі.
+reportReasonPii = Гэтыя файлы ўтрымліваюць асабістую інфармацыю пра мяне.
+reportReasonAbuse = Гэтыя файлы ўтрымліваюць незаконнае альбо абразлівае змесціва.
+reportReasonCopyright = Каб паведаміць аб парушэнні аўтарскіх правоў або гандлёвых марак, скарыстайцеся алгарытмам, апісаным на <a>гэтай старонцы</a>.
+reportedTitle = Пра файлы паведамлена
+reportedDescription = Дзякуй. Мы атрымалі Вашу заяву наконт гэтых файлаў.

public/locales/bn/send.ftl

@@ -126,7 +126,7 @@ addPassword = পাসওয়ার্ড দ্বারা সুরক্ষ
 emailPlaceholder = আপনার ইমেইল দিন
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = সর্বোচ্চ { $size } আকারের ফাইল প্রেরণ করতে সাইন ইন করুন
-signInButton = সাইন ইন/আপ
+signInOnlyButton = সাইন ইন
 accountBenefitTitle = { -firefox } অ্যাকাউন্ট তৈরি অথবা সাইন ইন করুন
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = সর্বোচ্চ { $size } আকারের ফাইল শেয়ার করুন
@@ -145,3 +145,11 @@ noStreamsWarning = এই ব্রাউজার এতো বড় একট
 noStreamsOptionCopy = অন্য ব্রাউজারে খুলতে লিঙ্ক অনুলিপি করুন
 noStreamsOptionFirefox = আমাদের জনপ্রিয় ব্রাউজার ব্যবহার করুন
 noStreamsOptionDownload = এই ব্রাউজার ব্যবহার অব্যহত রাখুন
+downloadFirefoxPromo = { -send-short-brand } আপনারদের জন্য নিয়ে এসেছে একেবারে নতুন { -firefox }।
+# the next line after the colon contains a file name
+shareLinkDescription = আপনার ফাইলে লিঙ্ক শেয়ার করুন:
+shareLinkButton = লিঙ্ক শেয়ার করুন
+# $name is the name of the file
+shareMessage = { -send-brand } এর মাধ্যমে "{ $name }" ডাউনলোড করুন: সরল, নিরাপদ ফাইল শেয়ারিং
+trailheadPromo = আপনার গোপনীয়তা রক্ষা করার একটি উপায় আছে। Firefox এ যোগ দিন।
+learnMore = আরও জানুন।

public/locales/br/send.ftl

@@ -0,0 +1,185 @@
+# Firefox Send is a brand name and should not be localized.
+title = Firefox Send
+importingFile = Oc'h enporzhiañ …
+encryptingFile = Oc'h enrinegañ..
+decryptingFile = Oc'h ezrinegañ...
+downloadCount =
+    { $num ->
+        [one] { $num } bellgargadenn
+        [two] { $num } bellgargadenn
+        [few] { $num } fellgargadenn
+        [many] { $num } a bellgargadennoù
+       *[other] { $num } pellgargadenn
+    }
+timespanHours =
+    { $num ->
+        [one] { $num } eur
+        [two] { $num } eur
+        [few] { $num } eur
+        [many] { $num } a eurioù
+       *[other] { $num } eur
+    }
+copiedUrl = Eilet!
+unlockInputPlaceholder = Ger-tremen
+unlockButtonLabel = Dibrennañ
+downloadButtonLabel = Pellgargañ
+downloadFinish = Pellgargadur echu
+fileSizeProgress = ({ $partialSize } war { $totalSize })
+sendYourFilesLink = Esaeit Firefox Send
+errorPageHeader = Degouezhet ez eus bet ur fazi!
+fileTooBig = Re vras eo ar restr-mañ evit e pellgas. Rankout a ra bezañ nebeutoc'h eget { $size }
+linkExpiredAlt = Ere diamzeret
+notSupportedHeader = N'eo ket skoret ho merdeer.
+notSupportedLink = Perak n'eo ket skoret ma merdeer?
+notSupportedOutdatedDetail = Siwazh n'eo ket skoret ar c'halvezerezhioù implijet evit Firefox Send gant an handelv-mañ eus Firefox. Ret e vo deoc'h hizivaat ho merdeer.
+updateFirefox = Hizivaat Firefox
+deletePopupCancel = Nullañ
+deleteButtonHover = Dilemel
+footerLinkLegal = Lezennel
+footerLinkPrivacy = Buhez prevez
+footerLinkCookies = Toupinoù
+passwordTryAgain = Ger-tremen direizh. Klaskit en-dro.
+javascriptRequired = Firefox Send a azgoulenn Javascript
+whyJavascript = Perak e azgoulenn Firefox Send Javascript?
+enableJavascript = Gweredekait Javascript ha klaskit en-dro.
+# A short representation of a countdown timer containing the number of hours and minutes remaining as digits, example "13h 47m"
+expiresHoursMinutes = { $hours }e { $minutes }m
+# A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
+expiresMinutes = { $minutes }m
+# A short status message shown when the user enters a long password
+maxPasswordLength = Hirder brasañ aotreet evit ar ger-tremen: { $length }
+# A short status message shown when there was an error setting the password
+passwordSetError = N'haller ket despizañ ar ger-tremen
+
+## Send version 2 strings
+
+# Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
+-send-brand = Firefox Send
+-send-short-brand = Send
+-firefox = Firefox
+-mozilla = Mozilla
+introTitle = Rannañ restroù en un doare eeun ha prevez
+introDescription = A-drugarez da { -send-brand } a c'hallit rannañ restroù gant un enrinegañ penn-ouzh-penn hag un ere a ziamzero ent emgefreek. Evel-se e c'hallit mirout ar pezh a rannit prevez ha bezañ sur ne chomo ket ho traoù enlinenn da viken.
+notifyUploadEncryptDone = Enrineget eo ho restr ha prest eo da vezañ kaset
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = Diamzeriñ a raio goude { $downloadCount } pe { $timespan }
+timespanMinutes =
+    { $num ->
+        [one] { $num } vunutenn
+        [two] { $num } vunutenn
+        [few] { $num } munutenn
+        [many] { $num } a vunutennoù
+       *[other] { $num } munutenn
+    }
+timespanDays =
+    { $num ->
+        [one] { $num } devezh
+        [two] { $num } zevezh
+        [few] { $num } devezh
+        [many] { $num } a zevezhioù
+       *[other] { $num } devezh
+    }
+timespanWeeks =
+    { $num ->
+        [one] { $num } sizhun
+        [two] { $num } sizhun
+        [few] { $num } sizhun
+        [many] { $num } a sizhunioù
+       *[other] { $num } sizhun
+    }
+fileCount =
+    { $num ->
+        [one] { $num } restr
+        [two] { $num } restr
+        [few] { $num } restr
+        [many] { $num } a restroù
+       *[other] { $num } restr
+    }
+# byte abbreviation
+bytes = e
+# kibibyte abbreviation
+kb = Ke
+# mebibyte abbreviation
+mb = Me
+# gibibyte abbreviation
+gb = Ge
+# localized number and byte abbreviation. example "2.5MB"
+fileSize = { $num }{ $units }
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+totalSize = Ment hollek: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = Eilit an ere evit rannañ ho restr
+copyLinkButton = Eilañ an ere
+downloadTitle = Pellgargañ ar restroù
+downloadDescription = Dre { -send-brand } eo bet rannet ar restr-mañ, gant un enrinegañ penn-ouzh-penn hag un ere a ziamzer ent emgefreek.
+trySendDescription = Esaeit { -send-brand } evit rannañ restroù en un doare eeun ha prevez.
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [one] N'haller pellgas nemet { $count } restr er memes mare.
+        [two] N'haller pellgas nemet { $count } restr er memes mare.
+        [few] N'haller pellgas nemet { $count } restr er memes mare.
+        [many] N'haller pellgas nemet { $count } a restroù er memes mare.
+       *[other] N'haller pellgas nemet { $count } restr er memes mare.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [one] Aotreet eo{ $count } diell nemetken.
+        [two] Aotreet eo{ $count } ziell nemetken.
+        [few] Aotreet eo{ $count } diell nemetken.
+        [many] Aotreet eo{ $count } a zielloù nemetken.
+       *[other] Aotreet eo{ $count } diell nemetken.
+    }
+expiredTitle = Diamzeret eo an ere.
+notSupportedDescription = { -send-brand } n'aio ket en-dro war ar merdeer-mañ. { -send-short-brand } a za en-dro gwelloc'h gant handelv diwezhañ { -firefox }, ha mont a raio en-dro gant handelv bremanel lodenn vrasañ ar merdeerioù.
+downloadFirefox = Pellgargañ { -firefox }
+legalTitle = Evezhiadenn a fed buhez prevez { -send-short-brand }
+legalDateStamp = Handelv 1.0, d'an 12 a viz Meurzh 2019
+# A short representation of a countdown timer containing the number of days, hours, and minutes remaining as digits, example "2d 11h 56m"
+expiresDaysHoursMinutes = { $days }d { $hours }e { $minutes }m
+addFilesButton = Diuzit ur restr da bellgas
+trustWarningMessage = Bezit sur ho peus fiziañs en ho tegemerer pa rannit roadennoù kizidik.
+uploadButton = Pellgas
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = Riklit ha laoskit restroù
+# the second part of the string 'Drag and drop files or click to send up to 1GB'
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+orClickWithSize = pe klikit evit kas betek { $size }
+addPassword = Gwareziñ gant ur ger-tremen
+emailPlaceholder = Enankit ho chomlec'h postel
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+signInSizeBump = Kennaskit evit kas betek { $size }
+signInOnlyButton = Kennaskañ
+accountBenefitTitle = Krouit ur gont { -firefox } pe kennaskit
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+accountBenefitLargeFiles = Rannit restroù betek { $size }
+accountBenefitDownloadCount = Rannit restroù gant muioc'h a dud
+accountBenefitTimeLimit =
+    { $count ->
+        [one] Dalc'hit an ereoù oberiant e-pad { $count } devezh
+        [two] Dalc'hit an ereoù oberiant e-pad { $count } zevezh
+        [few] Dalc'hit an ereoù oberiant e-pad { $count } devezh
+        [many] Dalc'hit an ereoù oberiant e-pad { $count } a zevezhioù
+       *[other] Dalc'hit an ereoù oberiant e-pad { $count } devezh
+    }
+accountBenefitSync = Merit ar restroù rannet gant forzh peseurt trevnad
+accountBenefitMoz = Gouzout hiroc'h a-zivout gwazerezhioù all { -mozilla }
+signOut = Digennaskañ
+okButton = Mat eo
+downloadingTitle = O pellgargañ
+noStreamsWarning = Posupl eo ne vefe ket gouest ar merdeer-mañ da ezrinegañ ur restr ken bras.
+noStreamsOptionCopy = Eilit an ere evit digeriñ anezhañ en ur merdeer all
+noStreamsOptionFirefox = Esaeit hor merdeer karetañ
+noStreamsOptionDownload = Kenderc'hel gant ar merdeer-mañ
+downloadFirefoxPromo = { -send-short-brand } a zo kinniget deoc'h gant ar { -firefox } nevez-flamm.
+# the next line after the colon contains a file name
+shareLinkDescription = Rannit an ere etrezek ho restr:
+shareLinkButton = Rannañ an ere
+# $name is the name of the file
+shareMessage = Pellgargañ "{ $name }" gant { -send-brand }: rannañ restroù en un doare eeun ha prevez
+trailheadPromo = Un doare a zo da wareziñ ho puhez prevez. Tremenit da Firefox.
+learnMore = Gouzout hiroc'h.
+downloadFlagged = Diweredekaet eo bet an ere-se dre ma ne zouje ket ouzh an divizoù arver.
+downloadConfirmTitle = Un draig ouzhpenn
+downloadConfirmDescription = Bezit sur ho peus fiziañs en deus en deus kaset ar restr-mañ dre ma n'haller ket gwiriañ ne freuzo ket ho trevnad.

public/locales/ca/send.ftl

@@ -1,6 +1,5 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteFeedback = Comentaris
 importingFile = S'està important…
 encryptingFile = S'està xifrant…
 decryptingFile = S'està desxifrant…
@@ -116,6 +115,7 @@ legalDateStamp = Versió 1.0, amb data del 12 de març de 2019
 # A short representation of a countdown timer containing the number of days, hours, and minutes remaining as digits, example "2d 11h 56m"
 expiresDaysHoursMinutes = { $days } d { $hours } h { $minutes } min
 addFilesButton = Seleccioneu els fitxers que voleu pujar
+trustWarningMessage = Assegureu-vos que confieu en el destinatari quan compartiu dades confidencials.
 uploadButton = Puja
 # the first part of the string 'Drag and drop files or click to send up to 1GB'
 dragAndDropFiles = Arrossegueu i deixeu anar els fitxers
@@ -126,7 +126,7 @@ addPassword = Protegeix amb contrasenya
 emailPlaceholder = Introduïu la vostra adreça electrònica
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Inicieu la sessió per enviar fins a { $size }
-signInButton = Inicieu la sessió o registreu-vos
+signInOnlyButton = Inicia la sessió
 accountBenefitTitle = Creeu un compte del { -firefox } o inicieu la sessió
 # $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Compartiu fitxers fins a { $size }
@@ -145,3 +145,41 @@ noStreamsWarning = Pot ser que aquest navegador no pugui desxifrar un fitxer tan
 noStreamsOptionCopy = Copieu l'enllaç per obrir-lo en un altre navegador
 noStreamsOptionFirefox = Proveu el nostre navegador preferit
 noStreamsOptionDownload = Segueix amb aquest navegador
+downloadFirefoxPromo = El nou { -firefox } us ofereix el { -send-short-brand }
+# the next line after the colon contains a file name
+shareLinkDescription = Compartiu l'enllaç al vostre fitxer:
+shareLinkButton = Comparteix l'enllaç
+# $name is the name of the file
+shareMessage = Baixeu «{ $name }» amb el { -send-brand }: compartició de fitxers senzilla i segura
+trailheadPromo = Hi ha una manera de protegir la vostra privadesa. Uniu-vos al Firefox.
+learnMore = Més informació.
+downloadFlagged = Aquest enllaç s'ha desactivat per infringir les condicions del servei.
+downloadConfirmTitle = Una cosa més
+downloadConfirmDescription = Assegureu-vos que confieu en la persona que us ha enviat aquest fitxer, perquè nosaltres no podem verificar que no malmeti el vostre dispositiu.
+# This string has a special case for '1' and [other] (default). If necessary for
+# your language, you can add {$count} to your translations and use the
+# standard CLDR forms, or only use the form for [other] if both strings should
+# be identical.
+downloadTrustCheckbox =
+    { $count ->
+        [one] Confio en la persona que ha enviat aquest fitxer
+       *[other] Confio en la persona que ha enviat aquests fitxers
+    }
+# This string has a special case for '1' and [other] (default). If necessary for
+# your language, you can add {$count} to your translations and use the
+# standard CLDR forms, or only use the form for [other] if both strings should
+# be identical.
+reportFile =
+    { $count ->
+        [one] Informa que aquest fitxer és sospitós
+       *[other] Informa que aquests fitxers són sospitos
+    }
+reportDescription = Ajudeu-nos a entendre què passa. Quin problema creieu que tenen aquests fitxers?
+reportUnknownDescription = Aneu a l'URL de l'enllaç sobre el qual voleu informar i feu clic a «{ reportFile }».
+reportButton = Informa
+reportReasonMalware = Aquests fitxers contenen programari maliciós o formen part d'un atac de pesca electrònica.
+reportReasonPii = Aquests fitxers contenen informació d'identificació personal meva.
+reportReasonAbuse = Aquests fitxers inclouen contingut il·legal o abusiu.
+reportReasonCopyright = Per informar sobre una infracció de drets d’autor o de marca comercial, utilitzeu el procés descrit en <a>aquesta pàgina</a>.
+reportedTitle = S'ha informat d'aquests fitxers
+reportedDescription = Gràcies. Hem rebut el vostre informe sobre aquests fitxers.

public/locales/cak/send.ftl

@@ -2,7 +2,7 @@
 title = Firefox Send
 siteFeedback = Rutzijol
 importingFile = Tajin nijik…
-encryptingFile = Tajin newäx rusik'ixik...
+encryptingFile = Tajin newäx rusik'ixik…
 decryptingFile = Tajin netamäx rusik'ixik...
 downloadCount =
     { $num ->
@@ -78,7 +78,17 @@ fileCount =
         [one] 1 yakb'äl
        *[other] { $num } taq yakb'äl
     }
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# byte abbreviation
+bytes = B
+# kibibyte abbreviation
+kb = KB
+# mebibyte abbreviation
+mb = MB
+# gibibyte abbreviation
+gb = GB
+# localized number and byte abbreviation. example "2.5MB"
+fileSize = { $num }{ $units }
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 totalSize = Ronojel runimilem: { $size }
 # the next line after the colon contains a file name
 copyLinkDescription = Tawachib'ej ri ximonel richin nakomonij ri ayakb'al:
@@ -110,15 +120,15 @@ uploadButton = Tijotob'äx
 # the first part of the string 'Drag and drop files or click to send up to 1GB'
 dragAndDropFiles = Keqirirëx chuqa' ke'osq'opïx taq yakb'äl
 # the second part of the string 'Drag and drop files or click to send up to 1GB'
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = o tapitz'a' richin natäq k'a { $size }
 addPassword = Tichajïx rik'in ewan tzij
 emailPlaceholder = Tatz'ib'aj ataqoya'l
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Tatikirisaj molojri'ïl richin natäq k'a { $size }
-signInButton = Tatikirisaj molojri'ïl/tatz'ib'aj ab'i'
+signInOnlyButton = Titikirisäx molojri'ïl
 accountBenefitTitle = Tatz'uku' jun { -firefox } Rub'i' Ataqoy'al o Tatikirisaj molojri'ïl
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Ke'akomonij taq yakb'äl k'a { $size }
 accountBenefitDownloadCount = Ke'akomonij taq yakb'äl kik'in ch'aqa' chik winaqi'
 accountBenefitTimeLimit =
@@ -135,3 +145,11 @@ noStreamsWarning = Rik'in jub'a' re okik'amaya'l re' man nitikïr ta nretamaj ru
 noStreamsOptionCopy = Tiwachib'ëx ri ximonel richin nijaq pa jun chik okik'amaya'l
 noStreamsOptionFirefox = Tatojtob'ej ri jeb'ël qokik'amaya'l
 noStreamsOptionDownload = Kisamäj na rik'in re okik'amaya'l re'
+downloadFirefoxPromo = Ja ri k'ak'a' { -firefox } nusüj ri { -send-short-brand } chawe.
+# the next line after the colon contains a file name
+shareLinkDescription = Nakomonij ri ximonel rik'in ri awokisab'al:
+shareLinkButton = Tikomonïx ximonel
+# $name is the name of the file
+shareMessage = Tiqasäx "{ $name }" rik'in { -send-brand }: man k'ayew ta chuqa' ütz kikomonik ri yakb'äl
+trailheadPromo = K'o jun rub'anikil richin nachajij ri awichinanem. Tatunu' awi' rik'in ri Firefox.
+learnMore = Tetamäx ch'aqa' chik.

public/locales/ckb/send.ftl

@@ -0,0 +1,155 @@
+# Firefox Send is a brand name and should not be localized.
+title = Firefox Send
+siteFeedback = ڕەخنەوپێشنیار
+importingFile = هاوردەکردن...
+encryptingFile = بەهێماکردن...
+decryptingFile = هێمالابردن...
+downloadCount =
+    { $num ->
+        [one] 1 داگرتن
+       *[other] { $num } داگرتن
+    }
+timespanHours =
+    { $num ->
+        [one] 1 کاژێر
+       *[other] { $num } کاژێر
+    }
+copiedUrl = لەبەرگیرا!
+unlockInputPlaceholder = وشەی تێپەڕبوون
+unlockButtonLabel = کردنەوە
+downloadButtonLabel = داگرتن
+downloadFinish = داگرتن تەواو  بوو
+fileSizeProgress = ({ $partialSize } لە { $totalSize })
+sendYourFilesLink = Firefox ناردن تاقیبکەرەوە
+errorPageHeader = هەڵەیەک ڕوویدا
+fileTooBig = ئەم پەڕگەیە زۆر گەورەیە بۆ بارکردن. پێویستە لە { $size } بچووک تر بێت
+linkExpiredAlt = بەستەر بەسەرچووە
+notSupportedHeader = وێبگەڕەکەت پشتگیری ناکرێت
+notSupportedLink = بۆ وێبگەڕەکەم پشتگیری ناکرێت؟
+notSupportedOutdatedDetail = بەداخەوە ئەم وەشانەی Firefox پشتگیری ئەو جۆرە تەکنەلۆژییە ناکات کە پێویستە بۆ Firefox Send. پێویستە وێبگەڕەکەت نوێبکەیتەوە.
+updateFirefox = فاەرفۆکس نوێبکەرەوە
+deletePopupCancel = پاشگەزبوونەوە
+deleteButtonHover = سڕینەوە
+footerLinkLegal = یاسایی
+footerLinkPrivacy = تایبەتیی
+footerLinkCookies = شەکرۆکە
+passwordTryAgain = وشەی تێپەڕبوون هەڵەیە. هەوڵ بدەرەوە.
+javascriptRequired = فارفۆکسی ناردن پێویستە بە JavaScript هەیە
+whyJavascript = بۆچی پێویستی بە JavaScript هەیە؟
+enableJavascript = تکایە JavaScript چالاک بکە وهەوڵ بدەرەوە.
+# A short representation of a countdown timer containing the number of hours and minutes remaining as digits, example "13h 47m"
+expiresHoursMinutes = { $hours }ک { $minutes }خ
+# A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
+expiresMinutes = { $minutes }خ
+# A short status message shown when the user enters a long password
+maxPasswordLength = زۆرترین درێژی وشەی تێپەڕی ڕێگەپێدراو: { $length }
+# A short status message shown when there was an error setting the password
+passwordSetError = ناتوانرێت وشەی تێپەڕ دابنرێت
+
+## Send version 2 strings
+
+# Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
+-send-brand = Firefox Send
+-send-short-brand = Send
+-firefox = Firefox
+-mozilla = Mozilla
+introTitle = سانا، بڵاوکەرەوەی پەڕگەی تایبەتیی
+introDescription = { -send-brand } ڕێگەت دەدات پەڕگەکان بڵاوبکەیتەوە بە شێوەی هێما کردنی کۆتا-بۆ-کۆتا و بەستەرێک کە خۆکارانە بەسەردەچێت. بۆیە دەتوانیت ئاگاداری ئەوە بیت کە چ پەڕگەیەک بە تایبەتی بڵاودەکەیتەوە و دڵنیادەبیتەوە کە شتەکانت بە سەرهێڵی نامێننەوە هەتا کۆتایی.
+notifyUploadEncryptDone = پەڕگەیە بەهێماکراوە ئێستا ئامادەیە بۆ ناردن
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = بەسەردەچێت دووای { $downloadCount } یان { $timespan }
+timespanMinutes =
+    { $num ->
+        [one] 1 خولەک
+       *[other] { $num } خولەک
+    }
+timespanDays =
+    { $num ->
+        [one] 1 ڕؤژ
+       *[other] { $num } ڕۆژ
+    }
+timespanWeeks =
+    { $num ->
+        [one] 1 هەفتە
+       *[other] { $num } هەفتە
+    }
+fileCount =
+    { $num ->
+        [one] 1 پەڕگە
+       *[other] { $num } پەڕگە
+    }
+# byte abbreviation
+bytes = بایت
+# kibibyte abbreviation
+kb = ک.بایت
+# mebibyte abbreviation
+mb = م.بایت
+# gibibyte abbreviation
+gb = گ.بایت
+# localized number and byte abbreviation. example "2.5MB"
+fileSize = { $num }{ $units }
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+totalSize = قەبارەی گشتی: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = بەستەر لەبەربگرەوە بۆ بڵاوکردنەوەی پەڕگە:
+copyLinkButton = بەستەر لەبەربگرەوە
+downloadTitle = پەڕگەکان دابگرە
+downloadDescription = ئەم پەڕگەیە لە لایەن { -send-brand } بلاوکراوەتەوە کە بەهێماکراوە بە شێوەی کۆتا-بۆ-کۆتا بە بەستەرێک کە خۆکارانە بەسەردەچێت.
+trySendDescription = { -send-brand } تاقیبکەرەوە بۆ سانایی، پارێزراو لە بڵاوکردنەوەی پەڕگە.
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [one] تەنها 1 پەڕگە دەتوانیت باربکەیت لەم کاتەدا.
+       *[other] تەنها { $count } پەڕگە دەتوانی باربکەیت لەم کاتەدا.
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [one] تەنها 1 ئەرشیف ڕێپێدراوە.
+       *[other] تەنها { $count } ئەرشیف ڕێپێدراوە.
+    }
+expiredTitle = بەستەر بەسەرچووە.
+notSupportedDescription = { -send-brand } کارنکات لەگەڵ ئەم وێبگەڕە. { -send-short-brand } باش کاردەکات لەگەڵ کۆتا وەشانی { -firefox }، وکاردەکات لەگەڵ زۆربەی وەشانی ئێستای وێبگەڕەکان.
+downloadFirefox = { -firefox } دابگرە
+legalTitle = تێبینی تایبەتیی { -send-short-brand }
+legalDateStamp = وەشان 1.0، بەروار کراو لە 12 ئازار، 2019
+# A short representation of a countdown timer containing the number of days, hours, and minutes remaining as digits, example "2d 11h 56m"
+expiresDaysHoursMinutes = { $days } ڕ { $hours } ک{ $minutes } خ
+addFilesButton = پەڕگەکان هەڵبژێرە بۆ بارکردن
+uploadButton = بارکردن
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = ڕاکێشان و دانانی پەڕگەکان
+# the second part of the string 'Drag and drop files or click to send up to 1GB'
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+orClickWithSize = یان کرتە بکە بۆ ناردنی قەبارەی تاوەکوو { $size }
+addPassword = بپارێزە لەگەڵ وشەی تێپەڕ
+emailPlaceholder = پۆستی ئەلکترۆنی بنووسە
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+signInSizeBump = بچۆژوورەوە بۆ ناردنی قەبارەی تاوەکوو { $size }
+signInOnlyButton = بچۆژوورەوە
+accountBenefitTitle = هەژماری { -firefox } درووست بکە یان بچۆژوورەوە
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
+accountBenefitLargeFiles = پەڕگە بڵاوبکەرەوە تاوەکوو قەبارەی { $size }
+accountBenefitDownloadCount = پەڕگەکان لەگەڵ خەڵکی زیاتر بڵاوبکەرەوە
+accountBenefitTimeLimit =
+    { $count ->
+        [one] بەستەرەکان بەکارایی بهێڵەوە تا 1 ڕۆژ
+       *[other] بەستەرەکان بەکارایی بهێڵەوە تا { $count } ڕۆژ
+    }
+accountBenefitSync = پەڕگە بڵآوکراوەکان بەڕێوەبەرە لەهەر ئامێرێکەوە
+accountBenefitMoz = زیاتر بزانە دەربارەی خزمەتگوزارییەکانی تری { -mozilla }
+signOut = بچۆ دەرەوە
+okButton = باشە
+downloadingTitle = دادەگیرێت...
+noStreamsWarning = لەوانەیە ئەم وێبگەڕە نەتوانێت پەڕگەی وا گەورە بە هێما بکات.
+noStreamsOptionCopy = بەستەر لەبەربگرەوە بۆ کردنەوەی لە وێبگەڕێکی تر
+noStreamsOptionFirefox = وێبگەڕی دڵخوازی ئێمە تاقیبکەرەوە
+noStreamsOptionDownload = بەردەوام بە لەگەڵ ئەم وێبگەڕە
+downloadFirefoxPromo = { -send-short-brand } پیشکەش کراوە بە تۆ لە لایەن { -firefox }.
+# the next line after the colon contains a file name
+shareLinkDescription = بەستەر بڵاوبکەرەوە بۆ پەڕگەکەت:
+shareLinkButton = بەستەر بڵاوبکەرەوە
+# $name is the name of the file
+shareMessage = “{ $name }” دابگرە لەگەڵ { -send-brand }: سانا، پاریزراو لە بڵاوکردنەوەی پەڕگە
+trailheadPromo = ڕێگەیەک هەیە بۆ پارێزگاریکردنی تایبەتێتی خۆت. بەشدار بە لە فایەرفۆکس.
+learnMore = زیاتر بزانە