From e4faa273e512f5120f4ecd98636a0b38e7951949 Mon Sep 17 00:00:00 2001
From: Will Stone <654103+will-stone@users.noreply.github.com>
Date: Wed, 2 Jun 2021 13:48:31 +0100
Subject: [PATCH 01/12] WIP Simplify base text

---
 src/main/main.ts                              |  4 ++--
 src/renderer/components/atoms/app-button.tsx  |  2 +-
 src/renderer/components/atoms/button.tsx      |  1 -
 src/renderer/components/atoms/kbd.tsx         |  2 +-
 src/renderer/components/molecules/tile.tsx    | 19 +++++++------------
 src/renderer/components/organisms/url-bar.tsx |  6 +++---
 src/renderer/index.css                        |  4 ++++
 7 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/main/main.ts b/src/main/main.ts
index 4c9e5e7b..9c392ba1 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -142,8 +142,8 @@ electron.app.on('ready', async () => {
       enableRemoteModule: false,
     },
     center: true,
-    height: bounds?.height || 212,
-    minHeight: 212,
+    height: bounds?.height || 204,
+    minHeight: 204,
     width: bounds?.width || 458,
     minWidth: 458,
     show: false,
diff --git a/src/renderer/components/atoms/app-button.tsx b/src/renderer/components/atoms/app-button.tsx
index 736c598c..0f9ae3fe 100644
--- a/src/renderer/components/atoms/app-button.tsx
+++ b/src/renderer/components/atoms/app-button.tsx
@@ -19,7 +19,7 @@ const AppButton: React.FC<Props> = ({
       key={app.id}
       aria-label={`${app.name} Tile`}
       className={clsx(
-        'w-28 p-8',
+        'w-full p-8',
         'flex flex-col items-center justify-center max-h-full',
         'focus:outline-none',
         'space-y-2',
diff --git a/src/renderer/components/atoms/button.tsx b/src/renderer/components/atoms/button.tsx
index 291aea09..fb4fc88d 100644
--- a/src/renderer/components/atoms/button.tsx
+++ b/src/renderer/components/atoms/button.tsx
@@ -15,7 +15,6 @@ const Button: React.FC<React.ComponentPropsWithoutRef<'button'>> = ({
         'active:shadow-none focus:outline-none active:opacity-75',
         'px-3 py-2',
         'rounded-md',
-        'text-xs',
         'leading-none',
         'inline-flex items-center',
         'bg-black bg-opacity-10',
diff --git a/src/renderer/components/atoms/kbd.tsx b/src/renderer/components/atoms/kbd.tsx
index b975f09c..bc932f3c 100644
--- a/src/renderer/components/atoms/kbd.tsx
+++ b/src/renderer/components/atoms/kbd.tsx
@@ -11,7 +11,7 @@ const Kbd: React.FC<Props> = ({ children, className, style }) => {
     <kbd
       className={clsx(
         className,
-        'text-xs tracking-widest uppercase rounded text-center',
+        'tracking-widest uppercase rounded text-center',
       )}
       style={style}
     >
diff --git a/src/renderer/components/molecules/tile.tsx b/src/renderer/components/molecules/tile.tsx
index dc7e6ad7..32ba3718 100644
--- a/src/renderer/components/molecules/tile.tsx
+++ b/src/renderer/components/molecules/tile.tsx
@@ -33,7 +33,7 @@ const Tile: React.FC<Props> = ({ app, onClick, controls }) => {
   const isDarkMode = useSelector((state) => state.theme.isDarkMode)
 
   return (
-    <div className={clsx('relative', 'w-28')}>
+    <div className="relative w-32">
       <AppButton
         app={app}
         disabled={isEditMode}
@@ -53,7 +53,7 @@ const Tile: React.FC<Props> = ({ app, onClick, controls }) => {
         {
           // TODO what can be done so this isn't hardcoded?
           app.id === 'carrot' ? (
-            <Carrot className="text-3xl" />
+            <Carrot className="text-5xl" />
           ) : (
             <AppLogo app={app} wiggle={isEditMode} />
           )
@@ -62,19 +62,18 @@ const Tile: React.FC<Props> = ({ app, onClick, controls }) => {
         {isEditMode && controls.hotkey && (
           <div
             className={clsx(
-              'flex-shrink-0 flex justify-center items-center space-x-1',
+              'flex-shrink-0 flex justify-center items-center space-x-2',
             )}
           >
             <FontAwesomeIcon
               className="opacity-50"
               fixedWidth
               icon={faKeyboard}
-              size="xs"
             />
             <input
               aria-label={`${app.name} hotkey`}
               className={clsx(
-                'text-xs uppercase focus:outline-none min-w-0 w-full text-center rounded',
+                'uppercase focus:outline-none min-w-0 w-full text-center rounded',
                 'shadow bg-opacity-50',
                 isDarkMode ? 'text-white bg-black' : 'text-black bg-white',
               )}
@@ -116,9 +115,7 @@ const Tile: React.FC<Props> = ({ app, onClick, controls }) => {
           </Kbd>
         )}
 
-        {!controls.hotkey && (
-          <div className="text-xs opacity-50">{app.name}</div>
-        )}
+        {!controls.hotkey && <div className="opacity-50">{app.name}</div>}
       </AppButton>
 
       {isEditMode && controls.favourite && (
@@ -127,7 +124,7 @@ const Tile: React.FC<Props> = ({ app, onClick, controls }) => {
           className={clsx(
             'absolute top-5 left-5',
             'flex justify-center items-center',
-            'focus:outline-none shadow rounded-full h-6 w-6',
+            'focus:outline-none shadow rounded-full h-8 w-8',
             isDarkMode ? 'bg-black' : 'bg-white',
             'bg-opacity-50',
             !app.isFav && 'text-sm',
@@ -139,7 +136,6 @@ const Tile: React.FC<Props> = ({ app, onClick, controls }) => {
             className={clsx(!app.isFav && 'opacity-25')}
             fixedWidth
             icon={faStar}
-            size="xs"
           />
         </button>
       )}
@@ -149,7 +145,7 @@ const Tile: React.FC<Props> = ({ app, onClick, controls }) => {
           className={clsx(
             'absolute top-5 right-5',
             'flex justify-center items-center',
-            'focus:outline-none shadow rounded-full h-6 w-6',
+            'focus:outline-none shadow rounded-full h-8 w-8',
             isDarkMode ? 'bg-black' : 'bg-white',
             'bg-opacity-50',
             !app.isVisible && 'text-sm',
@@ -161,7 +157,6 @@ const Tile: React.FC<Props> = ({ app, onClick, controls }) => {
             className={clsx(!app.isVisible && 'opacity-25')}
             fixedWidth
             icon={app.isVisible ? faEye : faEyeSlash}
-            size="xs"
           />
         </button>
       )}
diff --git a/src/renderer/components/organisms/url-bar.tsx b/src/renderer/components/organisms/url-bar.tsx
index 67ff9c78..66d2c79d 100644
--- a/src/renderer/components/organisms/url-bar.tsx
+++ b/src/renderer/components/organisms/url-bar.tsx
@@ -63,7 +63,7 @@ const UrlBar: React.FC<Props> = ({ className }) => {
           'flex items-center justify-between',
           'overflow-hidden',
           'pr-1',
-          'text-sm tracking-wider',
+          'tracking-wider',
         )}
       >
         {isEditMode && (
@@ -86,12 +86,12 @@ const UrlBar: React.FC<Props> = ({ className }) => {
         {!isEditMode && (
           <div
             className={clsx(
-              'text-sm tracking-wider text-opacity-50',
+              'tracking-wider text-opacity-50',
               isDarkMode ? 'text-white' : 'text-black',
             )}
             style={{
               display: '-webkit-box',
-              WebkitLineClamp: 2,
+              WebkitLineClamp: 3,
               WebkitBoxOrient: 'vertical',
               overflow: 'hidden',
               overflowWrap: 'break-word',
diff --git a/src/renderer/index.css b/src/renderer/index.css
index 93fcebb5..c9043ac7 100644
--- a/src/renderer/index.css
+++ b/src/renderer/index.css
@@ -17,6 +17,10 @@ button {
   cursor: default;
 }
 
+html {
+  font-size: 13px;
+}
+
 :root {
   --animate-duration: 0.5s;
 }

From 36d45f893e0308bf9a84a77e058eb2bd0ac6c36d Mon Sep 17 00:00:00 2001
From: Will Stone <654103+will-stone@users.noreply.github.com>
Date: Fri, 4 Jun 2021 08:55:30 +0100
Subject: [PATCH 02/12] Up eslint config

---
 package-lock.json | 318 ++++++++++++++++++++++++++++++----------------
 package.json      |   4 +-
 2 files changed, 210 insertions(+), 112 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c238481a..7c554c98 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -80,14 +80,14 @@
         "@types/react": "^17.0.3",
         "@types/react-dom": "^17.0.3",
         "@types/react-redux": "^7.1.16",
-        "@will-stone/eslint-config": "^2.8.0",
+        "@will-stone/eslint-config": "^2.9.0",
         "@will-stone/prettier-config": "^4.0.0",
         "concurrently": "^6.0.1",
         "copy-webpack-plugin": "^6.0.3",
         "css-loader": "^5.2.4",
         "dotenv": "^8.2.0",
         "electron": "^13.0.0",
-        "eslint": "^7.24.0",
+        "eslint": "^7.27.0",
         "fork-ts-checker-webpack-plugin": "^5.2.0",
         "husky": "^6.0.0",
         "jest": "^27.0.3",
@@ -194,13 +194,13 @@
       }
     },
     "node_modules/@babel/eslint-parser": {
-      "version": "7.13.14",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.13.14.tgz",
-      "integrity": "sha512-I0HweR36D73Ibn/FfrRDMKlMqJHFwidIUgYdMpH+aXYuQC+waq59YaJ6t9e9N36axJ82v1jR041wwqDrDXEwRA==",
+      "version": "7.14.4",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.14.4.tgz",
+      "integrity": "sha512-7CTckFLPBGEfCKqlrnJq2PIId3UmJ5hW+D4dsv/VvuA5DapgqyZFCttq+8oeRIJMZQizFIe5gel3xm2SbrqlYA==",
       "dev": true,
       "dependencies": {
         "eslint-scope": "^5.1.0",
-        "eslint-visitor-keys": "^1.3.0",
+        "eslint-visitor-keys": "^2.1.0",
         "semver": "^6.3.0"
       },
       "engines": {
@@ -224,15 +224,6 @@
         "node": ">=8.0.0"
       }
     },
-    "node_modules/@babel/eslint-parser/node_modules/eslint-visitor-keys": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/eslint-parser/node_modules/semver": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -3101,9 +3092,10 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "0.4.0",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.1.tgz",
+      "integrity": "sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.1.1",
@@ -3121,8 +3113,9 @@
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
       "version": "12.4.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+      "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.8.1"
       },
@@ -3135,8 +3128,9 @@
     },
     "node_modules/@eslint/eslintrc/node_modules/ignore": {
       "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -4790,9 +4784,9 @@
       }
     },
     "node_modules/@will-stone/eslint-config": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@will-stone/eslint-config/-/eslint-config-2.8.0.tgz",
-      "integrity": "sha512-Khr7zEqtkxcYWXvpXY4EsFQVbt2zCJzvpGuR2ZniB9GLS6ZkflVUFzLwXMsX9WudpgK5FTRRSoxQKAVVwtgUmw==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@will-stone/eslint-config/-/eslint-config-2.9.0.tgz",
+      "integrity": "sha512-FCg+vCTIDVSnmWkJqc1H8QLq9zJiYL6KH6cQkmn6pX3bu9y3em4mtZZmzgbPNYbnDJ59/p7zyBiVOmk0wE8pIQ==",
       "dev": true,
       "dependencies": {
         "@typescript-eslint/eslint-plugin": "^4.18.0",
@@ -4808,7 +4802,7 @@
         "eslint-plugin-react-hooks": "^4.2.0",
         "eslint-plugin-simple-import-sort": "^7.0.0",
         "eslint-plugin-switch-case": "^1.1.2",
-        "eslint-plugin-unicorn": "^32.0.1"
+        "eslint-plugin-unicorn": "^33.0.1"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -4871,9 +4865,10 @@
       }
     },
     "node_modules/acorn": {
-      "version": "7.3.1",
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -4891,6 +4886,15 @@
         "acorn-walk": "^7.1.1"
       }
     },
+    "node_modules/acorn-jsx": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
+      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+      "dev": true,
+      "peerDependencies": {
+        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
+      }
+    },
     "node_modules/acorn-node": {
       "version": "1.8.2",
       "dev": true,
@@ -9173,25 +9177,27 @@
       }
     },
     "node_modules/eslint": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz",
-      "integrity": "sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.27.0.tgz",
+      "integrity": "sha512-JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA==",
       "dev": true,
       "dependencies": {
         "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.0",
+        "@eslint/eslintrc": "^0.4.1",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.0.1",
         "doctrine": "^3.0.0",
         "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^2.1.0",
         "eslint-visitor-keys": "^2.0.0",
         "espree": "^7.3.1",
         "esquery": "^1.4.0",
         "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "functional-red-black-tree": "^1.0.1",
         "glob-parent": "^5.0.0",
@@ -9203,7 +9209,7 @@
         "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
-        "lodash": "^4.17.21",
+        "lodash.merge": "^4.6.2",
         "minimatch": "^3.0.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
@@ -9212,7 +9218,7 @@
         "semver": "^7.2.1",
         "strip-ansi": "^6.0.0",
         "strip-json-comments": "^3.1.0",
-        "table": "^6.0.4",
+        "table": "^6.0.9",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
       },
@@ -9604,15 +9610,15 @@
       }
     },
     "node_modules/eslint-plugin-unicorn": {
-      "version": "32.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-32.0.1.tgz",
-      "integrity": "sha512-LaZ9utnXtOJjnoDkpm+nQsONUUmyRR0WD6PGROSdQRRW3LRmgK/ZP8wxjW+Ai+2uolKTtuJzLx2mvbIeIoLqpg==",
+      "version": "33.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-33.0.1.tgz",
+      "integrity": "sha512-VxX/L/9DUEyB3D0v00185LrgsB5/fBwkgA4IC7ehHRu5hFSgA6VecmdpFybhsr4GQ/Y1iyXMHf6q+JKvcR2MwA==",
       "dev": true,
       "dependencies": {
         "ci-info": "^3.1.1",
         "clean-regexp": "^1.0.0",
         "eslint-template-visitor": "^2.3.2",
-        "eslint-utils": "^2.1.0",
+        "eslint-utils": "^3.0.0",
         "import-modules": "^2.1.0",
         "is-builtin-module": "^3.1.0",
         "lodash": "^4.17.21",
@@ -9633,6 +9639,24 @@
         "eslint": ">=7.23.0"
       }
     },
+    "node_modules/eslint-plugin-unicorn/node_modules/eslint-utils": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+      "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+      "dev": true,
+      "dependencies": {
+        "eslint-visitor-keys": "^2.0.0"
+      },
+      "engines": {
+        "node": "^10.0.0 || ^12.0.0 || >= 14.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": ">=5"
+      }
+    },
     "node_modules/eslint-plugin-unicorn/node_modules/read-pkg": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
@@ -9735,11 +9759,24 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "2.0.0",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/eslint/node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/eslint/node_modules/eslint-scope": {
@@ -9791,8 +9828,9 @@
     },
     "node_modules/espree": {
       "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^7.4.0",
         "acorn-jsx": "^5.3.1",
@@ -9802,29 +9840,11 @@
         "node": "^10.12.0 || >=12.0.0"
       }
     },
-    "node_modules/espree/node_modules/acorn": {
-      "version": "7.4.0",
-      "dev": true,
-      "license": "MIT",
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/espree/node_modules/acorn-jsx": {
-      "version": "5.3.1",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
-      }
-    },
     "node_modules/espree/node_modules/eslint-visitor-keys": {
       "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+      "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=4"
       }
@@ -15047,6 +15067,12 @@
       "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
       "dev": true
     },
+    "node_modules/lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
     "node_modules/lodash.difference": {
       "version": "4.5.0",
       "dev": true,
@@ -15072,6 +15098,12 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
     "node_modules/lodash.sortby": {
       "version": "4.7.0",
       "dev": true,
@@ -15109,6 +15141,12 @@
       "integrity": "sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak=",
       "dev": true
     },
+    "node_modules/lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "dev": true
+    },
     "node_modules/lodash.zipobject": {
       "version": "4.1.3",
       "dev": true,
@@ -18961,8 +18999,9 @@
     },
     "node_modules/require-from-string": {
       "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -20261,8 +20300,9 @@
     },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -20400,23 +20440,27 @@
       "dev": true
     },
     "node_modules/table": {
-      "version": "6.0.7",
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
+      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
-        "ajv": "^7.0.2",
-        "lodash": "^4.17.20",
+        "ajv": "^8.0.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0"
       },
       "engines": {
         "node": ">=10.0.0"
       }
     },
     "node_modules/table/node_modules/ajv": {
-      "version": "7.0.3",
+      "version": "8.5.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.5.0.tgz",
+      "integrity": "sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "json-schema-traverse": "^1.0.0",
@@ -20430,8 +20474,9 @@
     },
     "node_modules/table/node_modules/json-schema-traverse": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "dev": true
     },
     "node_modules/tailwindcss": {
       "version": "2.1.1",
@@ -22685,13 +22730,13 @@
       }
     },
     "@babel/eslint-parser": {
-      "version": "7.13.14",
-      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.13.14.tgz",
-      "integrity": "sha512-I0HweR36D73Ibn/FfrRDMKlMqJHFwidIUgYdMpH+aXYuQC+waq59YaJ6t9e9N36axJ82v1jR041wwqDrDXEwRA==",
+      "version": "7.14.4",
+      "resolved": "https://registry.npmjs.org/@babel/eslint-parser/-/eslint-parser-7.14.4.tgz",
+      "integrity": "sha512-7CTckFLPBGEfCKqlrnJq2PIId3UmJ5hW+D4dsv/VvuA5DapgqyZFCttq+8oeRIJMZQizFIe5gel3xm2SbrqlYA==",
       "dev": true,
       "requires": {
         "eslint-scope": "^5.1.0",
-        "eslint-visitor-keys": "^1.3.0",
+        "eslint-visitor-keys": "^2.1.0",
         "semver": "^6.3.0"
       },
       "dependencies": {
@@ -22705,12 +22750,6 @@
             "estraverse": "^4.1.1"
           }
         },
-        "eslint-visitor-keys": {
-          "version": "1.3.0",
-          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
-          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
-          "dev": true
-        },
         "semver": {
           "version": "6.3.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
@@ -24913,7 +24952,9 @@
       }
     },
     "@eslint/eslintrc": {
-      "version": "0.4.0",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.1.tgz",
+      "integrity": "sha512-5v7TDE9plVhvxQeWLXDTvFvJBdH6pEsdnl2g/dAptmuFEPedQ4Erq5rsDsX+mvAM610IhNaO2W5V1dOOnDKxkQ==",
       "dev": true,
       "requires": {
         "ajv": "^6.12.4",
@@ -24929,6 +24970,8 @@
       "dependencies": {
         "globals": {
           "version": "12.4.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz",
+          "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==",
           "dev": true,
           "requires": {
             "type-fest": "^0.8.1"
@@ -24936,6 +24979,8 @@
         },
         "ignore": {
           "version": "4.0.6",
+          "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+          "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
           "dev": true
         }
       }
@@ -26272,9 +26317,9 @@
       }
     },
     "@will-stone/eslint-config": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/@will-stone/eslint-config/-/eslint-config-2.8.0.tgz",
-      "integrity": "sha512-Khr7zEqtkxcYWXvpXY4EsFQVbt2zCJzvpGuR2ZniB9GLS6ZkflVUFzLwXMsX9WudpgK5FTRRSoxQKAVVwtgUmw==",
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@will-stone/eslint-config/-/eslint-config-2.9.0.tgz",
+      "integrity": "sha512-FCg+vCTIDVSnmWkJqc1H8QLq9zJiYL6KH6cQkmn6pX3bu9y3em4mtZZmzgbPNYbnDJ59/p7zyBiVOmk0wE8pIQ==",
       "dev": true,
       "requires": {
         "@typescript-eslint/eslint-plugin": "^4.18.0",
@@ -26290,7 +26335,7 @@
         "eslint-plugin-react-hooks": "^4.2.0",
         "eslint-plugin-simple-import-sort": "^7.0.0",
         "eslint-plugin-switch-case": "^1.1.2",
-        "eslint-plugin-unicorn": "^32.0.1"
+        "eslint-plugin-unicorn": "^33.0.1"
       }
     },
     "@will-stone/prettier-config": {
@@ -26333,7 +26378,9 @@
       }
     },
     "acorn": {
-      "version": "7.3.1",
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
       "dev": true
     },
     "acorn-globals": {
@@ -26346,6 +26393,13 @@
         "acorn-walk": "^7.1.1"
       }
     },
+    "acorn-jsx": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz",
+      "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==",
+      "dev": true,
+      "requires": {}
+    },
     "acorn-node": {
       "version": "1.8.2",
       "dev": true,
@@ -29504,25 +29558,27 @@
       }
     },
     "eslint": {
-      "version": "7.24.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.24.0.tgz",
-      "integrity": "sha512-k9gaHeHiFmGCDQ2rEfvULlSLruz6tgfA8DEn+rY9/oYPFFTlz55mM/Q/Rij1b2Y42jwZiK3lXvNTw6w6TXzcKQ==",
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.27.0.tgz",
+      "integrity": "sha512-JZuR6La2ZF0UD384lcbnd0Cgg6QJjiCwhMD6eU4h/VGPcVGwawNNzKU41tgokGXnfjOOyI6QIffthhJTPzzuRA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "7.12.11",
-        "@eslint/eslintrc": "^0.4.0",
+        "@eslint/eslintrc": "^0.4.1",
         "ajv": "^6.10.0",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
         "debug": "^4.0.1",
         "doctrine": "^3.0.0",
         "enquirer": "^2.3.5",
+        "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^5.1.1",
         "eslint-utils": "^2.1.0",
         "eslint-visitor-keys": "^2.0.0",
         "espree": "^7.3.1",
         "esquery": "^1.4.0",
         "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
         "file-entry-cache": "^6.0.1",
         "functional-red-black-tree": "^1.0.1",
         "glob-parent": "^5.0.0",
@@ -29534,7 +29590,7 @@
         "js-yaml": "^3.13.1",
         "json-stable-stringify-without-jsonify": "^1.0.1",
         "levn": "^0.4.1",
-        "lodash": "^4.17.21",
+        "lodash.merge": "^4.6.2",
         "minimatch": "^3.0.4",
         "natural-compare": "^1.4.0",
         "optionator": "^0.9.1",
@@ -29543,11 +29599,17 @@
         "semver": "^7.2.1",
         "strip-ansi": "^6.0.0",
         "strip-json-comments": "^3.1.0",
-        "table": "^6.0.4",
+        "table": "^6.0.9",
         "text-table": "^0.2.0",
         "v8-compile-cache": "^2.0.3"
       },
       "dependencies": {
+        "escape-string-regexp": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+          "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+          "dev": true
+        },
         "eslint-scope": {
           "version": "5.1.1",
           "dev": true,
@@ -29833,15 +29895,15 @@
       }
     },
     "eslint-plugin-unicorn": {
-      "version": "32.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-32.0.1.tgz",
-      "integrity": "sha512-LaZ9utnXtOJjnoDkpm+nQsONUUmyRR0WD6PGROSdQRRW3LRmgK/ZP8wxjW+Ai+2uolKTtuJzLx2mvbIeIoLqpg==",
+      "version": "33.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-33.0.1.tgz",
+      "integrity": "sha512-VxX/L/9DUEyB3D0v00185LrgsB5/fBwkgA4IC7ehHRu5hFSgA6VecmdpFybhsr4GQ/Y1iyXMHf6q+JKvcR2MwA==",
       "dev": true,
       "requires": {
         "ci-info": "^3.1.1",
         "clean-regexp": "^1.0.0",
         "eslint-template-visitor": "^2.3.2",
-        "eslint-utils": "^2.1.0",
+        "eslint-utils": "^3.0.0",
         "import-modules": "^2.1.0",
         "is-builtin-module": "^3.1.0",
         "lodash": "^4.17.21",
@@ -29853,6 +29915,15 @@
         "semver": "^7.3.5"
       },
       "dependencies": {
+        "eslint-utils": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz",
+          "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==",
+          "dev": true,
+          "requires": {
+            "eslint-visitor-keys": "^2.0.0"
+          }
+        },
         "read-pkg": {
           "version": "5.2.0",
           "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
@@ -29931,11 +30002,15 @@
       }
     },
     "eslint-visitor-keys": {
-      "version": "2.0.0",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz",
+      "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==",
       "dev": true
     },
     "espree": {
       "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz",
+      "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==",
       "dev": true,
       "requires": {
         "acorn": "^7.4.0",
@@ -29943,17 +30018,10 @@
         "eslint-visitor-keys": "^1.3.0"
       },
       "dependencies": {
-        "acorn": {
-          "version": "7.4.0",
-          "dev": true
-        },
-        "acorn-jsx": {
-          "version": "5.3.1",
-          "dev": true,
-          "requires": {}
-        },
         "eslint-visitor-keys": {
           "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz",
+          "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==",
           "dev": true
         }
       }
@@ -33896,6 +33964,12 @@
       "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=",
       "dev": true
     },
+    "lodash.clonedeep": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
+      "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=",
+      "dev": true
+    },
     "lodash.difference": {
       "version": "4.5.0",
       "dev": true
@@ -33916,6 +33990,12 @@
       "version": "3.0.0",
       "dev": true
     },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
     "lodash.sortby": {
       "version": "4.7.0",
       "dev": true
@@ -33951,6 +34031,12 @@
       "integrity": "sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak=",
       "dev": true
     },
+    "lodash.truncate": {
+      "version": "4.4.2",
+      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
+      "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=",
+      "dev": true
+    },
     "lodash.zipobject": {
       "version": "4.1.3",
       "dev": true
@@ -36775,6 +36861,8 @@
     },
     "require-from-string": {
       "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true
     },
     "require-main-filename": {
@@ -37786,6 +37874,8 @@
     },
     "strip-json-comments": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true
     },
     "strip-outer": {
@@ -37877,17 +37967,23 @@
       "dev": true
     },
     "table": {
-      "version": "6.0.7",
+      "version": "6.7.1",
+      "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz",
+      "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==",
       "dev": true,
       "requires": {
-        "ajv": "^7.0.2",
-        "lodash": "^4.17.20",
+        "ajv": "^8.0.1",
+        "lodash.clonedeep": "^4.5.0",
+        "lodash.truncate": "^4.4.2",
         "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.0"
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0"
       },
       "dependencies": {
         "ajv": {
-          "version": "7.0.3",
+          "version": "8.5.0",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.5.0.tgz",
+          "integrity": "sha512-Y2l399Tt1AguU3BPRP9Fn4eN+Or+StUGWCUpbnFyXSo8NZ9S4uj+AG2pjs5apK+ZMOwYOz1+a+VKvKH7CudXgQ==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -37898,6 +37994,8 @@
         },
         "json-schema-traverse": {
           "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+          "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
           "dev": true
         }
       }
diff --git a/package.json b/package.json
index 3f4b7a4c..38b3ced6 100644
--- a/package.json
+++ b/package.json
@@ -200,14 +200,14 @@
     "@types/react": "^17.0.3",
     "@types/react-dom": "^17.0.3",
     "@types/react-redux": "^7.1.16",
-    "@will-stone/eslint-config": "^2.8.0",
+    "@will-stone/eslint-config": "^2.9.0",
     "@will-stone/prettier-config": "^4.0.0",
     "concurrently": "^6.0.1",
     "copy-webpack-plugin": "^6.0.3",
     "css-loader": "^5.2.4",
     "dotenv": "^8.2.0",
     "electron": "^13.0.0",
-    "eslint": "^7.24.0",
+    "eslint": "^7.27.0",
     "fork-ts-checker-webpack-plugin": "^5.2.0",
     "husky": "^6.0.0",
     "jest": "^27.0.3",

From 2c9f384c3ad1c2f69261bed610a78246dd4e6864 Mon Sep 17 00:00:00 2001
From: Will Stone <654103+will-stone@users.noreply.github.com>
Date: Fri, 4 Jun 2021 16:39:37 +0100
Subject: [PATCH 03/12] Fix min height

---
 src/main/main.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/main.ts b/src/main/main.ts
index 9c392ba1..afefdc19 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -144,8 +144,8 @@ electron.app.on('ready', async () => {
     center: true,
     height: bounds?.height || 204,
     minHeight: 204,
-    width: bounds?.width || 458,
-    minWidth: 458,
+    width: bounds?.width || 424,
+    minWidth: 424,
     show: false,
     minimizable: false,
     maximizable: false,

From 92e91285c6771358e328b3145ebff0b8eda08baa Mon Sep 17 00:00:00 2001
From: Will Stone <654103+will-stone@users.noreply.github.com>
Date: Fri, 4 Jun 2021 16:59:03 +0100
Subject: [PATCH 04/12] Refactor app button

---
 src/renderer/components/atoms/app-button.tsx | 39 --------------------
 src/renderer/components/molecules/tile.tsx   | 21 ++++++++---
 2 files changed, 15 insertions(+), 45 deletions(-)
 delete mode 100644 src/renderer/components/atoms/app-button.tsx

diff --git a/src/renderer/components/atoms/app-button.tsx b/src/renderer/components/atoms/app-button.tsx
deleted file mode 100644
index 0f9ae3fe..00000000
--- a/src/renderer/components/atoms/app-button.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import clsx from 'clsx'
-import React from 'react'
-
-import { ExtendedApp } from '../../store/selector-hooks'
-
-interface Props extends React.ComponentPropsWithoutRef<'button'> {
-  app: ExtendedApp
-}
-
-const AppButton: React.FC<Props> = ({
-  app,
-  disabled,
-  onClick,
-  children,
-  className,
-}) => {
-  return (
-    <button
-      key={app.id}
-      aria-label={`${app.name} Tile`}
-      className={clsx(
-        'w-full p-8',
-        'flex flex-col items-center justify-center max-h-full',
-        'focus:outline-none',
-        'space-y-2',
-        !disabled && 'hover:bg-black hover:bg-opacity-10',
-        className,
-      )}
-      disabled={disabled}
-      onClick={(event) => !disabled && onClick && onClick(event)}
-      title={app.name}
-      type="button"
-    >
-      {children}
-    </button>
-  )
-}
-
-export default AppButton
diff --git a/src/renderer/components/molecules/tile.tsx b/src/renderer/components/molecules/tile.tsx
index 32ba3718..f783b466 100644
--- a/src/renderer/components/molecules/tile.tsx
+++ b/src/renderer/components/molecules/tile.tsx
@@ -15,7 +15,6 @@ import {
   clickedTile,
 } from '../../store/actions'
 import { ExtendedApp } from '../../store/selector-hooks'
-import AppButton from '../atoms/app-button'
 import AppLogo from '../atoms/app-logo'
 import { Carrot } from '../atoms/carrot'
 import Kbd from '../atoms/kbd'
@@ -34,11 +33,19 @@ const Tile: React.FC<Props> = ({ app, onClick, controls }) => {
 
   return (
     <div className="relative w-32">
-      <AppButton
-        app={app}
+      <button
+        key={app.id}
+        aria-label={`${app.name} Tile`}
+        className={clsx(
+          'w-full p-8',
+          'flex flex-col items-center justify-center max-h-full',
+          'focus:outline-none',
+          'space-y-2',
+          !isEditMode && 'hover:bg-black hover:bg-opacity-10',
+        )}
         disabled={isEditMode}
         onClick={(event) =>
-          onClick
+          !isEditMode && onClick
             ? onClick(event)
             : dispatch(
                 clickedTile({
@@ -49,11 +56,13 @@ const Tile: React.FC<Props> = ({ app, onClick, controls }) => {
                 }),
               )
         }
+        title={app.name}
+        type="button"
       >
         {
           // TODO what can be done so this isn't hardcoded?
           app.id === 'carrot' ? (
-            <Carrot className="text-5xl" />
+            <Carrot className="text-4xl" />
           ) : (
             <AppLogo app={app} wiggle={isEditMode} />
           )
@@ -116,7 +125,7 @@ const Tile: React.FC<Props> = ({ app, onClick, controls }) => {
         )}
 
         {!controls.hotkey && <div className="opacity-50">{app.name}</div>}
-      </AppButton>
+      </button>
 
       {isEditMode && controls.favourite && (
         <button

From 28ded54d0712c31b46c513c122c655a916dbe9dd Mon Sep 17 00:00:00 2001
From: Will Stone <654103+will-stone@users.noreply.github.com>
Date: Fri, 4 Jun 2021 17:00:10 +0100
Subject: [PATCH 05/12] Show B title instead of ellipsis

---
 src/renderer/components/organisms/url-bar.tsx | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/renderer/components/organisms/url-bar.tsx b/src/renderer/components/organisms/url-bar.tsx
index 66d2c79d..b1276058 100644
--- a/src/renderer/components/organisms/url-bar.tsx
+++ b/src/renderer/components/organisms/url-bar.tsx
@@ -1,7 +1,6 @@
 import { faBackspace } from '@fortawesome/free-solid-svg-icons/faBackspace'
 import { faCog } from '@fortawesome/free-solid-svg-icons/faCog'
 import { faCopy } from '@fortawesome/free-solid-svg-icons/faCopy'
-import { faEllipsisH } from '@fortawesome/free-solid-svg-icons/faEllipsisH'
 import { faGift } from '@fortawesome/free-solid-svg-icons/faGift'
 import { faSignOutAlt } from '@fortawesome/free-solid-svg-icons/faSignOutAlt'
 import { faSync } from '@fortawesome/free-solid-svg-icons/faSync'
@@ -113,11 +112,7 @@ const UrlBar: React.FC<Props> = ({ className }) => {
               )}
             >
               {parsedUrl.host || (
-                <FontAwesomeIcon
-                  className="opacity-30"
-                  fixedWidth
-                  icon={faEllipsisH}
-                />
+                <span className="opacity-30">Browserosaurus</span>
               )}
             </span>
             <span>

From b65abf49fd11edf157c939ab5834d5899813a871 Mon Sep 17 00:00:00 2001
From: Will Stone <654103+will-stone@users.noreply.github.com>
Date: Fri, 4 Jun 2021 17:13:56 +0100
Subject: [PATCH 06/12] Remove carrot button

---
 src/main/main.ts                            |  6 -----
 src/renderer/components/molecules/tile.tsx  | 22 +++++++--------
 src/renderer/components/organisms/tiles.tsx | 30 ++-------------------
 src/renderer/store/actions.ts               |  2 --
 src/renderer/store/reducers.ts              |  7 +----
 5 files changed, 13 insertions(+), 54 deletions(-)

diff --git a/src/main/main.ts b/src/main/main.ts
index afefdc19..ffe3e180 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -14,7 +14,6 @@ import {
   appStarted,
   changedHotkey,
   clickedBWebsiteButton,
-  clickedCarrotButton,
   clickedCloseMenuButton,
   clickedCopyButton,
   clickedEyeButton,
@@ -399,11 +398,6 @@ electron.ipcMain.on('FROM_RENDERER', async (_, action: AnyAction) => {
     isEditMode = false
   }
 
-  // Click carrot
-  else if (clickedCarrotButton.match(action)) {
-    isEditMode = false
-  }
-
   // Click B's website button in settings
   else if (clickedBWebsiteButton.match(action)) {
     isEditMode = false
diff --git a/src/renderer/components/molecules/tile.tsx b/src/renderer/components/molecules/tile.tsx
index f783b466..7695b74f 100644
--- a/src/renderer/components/molecules/tile.tsx
+++ b/src/renderer/components/molecules/tile.tsx
@@ -21,11 +21,10 @@ import Kbd from '../atoms/kbd'
 
 interface Props {
   app: ExtendedApp
-  onClick?: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void
   controls: { favourite: boolean; hotkey: boolean; visibility: boolean }
 }
 
-const Tile: React.FC<Props> = ({ app, onClick, controls }) => {
+const Tile: React.FC<Props> = ({ app, controls }) => {
   const dispatch = useDispatch()
   const url = useSelector((state) => state.ui.url)
   const isEditMode = useSelector((state) => state.ui.isEditMode)
@@ -45,16 +44,15 @@ const Tile: React.FC<Props> = ({ app, onClick, controls }) => {
         )}
         disabled={isEditMode}
         onClick={(event) =>
-          !isEditMode && onClick
-            ? onClick(event)
-            : dispatch(
-                clickedTile({
-                  url,
-                  appId: app.id,
-                  isAlt: event.altKey,
-                  isShift: event.shiftKey,
-                }),
-              )
+          !isEditMode &&
+          dispatch(
+            clickedTile({
+              url,
+              appId: app.id,
+              isAlt: event.altKey,
+              isShift: event.shiftKey,
+            }),
+          )
         }
         title={app.name}
         type="button"
diff --git a/src/renderer/components/organisms/tiles.tsx b/src/renderer/components/organisms/tiles.tsx
index 2d340035..b145370f 100644
--- a/src/renderer/components/organisms/tiles.tsx
+++ b/src/renderer/components/organisms/tiles.tsx
@@ -1,30 +1,21 @@
 import React from 'react'
-import { useDispatch } from 'react-redux'
 
 import { useSelector } from '../../store'
-import { clickedCarrotButton } from '../../store/actions'
-import {
-  useAffiliateApp,
-  useApps,
-  useFavTile,
-  useNormalTiles,
-} from '../../store/selector-hooks'
+import { useApps, useFavTile, useNormalTiles } from '../../store/selector-hooks'
 import Tile from '../molecules/tile'
 
 const Tiles: React.FC = () => {
-  const dispatch = useDispatch()
   const favTile = useFavTile()
   const normalTiles = useNormalTiles()
   const allApps = useApps()
   const isEditMode = useSelector((state) => state.ui.isEditMode)
-  const affiliateApp = useAffiliateApp()
 
   const tiles = isEditMode ? allApps : normalTiles
 
   return (
     <div className="relative flex-grow w-full overflow-y-scroll mr-1">
       <div className="flex justify-start items-center flex-wrap">
-        {/* Favourite */}
+        {/* Favourite is first */}
         {!isEditMode && favTile && (
           <Tile
             app={favTile}
@@ -32,23 +23,6 @@ const Tiles: React.FC = () => {
           />
         )}
 
-        {/* Affiliate */}
-        {affiliateApp &&
-          ((!isEditMode && affiliateApp.isVisible) || isEditMode) && (
-            <Tile
-              app={affiliateApp}
-              controls={{ favourite: false, hotkey: false, visibility: true }}
-              onClick={() => {
-                // eslint-disable-next-line no-alert
-                window.alert(
-                  `Browserosaurus is free and funded by only a few. If you find Browserosaurus useful, please consider a contribution by following the Buy Me A Coffee link in your chosen browser.`,
-                )
-
-                dispatch(clickedCarrotButton())
-              }}
-            />
-          )}
-
         {/* Rest of the tiles */}
         {tiles.map((app, index) => {
           const key = app.id + index
diff --git a/src/renderer/store/actions.ts b/src/renderer/store/actions.ts
index 2852c465..51e2c960 100644
--- a/src/renderer/store/actions.ts
+++ b/src/renderer/store/actions.ts
@@ -61,7 +61,6 @@ const changedHotkey = cA<{ appId: string; value: string }>(
 const clickedCloseMenuButton = cA('settings/clickedCloseMenuButton')
 const clickedEyeButton = cA<string>('settings/clickedEyeButton')
 const clickedFavButton = cA<string>('settings/clickedFavButton')
-const clickedCarrotButton = cA('settings/clickedCarrotButton')
 const clickedQuitButton = cA('settings/clickedQuitButton')
 const clickedReloadButton = cA('settings/clickedReloadButton')
 const clickedSetAsDefaultBrowserButton = cA(
@@ -81,7 +80,6 @@ export {
   appStarted,
   changedHotkey,
   clickedBWebsiteButton,
-  clickedCarrotButton,
   clickedCloseMenuButton,
   clickedCopyButton,
   clickedEyeButton,
diff --git a/src/renderer/store/reducers.ts b/src/renderer/store/reducers.ts
index 2abb7a3e..b85bc208 100644
--- a/src/renderer/store/reducers.ts
+++ b/src/renderer/store/reducers.ts
@@ -1,7 +1,7 @@
 import { createReducer } from '@reduxjs/toolkit'
 import xor from 'lodash/xor'
 
-import { B_URL, CARROT_URL } from '../../config/CONSTANTS'
+import { B_URL } from '../../config/CONSTANTS'
 import { App } from '../../config/types'
 import { Store as MainStore } from '../../main/store'
 import { alterHotkeys } from '../../utils/alterHotkeys'
@@ -9,7 +9,6 @@ import { backspaceUrlParse } from '../../utils/backspaceUrlParse'
 import {
   changedHotkey,
   clickedBWebsiteButton,
-  clickedCarrotButton,
   clickedCloseMenuButton,
   clickedEyeButton,
   clickedFavButton,
@@ -109,10 +108,6 @@ const ui = createReducer<UiState>(
       .addCase(clickedUrlBackspaceButton, (state) => {
         state.url = backspaceUrlParse(state.url)
       })
-      .addCase(clickedCarrotButton, (state) => {
-        state.url = CARROT_URL
-        state.isEditMode = false
-      })
       .addCase(clickedBWebsiteButton, (state) => {
         state.url = B_URL
         state.isEditMode = false

From a56ee82b49d428a98aa587157c98a1a0e5798ae1 Mon Sep 17 00:00:00 2001
From: Will Stone <654103+will-stone@users.noreply.github.com>
Date: Fri, 4 Jun 2021 17:14:26 +0100
Subject: [PATCH 07/12] Up package-lock

---
 package-lock.json | 101 +++++++++++++++++++++++++++++++++-------------
 1 file changed, 73 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7c554c98..09e2644d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5408,8 +5408,9 @@
       }
     },
     "node_modules/atomically": {
-      "version": "1.3.2",
-      "license": "MIT",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz",
+      "integrity": "sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w==",
       "engines": {
         "node": ">=10.12.0"
       }
@@ -6874,7 +6875,8 @@
     },
     "node_modules/conf": {
       "version": "7.1.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/conf/-/conf-7.1.2.tgz",
+      "integrity": "sha512-r8/HEoWPFn4CztjhMJaWNAe5n+gPUCSaJ0oufbqDLFKsA1V8JjAG7G+p0pgoDFAws9Bpk2VtVLLXqOBA7WxLeg==",
       "dependencies": {
         "ajv": "^6.12.2",
         "atomically": "^1.3.1",
@@ -7515,7 +7517,8 @@
     },
     "node_modules/debounce-fn": {
       "version": "4.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz",
+      "integrity": "sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ==",
       "dependencies": {
         "mimic-fn": "^3.0.0"
       },
@@ -7528,7 +7531,8 @@
     },
     "node_modules/debounce-fn/node_modules/mimic-fn": {
       "version": "3.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
+      "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==",
       "engines": {
         "node": ">=8"
       }
@@ -8154,7 +8158,8 @@
     },
     "node_modules/dot-prop": {
       "version": "5.3.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
       "dependencies": {
         "is-obj": "^2.0.0"
       },
@@ -8164,7 +8169,8 @@
     },
     "node_modules/dot-prop/node_modules/is-obj": {
       "version": "2.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+      "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==",
       "engines": {
         "node": ">=8"
       }
@@ -8836,10 +8842,11 @@
       "license": "MIT"
     },
     "node_modules/electron-store": {
-      "version": "6.0.0",
-      "license": "MIT",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/electron-store/-/electron-store-6.0.1.tgz",
+      "integrity": "sha512-8rdM0XEmDGsLuZM2oRABzsLX+XmD5x3rwxPMEPv0MrN9/BWanyy3ilb2v+tCrKtIZVF3MxUiZ9Bfqe8e0popKQ==",
       "dependencies": {
-        "conf": "^7.1.1",
+        "conf": "^7.1.2",
         "type-fest": "^0.16.0"
       },
       "funding": {
@@ -8848,7 +8855,8 @@
     },
     "node_modules/electron-store/node_modules/type-fest": {
       "version": "0.16.0",
-      "license": "(MIT OR CC0-1.0)",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
+      "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==",
       "engines": {
         "node": ">=10"
       },
@@ -9013,8 +9021,9 @@
       }
     },
     "node_modules/env-paths": {
-      "version": "2.2.0",
-      "license": "MIT",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
       "engines": {
         "node": ">=6"
       }
@@ -14671,7 +14680,8 @@
     },
     "node_modules/json-schema-typed": {
       "version": "7.0.3",
-      "license": "BSD-2-Clause"
+      "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.3.tgz",
+      "integrity": "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A=="
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -17480,7 +17490,8 @@
     },
     "node_modules/pkg-up": {
       "version": "3.1.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
       "dependencies": {
         "find-up": "^3.0.0"
       },
@@ -17490,7 +17501,8 @@
     },
     "node_modules/pkg-up/node_modules/find-up": {
       "version": "3.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dependencies": {
         "locate-path": "^3.0.0"
       },
@@ -17500,7 +17512,8 @@
     },
     "node_modules/pkg-up/node_modules/locate-path": {
       "version": "3.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
       "dependencies": {
         "p-locate": "^3.0.0",
         "path-exists": "^3.0.0"
@@ -17511,7 +17524,8 @@
     },
     "node_modules/pkg-up/node_modules/p-locate": {
       "version": "3.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dependencies": {
         "p-limit": "^2.0.0"
       },
@@ -17521,7 +17535,8 @@
     },
     "node_modules/pkg-up/node_modules/path-exists": {
       "version": "3.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
       "engines": {
         "node": ">=4"
       }
@@ -26744,7 +26759,9 @@
       "dev": true
     },
     "atomically": {
-      "version": "1.3.2"
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/atomically/-/atomically-1.7.0.tgz",
+      "integrity": "sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w=="
     },
     "author-regex": {
       "version": "1.0.0",
@@ -27871,6 +27888,8 @@
     },
     "conf": {
       "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/conf/-/conf-7.1.2.tgz",
+      "integrity": "sha512-r8/HEoWPFn4CztjhMJaWNAe5n+gPUCSaJ0oufbqDLFKsA1V8JjAG7G+p0pgoDFAws9Bpk2VtVLLXqOBA7WxLeg==",
       "requires": {
         "ajv": "^6.12.2",
         "atomically": "^1.3.1",
@@ -28334,12 +28353,16 @@
     },
     "debounce-fn": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz",
+      "integrity": "sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ==",
       "requires": {
         "mimic-fn": "^3.0.0"
       },
       "dependencies": {
         "mimic-fn": {
-          "version": "3.1.0"
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz",
+          "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ=="
         }
       }
     },
@@ -28809,12 +28832,16 @@
     },
     "dot-prop": {
       "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz",
+      "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==",
       "requires": {
         "is-obj": "^2.0.0"
       },
       "dependencies": {
         "is-obj": {
-          "version": "2.0.0"
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz",
+          "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w=="
         }
       }
     },
@@ -29308,14 +29335,18 @@
       }
     },
     "electron-store": {
-      "version": "6.0.0",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/electron-store/-/electron-store-6.0.1.tgz",
+      "integrity": "sha512-8rdM0XEmDGsLuZM2oRABzsLX+XmD5x3rwxPMEPv0MrN9/BWanyy3ilb2v+tCrKtIZVF3MxUiZ9Bfqe8e0popKQ==",
       "requires": {
-        "conf": "^7.1.1",
+        "conf": "^7.1.2",
         "type-fest": "^0.16.0"
       },
       "dependencies": {
         "type-fest": {
-          "version": "0.16.0"
+          "version": "0.16.0",
+          "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.16.0.tgz",
+          "integrity": "sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg=="
         }
       }
     },
@@ -29442,7 +29473,9 @@
       "dev": true
     },
     "env-paths": {
-      "version": "2.2.0"
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
+      "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A=="
     },
     "errno": {
       "version": "0.1.7",
@@ -33671,7 +33704,9 @@
       "version": "0.4.1"
     },
     "json-schema-typed": {
-      "version": "7.0.3"
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/json-schema-typed/-/json-schema-typed-7.0.3.tgz",
+      "integrity": "sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A=="
     },
     "json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
@@ -35768,18 +35803,24 @@
     },
     "pkg-up": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
       "requires": {
         "find-up": "^3.0.0"
       },
       "dependencies": {
         "find-up": {
           "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
           "requires": {
             "locate-path": "^3.0.0"
           }
         },
         "locate-path": {
           "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+          "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
           "requires": {
             "p-locate": "^3.0.0",
             "path-exists": "^3.0.0"
@@ -35787,12 +35828,16 @@
         },
         "p-locate": {
           "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+          "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
           "requires": {
             "p-limit": "^2.0.0"
           }
         },
         "path-exists": {
-          "version": "3.0.0"
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU="
         }
       }
     },

From 7a38c1c5780d0c41a05010b8fe3ffa326081497c Mon Sep 17 00:00:00 2001
From: Will Stone <654103+will-stone@users.noreply.github.com>
Date: Fri, 4 Jun 2021 17:15:02 +0100
Subject: [PATCH 08/12] Remove theme store item

---
 src/main/store.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/store.ts b/src/main/store.ts
index 23da6ead..39fad8c9 100644
--- a/src/main/store.ts
+++ b/src/main/store.ts
@@ -13,7 +13,8 @@ export interface Store {
   firstRun?: boolean
   hotkeys: Hotkeys
   hiddenTileIds: string[]
-  theme: 'dark' | 'dracula' | 'light'
+  // TODO [>=15] Deprecated, remove when reach v15
+  theme?: 'dark' | 'dracula' | 'light'
   bounds?: Rectangle
 }
 
@@ -24,6 +25,10 @@ export const store = new ElectronStore<Store>({
     firstRun: true,
     hotkeys: {},
     hiddenTileIds: [],
-    theme: 'dark',
+  },
+  migrations: {
+    '>=14.2.2': (storeInstance) => {
+      storeInstance.delete('theme')
+    },
   },
 })

From a50437e466cf9d0ebaebde0aaccec37314e54dcf Mon Sep 17 00:00:00 2001
From: Will Stone <654103+will-stone@users.noreply.github.com>
Date: Fri, 4 Jun 2021 17:15:25 +0100
Subject: [PATCH 09/12] Fix tests

---
 package-lock.json                             | 346 +++++++++---------
 package.json                                  |   6 +-
 .../components/organisms/tiles.test.tsx       |  16 +-
 .../components/organisms/url-bar.test.tsx     |   4 +-
 4 files changed, 186 insertions(+), 186 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 09e2644d..3c8d51e6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -72,8 +72,8 @@
         "@electron-forge/plugin-webpack": "6.0.0-beta.56",
         "@fullhuman/postcss-purgecss": "^3.1.3",
         "@marshallofsound/webpack-asset-relocator-loader": "^0.5.0",
-        "@testing-library/jest-dom": "^5.12.0",
-        "@testing-library/react": "^11.2.6",
+        "@testing-library/jest-dom": "^5.13.0",
+        "@testing-library/react": "^11.2.7",
         "@types/jest": "^26.0.23",
         "@types/lodash": "^4.14.168",
         "@types/node": "^14.14.41",
@@ -90,7 +90,7 @@
         "eslint": "^7.27.0",
         "fork-ts-checker-webpack-plugin": "^5.2.0",
         "husky": "^6.0.0",
-        "jest": "^27.0.3",
+        "jest": "^27.0.4",
         "lint-staged": "^10.5.4",
         "mini-css-extract-plugin": "^1.6.0",
         "node-loader": "^1.0.2",
@@ -3254,13 +3254,13 @@
       }
     },
     "node_modules/@jest/core": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.0.3.tgz",
-      "integrity": "sha512-rN8lr/OJ8iApcQUh4khnMaOCVX4oRnLwy2tPW3Vh70y62K8Da8fhkxMUq0xX9VPa4+yWUm0tGc/jUSJi+Jzuwg==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.0.4.tgz",
+      "integrity": "sha512-+dsmV8VUs1h/Szb+rEWk8xBM1fp1I///uFy9nk3wXGvRsF2lBp8EVPmtWc+QFRb3MY2b7u2HbkGF1fzoDzQTLA==",
       "dev": true,
       "dependencies": {
         "@jest/console": "^27.0.2",
-        "@jest/reporters": "^27.0.2",
+        "@jest/reporters": "^27.0.4",
         "@jest/test-result": "^27.0.2",
         "@jest/transform": "^27.0.2",
         "@jest/types": "^27.0.2",
@@ -3271,15 +3271,15 @@
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
         "jest-changed-files": "^27.0.2",
-        "jest-config": "^27.0.3",
+        "jest-config": "^27.0.4",
         "jest-haste-map": "^27.0.2",
         "jest-message-util": "^27.0.2",
         "jest-regex-util": "^27.0.1",
-        "jest-resolve": "^27.0.2",
-        "jest-resolve-dependencies": "^27.0.3",
-        "jest-runner": "^27.0.3",
-        "jest-runtime": "^27.0.3",
-        "jest-snapshot": "^27.0.2",
+        "jest-resolve": "^27.0.4",
+        "jest-resolve-dependencies": "^27.0.4",
+        "jest-runner": "^27.0.4",
+        "jest-runtime": "^27.0.4",
+        "jest-snapshot": "^27.0.4",
         "jest-util": "^27.0.2",
         "jest-validate": "^27.0.2",
         "jest-watcher": "^27.0.2",
@@ -3339,13 +3339,13 @@
       }
     },
     "node_modules/@jest/core/node_modules/jest-config": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.3.tgz",
-      "integrity": "sha512-zgtI2YQo+ekKsmYNyDlXFY/7w7WWBSJFoj/WRe173WB88CDUrEYWr0sLdbLOQe+sRu6l1Y2S0MCS6BOJm5jkoA==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.4.tgz",
+      "integrity": "sha512-VkQFAHWnPQefdvHU9A+G3H/Z3NrrTKqWpvxgQz3nkUdkDTWeKJE6e//BL+R7z79dXOMVksYgM/z6ndtN0hfChg==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^27.0.3",
+        "@jest/test-sequencer": "^27.0.4",
         "@jest/types": "^27.0.2",
         "babel-jest": "^27.0.2",
         "chalk": "^4.0.0",
@@ -3353,14 +3353,14 @@
         "glob": "^7.1.1",
         "graceful-fs": "^4.2.4",
         "is-ci": "^3.0.0",
-        "jest-circus": "^27.0.3",
+        "jest-circus": "^27.0.4",
         "jest-environment-jsdom": "^27.0.3",
         "jest-environment-node": "^27.0.3",
         "jest-get-type": "^27.0.1",
-        "jest-jasmine2": "^27.0.3",
+        "jest-jasmine2": "^27.0.4",
         "jest-regex-util": "^27.0.1",
-        "jest-resolve": "^27.0.2",
-        "jest-runner": "^27.0.3",
+        "jest-resolve": "^27.0.4",
+        "jest-runner": "^27.0.4",
         "jest-util": "^27.0.2",
         "jest-validate": "^27.0.2",
         "micromatch": "^4.0.4",
@@ -3574,9 +3574,9 @@
       }
     },
     "node_modules/@jest/reporters": {
-      "version": "27.0.2",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.0.2.tgz",
-      "integrity": "sha512-SVQjew/kafNxSN1my4praGQP+VPVGHsU8zqiEDppLvq6j1lryIjdNb9P+bZSsKeifU4bIoaPnf9Ui0tK9WOpFA==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.0.4.tgz",
+      "integrity": "sha512-Xa90Nm3JnV0xCe4M6A10M9WuN9krb+WFKxV1A98Y4ePCw40n++r7uxFUNU7DT1i9Behj7fjrAIju9oU0t1QtCg==",
       "dev": true,
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
@@ -3595,7 +3595,7 @@
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
         "jest-haste-map": "^27.0.2",
-        "jest-resolve": "^27.0.2",
+        "jest-resolve": "^27.0.4",
         "jest-util": "^27.0.2",
         "jest-worker": "^27.0.2",
         "slash": "^3.0.0",
@@ -3734,15 +3734,15 @@
       }
     },
     "node_modules/@jest/test-sequencer": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.0.3.tgz",
-      "integrity": "sha512-DcLTzraZ8xLr5fcIl+CF14vKeBBpBrn55wFxI9Ju+dhEBdjRdJQ/Z/pLkMehkPZWIQ+rR23J8e+wFDkfjree0Q==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.0.4.tgz",
+      "integrity": "sha512-6UFEVwdmxYdyNffBxVVZxmXEdBE4riSddXYSnFNH0ELFQFk/bvagizim8WfgJTqF4EKd+j1yFxvhb8BMHfOjSQ==",
       "dev": true,
       "dependencies": {
         "@jest/test-result": "^27.0.2",
         "graceful-fs": "^4.2.4",
         "jest-haste-map": "^27.0.2",
-        "jest-runtime": "^27.0.3"
+        "jest-runtime": "^27.0.4"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
@@ -4004,9 +4004,9 @@
       }
     },
     "node_modules/@testing-library/jest-dom": {
-      "version": "5.12.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.12.0.tgz",
-      "integrity": "sha512-N9Y82b2Z3j6wzIoAqajlKVF1Zt7sOH0pPee0sUHXHc5cv2Fdn23r+vpWm0MBBoGJtPOly5+Bdx1lnc3CD+A+ow==",
+      "version": "5.13.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.13.0.tgz",
+      "integrity": "sha512-+jXXTn8GjRnZkJfzG/tqK/2Q7dGlBInR412WE7Aml7CT3wdSpx5dMQC0HOwVQoZ3cNTmQUy8fCVGUV/Zhoyvcw==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.9.2",
@@ -4037,9 +4037,9 @@
       }
     },
     "node_modules/@testing-library/react": {
-      "version": "11.2.6",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.6.tgz",
-      "integrity": "sha512-TXMCg0jT8xmuU8BkKMtp8l7Z50Ykew5WNX8UoIKTaLFwKkP2+1YDhOLA2Ga3wY4x29jyntk7EWfum0kjlYiSjQ==",
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.7.tgz",
+      "integrity": "sha512-tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5",
@@ -12656,14 +12656,14 @@
       }
     },
     "node_modules/jest": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-27.0.3.tgz",
-      "integrity": "sha512-0G9+QqXFIZWgf5rs3yllpaA+13ZawVHfyuhuCV1EnoFbX++rVMRrYWCAnk+dfhwyv9/VTQvn+XG969u8aPRsBg==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-27.0.4.tgz",
+      "integrity": "sha512-Px1iKFooXgGSkk1H8dJxxBIrM3tsc5SIuI4kfKYK2J+4rvCvPGr/cXktxh0e9zIPQ5g09kOMNfHQEmusBUf/ZA==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^27.0.3",
+        "@jest/core": "^27.0.4",
         "import-local": "^3.0.2",
-        "jest-cli": "^27.0.3"
+        "jest-cli": "^27.0.4"
       },
       "bin": {
         "jest": "bin/jest.js"
@@ -12720,9 +12720,9 @@
       }
     },
     "node_modules/jest-changed-files/node_modules/execa": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.1.tgz",
-      "integrity": "sha512-4hFTjFbFzQa3aCLobpbPJR/U+VoL1wdV5ozOWjeet0AWDeYr9UFGM1eUFWHX+VtOWFq4p0xXUXfW1YxUaP4fpw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.0.tgz",
+      "integrity": "sha512-CkdUB7s2y6S+d4y+OM/+ZtQcJCiKUCth4cNImGMqrt2zEVtW2rfHGspQBE1GDo6LjeNIQmTPKXqTCKjqFKyu3A==",
       "dev": true,
       "dependencies": {
         "cross-spawn": "^7.0.3",
@@ -12794,9 +12794,9 @@
       }
     },
     "node_modules/jest-circus": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.0.3.tgz",
-      "integrity": "sha512-tdMfzs7SgD5l7jRcI1iB3vtQi5fHwCgo4RlO8bzZnYc05PZ+tlAOMZeS8eGYkZ2tPaRY/aRLMFWQp/8zXBrolQ==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.0.4.tgz",
+      "integrity": "sha512-QD+eblDiRphta630WRKewuASLs/oY1Zki2G4bccntRvrTHQ63ljwFR5TLduuK4Zg0ZPzW0+8o6AP7KRd1yKOjw==",
       "dev": true,
       "dependencies": {
         "@jest/environment": "^27.0.3",
@@ -12811,8 +12811,8 @@
         "jest-each": "^27.0.2",
         "jest-matcher-utils": "^27.0.2",
         "jest-message-util": "^27.0.2",
-        "jest-runtime": "^27.0.3",
-        "jest-snapshot": "^27.0.2",
+        "jest-runtime": "^27.0.4",
+        "jest-snapshot": "^27.0.4",
         "jest-util": "^27.0.2",
         "pretty-format": "^27.0.2",
         "slash": "^3.0.0",
@@ -12882,19 +12882,19 @@
       "dev": true
     },
     "node_modules/jest-cli": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.0.3.tgz",
-      "integrity": "sha512-7bt9Sgv4nWH5pUnyJfdLf8CHWfo4+7lSPxeBwQx4r0vBj9jweJam/piE2U91SXtQI+ckm+TIN97OVnqIYpVhSg==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.0.4.tgz",
+      "integrity": "sha512-E0T+/i2lxsWAzV7LKYd0SB7HUAvePqaeIh5vX43/G5jXLhv1VzjYzJAGEkTfvxV774ll9cyE2ljcL73PVMEOXQ==",
       "dev": true,
       "dependencies": {
-        "@jest/core": "^27.0.3",
+        "@jest/core": "^27.0.4",
         "@jest/test-result": "^27.0.2",
         "@jest/types": "^27.0.2",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
         "import-local": "^3.0.2",
-        "jest-config": "^27.0.3",
+        "jest-config": "^27.0.4",
         "jest-util": "^27.0.2",
         "jest-validate": "^27.0.2",
         "prompts": "^2.0.1",
@@ -12976,13 +12976,13 @@
       }
     },
     "node_modules/jest-cli/node_modules/jest-config": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.3.tgz",
-      "integrity": "sha512-zgtI2YQo+ekKsmYNyDlXFY/7w7WWBSJFoj/WRe173WB88CDUrEYWr0sLdbLOQe+sRu6l1Y2S0MCS6BOJm5jkoA==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.4.tgz",
+      "integrity": "sha512-VkQFAHWnPQefdvHU9A+G3H/Z3NrrTKqWpvxgQz3nkUdkDTWeKJE6e//BL+R7z79dXOMVksYgM/z6ndtN0hfChg==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^27.0.3",
+        "@jest/test-sequencer": "^27.0.4",
         "@jest/types": "^27.0.2",
         "babel-jest": "^27.0.2",
         "chalk": "^4.0.0",
@@ -12990,14 +12990,14 @@
         "glob": "^7.1.1",
         "graceful-fs": "^4.2.4",
         "is-ci": "^3.0.0",
-        "jest-circus": "^27.0.3",
+        "jest-circus": "^27.0.4",
         "jest-environment-jsdom": "^27.0.3",
         "jest-environment-node": "^27.0.3",
         "jest-get-type": "^27.0.1",
-        "jest-jasmine2": "^27.0.3",
+        "jest-jasmine2": "^27.0.4",
         "jest-regex-util": "^27.0.1",
-        "jest-resolve": "^27.0.2",
-        "jest-runner": "^27.0.3",
+        "jest-resolve": "^27.0.4",
+        "jest-runner": "^27.0.4",
         "jest-util": "^27.0.2",
         "jest-validate": "^27.0.2",
         "micromatch": "^4.0.4",
@@ -13451,9 +13451,9 @@
       }
     },
     "node_modules/jest-jasmine2": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.0.3.tgz",
-      "integrity": "sha512-odJ2ia8P5c+IsqOcWJPmku4AqbXIfTVLRjYTKHri3TEvbmTdLw0ghy13OAPIl/0v7cVH0TURK7+xFOHKDLvKIA==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.0.4.tgz",
+      "integrity": "sha512-yj3WrjjquZwkJw+eA4c9yucHw4/+EHndHWSqgHbHGQfT94ihaaQsa009j1a0puU8CNxPDk0c1oAPeOpdJUElwA==",
       "dev": true,
       "dependencies": {
         "@babel/traverse": "^7.1.0",
@@ -13469,8 +13469,8 @@
         "jest-each": "^27.0.2",
         "jest-matcher-utils": "^27.0.2",
         "jest-message-util": "^27.0.2",
-        "jest-runtime": "^27.0.3",
-        "jest-snapshot": "^27.0.2",
+        "jest-runtime": "^27.0.4",
+        "jest-snapshot": "^27.0.4",
         "jest-util": "^27.0.2",
         "pretty-format": "^27.0.2",
         "throat": "^6.0.1"
@@ -13875,9 +13875,9 @@
       }
     },
     "node_modules/jest-resolve": {
-      "version": "27.0.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.0.2.tgz",
-      "integrity": "sha512-rmfLGyZhwAUR5z3EwPAW7LQTorWAuCYCcsQJoQxT2it+BOgX3zKxa67r1pfpK3ihy2k9TjYD3/lMp5rPm/CL1Q==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.0.4.tgz",
+      "integrity": "sha512-BcfyK2i3cG79PDb/6gB6zFeFQlcqLsQjGBqznFCpA0L/3l1L/oOsltdUjs5eISAWA9HS9qtj8v2PSZr/yWxONQ==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^27.0.2",
@@ -13895,14 +13895,14 @@
       }
     },
     "node_modules/jest-resolve-dependencies": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.3.tgz",
-      "integrity": "sha512-HdjWOvFAgT5CYChF2eiBN2rRKicjaTCCtA3EtH47REIdGzEHGUhYrWYgLahXsiOovvWN6edhcHL5WCa3gbc04A==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.4.tgz",
+      "integrity": "sha512-F33UPfw1YGWCV2uxJl7wD6TvcQn5IC0LtguwY3r4L7R6H4twpLkp5Q2ZfzRx9A2I3G8feiy0O0sqcn/Qoym71A==",
       "dev": true,
       "dependencies": {
         "@jest/types": "^27.0.2",
         "jest-regex-util": "^27.0.1",
-        "jest-snapshot": "^27.0.2"
+        "jest-snapshot": "^27.0.4"
       },
       "engines": {
         "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
@@ -13959,9 +13959,9 @@
       }
     },
     "node_modules/jest-runner": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.0.3.tgz",
-      "integrity": "sha512-zH23uIIh1ro1JCD7XX1bQ0bQwXEsBzLX2UJVE/AVLsk4YJRmTfyXIzzRzBWRdnMHHg1NWkJ4fGs7eFP15IqZpQ==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.0.4.tgz",
+      "integrity": "sha512-NfmvSYLCsCJk2AG8Ar2NAh4PhsJJpO+/r+g4bKR5L/5jFzx/indUpnVBdrfDvuqhGLLAvrKJ9FM/Nt8o1dsqxg==",
       "dev": true,
       "dependencies": {
         "@jest/console": "^27.0.2",
@@ -13975,11 +13975,13 @@
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
         "jest-docblock": "^27.0.1",
+        "jest-environment-jsdom": "^27.0.3",
+        "jest-environment-node": "^27.0.3",
         "jest-haste-map": "^27.0.2",
         "jest-leak-detector": "^27.0.2",
         "jest-message-util": "^27.0.2",
-        "jest-resolve": "^27.0.2",
-        "jest-runtime": "^27.0.3",
+        "jest-resolve": "^27.0.4",
+        "jest-runtime": "^27.0.4",
         "jest-util": "^27.0.2",
         "jest-worker": "^27.0.2",
         "source-map-support": "^0.5.6",
@@ -14053,9 +14055,9 @@
       }
     },
     "node_modules/jest-runtime": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.0.3.tgz",
-      "integrity": "sha512-k1Hl2pWWHBkSXdCggX2lyLRuDnnnmMlnJd+DPLb8LmmAeHW87WgGC6TplD377VxY3KQu73sklkhGUIdwFgsRVQ==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.0.4.tgz",
+      "integrity": "sha512-voJB4xbAjS/qYPboV+e+gmg3jfvHJJY4CagFWBOM9dQKtlaiTjcpD2tWwla84Z7PtXSQPeIpXY0qksA9Dum29A==",
       "dev": true,
       "dependencies": {
         "@jest/console": "^27.0.2",
@@ -14077,8 +14079,8 @@
         "jest-message-util": "^27.0.2",
         "jest-mock": "^27.0.3",
         "jest-regex-util": "^27.0.1",
-        "jest-resolve": "^27.0.2",
-        "jest-snapshot": "^27.0.2",
+        "jest-resolve": "^27.0.4",
+        "jest-snapshot": "^27.0.4",
         "jest-util": "^27.0.2",
         "jest-validate": "^27.0.2",
         "slash": "^3.0.0",
@@ -14201,9 +14203,9 @@
       }
     },
     "node_modules/jest-snapshot": {
-      "version": "27.0.2",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.0.2.tgz",
-      "integrity": "sha512-4RcgvZbPrrbEE/hT6XQ4hr+NVVLNrmsgUnYSnZRT6UAvW9Q2yzGMS+tfJh+xlQJAapnnkNJzsMn6vUa+yfiVHA==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.0.4.tgz",
+      "integrity": "sha512-hnjrvpKGdSMvKfbHyaG5Kul7pDJGZvjVy0CKpzhu28MmAssDXS6GpynhXzgst1wBQoKD8c9b2VS2a5yhDLQRCA==",
       "dev": true,
       "dependencies": {
         "@babel/core": "^7.7.2",
@@ -14225,7 +14227,7 @@
         "jest-haste-map": "^27.0.2",
         "jest-matcher-utils": "^27.0.2",
         "jest-message-util": "^27.0.2",
-        "jest-resolve": "^27.0.2",
+        "jest-resolve": "^27.0.4",
         "jest-util": "^27.0.2",
         "natural-compare": "^1.4.0",
         "pretty-format": "^27.0.2",
@@ -25092,13 +25094,13 @@
       }
     },
     "@jest/core": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.0.3.tgz",
-      "integrity": "sha512-rN8lr/OJ8iApcQUh4khnMaOCVX4oRnLwy2tPW3Vh70y62K8Da8fhkxMUq0xX9VPa4+yWUm0tGc/jUSJi+Jzuwg==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.0.4.tgz",
+      "integrity": "sha512-+dsmV8VUs1h/Szb+rEWk8xBM1fp1I///uFy9nk3wXGvRsF2lBp8EVPmtWc+QFRb3MY2b7u2HbkGF1fzoDzQTLA==",
       "dev": true,
       "requires": {
         "@jest/console": "^27.0.2",
-        "@jest/reporters": "^27.0.2",
+        "@jest/reporters": "^27.0.4",
         "@jest/test-result": "^27.0.2",
         "@jest/transform": "^27.0.2",
         "@jest/types": "^27.0.2",
@@ -25109,15 +25111,15 @@
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
         "jest-changed-files": "^27.0.2",
-        "jest-config": "^27.0.3",
+        "jest-config": "^27.0.4",
         "jest-haste-map": "^27.0.2",
         "jest-message-util": "^27.0.2",
         "jest-regex-util": "^27.0.1",
-        "jest-resolve": "^27.0.2",
-        "jest-resolve-dependencies": "^27.0.3",
-        "jest-runner": "^27.0.3",
-        "jest-runtime": "^27.0.3",
-        "jest-snapshot": "^27.0.2",
+        "jest-resolve": "^27.0.4",
+        "jest-resolve-dependencies": "^27.0.4",
+        "jest-runner": "^27.0.4",
+        "jest-runtime": "^27.0.4",
+        "jest-snapshot": "^27.0.4",
         "jest-util": "^27.0.2",
         "jest-validate": "^27.0.2",
         "jest-watcher": "^27.0.2",
@@ -25157,13 +25159,13 @@
           "dev": true
         },
         "jest-config": {
-          "version": "27.0.3",
-          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.3.tgz",
-          "integrity": "sha512-zgtI2YQo+ekKsmYNyDlXFY/7w7WWBSJFoj/WRe173WB88CDUrEYWr0sLdbLOQe+sRu6l1Y2S0MCS6BOJm5jkoA==",
+          "version": "27.0.4",
+          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.4.tgz",
+          "integrity": "sha512-VkQFAHWnPQefdvHU9A+G3H/Z3NrrTKqWpvxgQz3nkUdkDTWeKJE6e//BL+R7z79dXOMVksYgM/z6ndtN0hfChg==",
           "dev": true,
           "requires": {
             "@babel/core": "^7.1.0",
-            "@jest/test-sequencer": "^27.0.3",
+            "@jest/test-sequencer": "^27.0.4",
             "@jest/types": "^27.0.2",
             "babel-jest": "^27.0.2",
             "chalk": "^4.0.0",
@@ -25171,14 +25173,14 @@
             "glob": "^7.1.1",
             "graceful-fs": "^4.2.4",
             "is-ci": "^3.0.0",
-            "jest-circus": "^27.0.3",
+            "jest-circus": "^27.0.4",
             "jest-environment-jsdom": "^27.0.3",
             "jest-environment-node": "^27.0.3",
             "jest-get-type": "^27.0.1",
-            "jest-jasmine2": "^27.0.3",
+            "jest-jasmine2": "^27.0.4",
             "jest-regex-util": "^27.0.1",
-            "jest-resolve": "^27.0.2",
-            "jest-runner": "^27.0.3",
+            "jest-resolve": "^27.0.4",
+            "jest-runner": "^27.0.4",
             "jest-util": "^27.0.2",
             "jest-validate": "^27.0.2",
             "micromatch": "^4.0.4",
@@ -25341,9 +25343,9 @@
       }
     },
     "@jest/reporters": {
-      "version": "27.0.2",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.0.2.tgz",
-      "integrity": "sha512-SVQjew/kafNxSN1my4praGQP+VPVGHsU8zqiEDppLvq6j1lryIjdNb9P+bZSsKeifU4bIoaPnf9Ui0tK9WOpFA==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.0.4.tgz",
+      "integrity": "sha512-Xa90Nm3JnV0xCe4M6A10M9WuN9krb+WFKxV1A98Y4ePCw40n++r7uxFUNU7DT1i9Behj7fjrAIju9oU0t1QtCg==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
@@ -25362,7 +25364,7 @@
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
         "jest-haste-map": "^27.0.2",
-        "jest-resolve": "^27.0.2",
+        "jest-resolve": "^27.0.4",
         "jest-util": "^27.0.2",
         "jest-worker": "^27.0.2",
         "slash": "^3.0.0",
@@ -25470,15 +25472,15 @@
       }
     },
     "@jest/test-sequencer": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.0.3.tgz",
-      "integrity": "sha512-DcLTzraZ8xLr5fcIl+CF14vKeBBpBrn55wFxI9Ju+dhEBdjRdJQ/Z/pLkMehkPZWIQ+rR23J8e+wFDkfjree0Q==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.0.4.tgz",
+      "integrity": "sha512-6UFEVwdmxYdyNffBxVVZxmXEdBE4riSddXYSnFNH0ELFQFk/bvagizim8WfgJTqF4EKd+j1yFxvhb8BMHfOjSQ==",
       "dev": true,
       "requires": {
         "@jest/test-result": "^27.0.2",
         "graceful-fs": "^4.2.4",
         "jest-haste-map": "^27.0.2",
-        "jest-runtime": "^27.0.3"
+        "jest-runtime": "^27.0.4"
       }
     },
     "@jest/transform": {
@@ -25675,9 +25677,9 @@
       }
     },
     "@testing-library/jest-dom": {
-      "version": "5.12.0",
-      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.12.0.tgz",
-      "integrity": "sha512-N9Y82b2Z3j6wzIoAqajlKVF1Zt7sOH0pPee0sUHXHc5cv2Fdn23r+vpWm0MBBoGJtPOly5+Bdx1lnc3CD+A+ow==",
+      "version": "5.13.0",
+      "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.13.0.tgz",
+      "integrity": "sha512-+jXXTn8GjRnZkJfzG/tqK/2Q7dGlBInR412WE7Aml7CT3wdSpx5dMQC0HOwVQoZ3cNTmQUy8fCVGUV/Zhoyvcw==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.9.2",
@@ -25701,9 +25703,9 @@
       }
     },
     "@testing-library/react": {
-      "version": "11.2.6",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.6.tgz",
-      "integrity": "sha512-TXMCg0jT8xmuU8BkKMtp8l7Z50Ykew5WNX8UoIKTaLFwKkP2+1YDhOLA2Ga3wY4x29jyntk7EWfum0kjlYiSjQ==",
+      "version": "11.2.7",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-11.2.7.tgz",
+      "integrity": "sha512-tzRNp7pzd5QmbtXNG/mhdcl7Awfu/Iz1RaVHY75zTdOkmHCuzMhRL83gWHSgOAcjS3CCbyfwUHMZgRJb4kAfpA==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.12.5",
@@ -32107,14 +32109,14 @@
       }
     },
     "jest": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-27.0.3.tgz",
-      "integrity": "sha512-0G9+QqXFIZWgf5rs3yllpaA+13ZawVHfyuhuCV1EnoFbX++rVMRrYWCAnk+dfhwyv9/VTQvn+XG969u8aPRsBg==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-27.0.4.tgz",
+      "integrity": "sha512-Px1iKFooXgGSkk1H8dJxxBIrM3tsc5SIuI4kfKYK2J+4rvCvPGr/cXktxh0e9zIPQ5g09kOMNfHQEmusBUf/ZA==",
       "dev": true,
       "requires": {
-        "@jest/core": "^27.0.3",
+        "@jest/core": "^27.0.4",
         "import-local": "^3.0.2",
-        "jest-cli": "^27.0.3"
+        "jest-cli": "^27.0.4"
       }
     },
     "jest-changed-files": {
@@ -32151,9 +32153,9 @@
           }
         },
         "execa": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-5.0.1.tgz",
-          "integrity": "sha512-4hFTjFbFzQa3aCLobpbPJR/U+VoL1wdV5ozOWjeet0AWDeYr9UFGM1eUFWHX+VtOWFq4p0xXUXfW1YxUaP4fpw==",
+          "version": "5.1.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.0.tgz",
+          "integrity": "sha512-CkdUB7s2y6S+d4y+OM/+ZtQcJCiKUCth4cNImGMqrt2zEVtW2rfHGspQBE1GDo6LjeNIQmTPKXqTCKjqFKyu3A==",
           "dev": true,
           "requires": {
             "cross-spawn": "^7.0.3",
@@ -32203,9 +32205,9 @@
       }
     },
     "jest-circus": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.0.3.tgz",
-      "integrity": "sha512-tdMfzs7SgD5l7jRcI1iB3vtQi5fHwCgo4RlO8bzZnYc05PZ+tlAOMZeS8eGYkZ2tPaRY/aRLMFWQp/8zXBrolQ==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.0.4.tgz",
+      "integrity": "sha512-QD+eblDiRphta630WRKewuASLs/oY1Zki2G4bccntRvrTHQ63ljwFR5TLduuK4Zg0ZPzW0+8o6AP7KRd1yKOjw==",
       "dev": true,
       "requires": {
         "@jest/environment": "^27.0.3",
@@ -32220,8 +32222,8 @@
         "jest-each": "^27.0.2",
         "jest-matcher-utils": "^27.0.2",
         "jest-message-util": "^27.0.2",
-        "jest-runtime": "^27.0.3",
-        "jest-snapshot": "^27.0.2",
+        "jest-runtime": "^27.0.4",
+        "jest-snapshot": "^27.0.4",
         "jest-util": "^27.0.2",
         "pretty-format": "^27.0.2",
         "slash": "^3.0.0",
@@ -32278,19 +32280,19 @@
       }
     },
     "jest-cli": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.0.3.tgz",
-      "integrity": "sha512-7bt9Sgv4nWH5pUnyJfdLf8CHWfo4+7lSPxeBwQx4r0vBj9jweJam/piE2U91SXtQI+ckm+TIN97OVnqIYpVhSg==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.0.4.tgz",
+      "integrity": "sha512-E0T+/i2lxsWAzV7LKYd0SB7HUAvePqaeIh5vX43/G5jXLhv1VzjYzJAGEkTfvxV774ll9cyE2ljcL73PVMEOXQ==",
       "dev": true,
       "requires": {
-        "@jest/core": "^27.0.3",
+        "@jest/core": "^27.0.4",
         "@jest/test-result": "^27.0.2",
         "@jest/types": "^27.0.2",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
         "import-local": "^3.0.2",
-        "jest-config": "^27.0.3",
+        "jest-config": "^27.0.4",
         "jest-util": "^27.0.2",
         "jest-validate": "^27.0.2",
         "prompts": "^2.0.1",
@@ -32346,13 +32348,13 @@
           }
         },
         "jest-config": {
-          "version": "27.0.3",
-          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.3.tgz",
-          "integrity": "sha512-zgtI2YQo+ekKsmYNyDlXFY/7w7WWBSJFoj/WRe173WB88CDUrEYWr0sLdbLOQe+sRu6l1Y2S0MCS6BOJm5jkoA==",
+          "version": "27.0.4",
+          "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.0.4.tgz",
+          "integrity": "sha512-VkQFAHWnPQefdvHU9A+G3H/Z3NrrTKqWpvxgQz3nkUdkDTWeKJE6e//BL+R7z79dXOMVksYgM/z6ndtN0hfChg==",
           "dev": true,
           "requires": {
             "@babel/core": "^7.1.0",
-            "@jest/test-sequencer": "^27.0.3",
+            "@jest/test-sequencer": "^27.0.4",
             "@jest/types": "^27.0.2",
             "babel-jest": "^27.0.2",
             "chalk": "^4.0.0",
@@ -32360,14 +32362,14 @@
             "glob": "^7.1.1",
             "graceful-fs": "^4.2.4",
             "is-ci": "^3.0.0",
-            "jest-circus": "^27.0.3",
+            "jest-circus": "^27.0.4",
             "jest-environment-jsdom": "^27.0.3",
             "jest-environment-node": "^27.0.3",
             "jest-get-type": "^27.0.1",
-            "jest-jasmine2": "^27.0.3",
+            "jest-jasmine2": "^27.0.4",
             "jest-regex-util": "^27.0.1",
-            "jest-resolve": "^27.0.2",
-            "jest-runner": "^27.0.3",
+            "jest-resolve": "^27.0.4",
+            "jest-runner": "^27.0.4",
             "jest-util": "^27.0.2",
             "jest-validate": "^27.0.2",
             "micromatch": "^4.0.4",
@@ -32712,9 +32714,9 @@
       }
     },
     "jest-jasmine2": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.0.3.tgz",
-      "integrity": "sha512-odJ2ia8P5c+IsqOcWJPmku4AqbXIfTVLRjYTKHri3TEvbmTdLw0ghy13OAPIl/0v7cVH0TURK7+xFOHKDLvKIA==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.0.4.tgz",
+      "integrity": "sha512-yj3WrjjquZwkJw+eA4c9yucHw4/+EHndHWSqgHbHGQfT94ihaaQsa009j1a0puU8CNxPDk0c1oAPeOpdJUElwA==",
       "dev": true,
       "requires": {
         "@babel/traverse": "^7.1.0",
@@ -32730,8 +32732,8 @@
         "jest-each": "^27.0.2",
         "jest-matcher-utils": "^27.0.2",
         "jest-message-util": "^27.0.2",
-        "jest-runtime": "^27.0.3",
-        "jest-snapshot": "^27.0.2",
+        "jest-runtime": "^27.0.4",
+        "jest-snapshot": "^27.0.4",
         "jest-util": "^27.0.2",
         "pretty-format": "^27.0.2",
         "throat": "^6.0.1"
@@ -33055,9 +33057,9 @@
       "dev": true
     },
     "jest-resolve": {
-      "version": "27.0.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.0.2.tgz",
-      "integrity": "sha512-rmfLGyZhwAUR5z3EwPAW7LQTorWAuCYCcsQJoQxT2it+BOgX3zKxa67r1pfpK3ihy2k9TjYD3/lMp5rPm/CL1Q==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.0.4.tgz",
+      "integrity": "sha512-BcfyK2i3cG79PDb/6gB6zFeFQlcqLsQjGBqznFCpA0L/3l1L/oOsltdUjs5eISAWA9HS9qtj8v2PSZr/yWxONQ==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.0.2",
@@ -33096,14 +33098,14 @@
       }
     },
     "jest-resolve-dependencies": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.3.tgz",
-      "integrity": "sha512-HdjWOvFAgT5CYChF2eiBN2rRKicjaTCCtA3EtH47REIdGzEHGUhYrWYgLahXsiOovvWN6edhcHL5WCa3gbc04A==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.0.4.tgz",
+      "integrity": "sha512-F33UPfw1YGWCV2uxJl7wD6TvcQn5IC0LtguwY3r4L7R6H4twpLkp5Q2ZfzRx9A2I3G8feiy0O0sqcn/Qoym71A==",
       "dev": true,
       "requires": {
         "@jest/types": "^27.0.2",
         "jest-regex-util": "^27.0.1",
-        "jest-snapshot": "^27.0.2"
+        "jest-snapshot": "^27.0.4"
       },
       "dependencies": {
         "@jest/types": {
@@ -33131,9 +33133,9 @@
       }
     },
     "jest-runner": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.0.3.tgz",
-      "integrity": "sha512-zH23uIIh1ro1JCD7XX1bQ0bQwXEsBzLX2UJVE/AVLsk4YJRmTfyXIzzRzBWRdnMHHg1NWkJ4fGs7eFP15IqZpQ==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.0.4.tgz",
+      "integrity": "sha512-NfmvSYLCsCJk2AG8Ar2NAh4PhsJJpO+/r+g4bKR5L/5jFzx/indUpnVBdrfDvuqhGLLAvrKJ9FM/Nt8o1dsqxg==",
       "dev": true,
       "requires": {
         "@jest/console": "^27.0.2",
@@ -33147,11 +33149,13 @@
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
         "jest-docblock": "^27.0.1",
+        "jest-environment-jsdom": "^27.0.3",
+        "jest-environment-node": "^27.0.3",
         "jest-haste-map": "^27.0.2",
         "jest-leak-detector": "^27.0.2",
         "jest-message-util": "^27.0.2",
-        "jest-resolve": "^27.0.2",
-        "jest-runtime": "^27.0.3",
+        "jest-resolve": "^27.0.4",
+        "jest-runtime": "^27.0.4",
         "jest-util": "^27.0.2",
         "jest-worker": "^27.0.2",
         "source-map-support": "^0.5.6",
@@ -33209,9 +33213,9 @@
       }
     },
     "jest-runtime": {
-      "version": "27.0.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.0.3.tgz",
-      "integrity": "sha512-k1Hl2pWWHBkSXdCggX2lyLRuDnnnmMlnJd+DPLb8LmmAeHW87WgGC6TplD377VxY3KQu73sklkhGUIdwFgsRVQ==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.0.4.tgz",
+      "integrity": "sha512-voJB4xbAjS/qYPboV+e+gmg3jfvHJJY4CagFWBOM9dQKtlaiTjcpD2tWwla84Z7PtXSQPeIpXY0qksA9Dum29A==",
       "dev": true,
       "requires": {
         "@jest/console": "^27.0.2",
@@ -33233,8 +33237,8 @@
         "jest-message-util": "^27.0.2",
         "jest-mock": "^27.0.3",
         "jest-regex-util": "^27.0.1",
-        "jest-resolve": "^27.0.2",
-        "jest-snapshot": "^27.0.2",
+        "jest-resolve": "^27.0.4",
+        "jest-snapshot": "^27.0.4",
         "jest-util": "^27.0.2",
         "jest-validate": "^27.0.2",
         "slash": "^3.0.0",
@@ -33332,9 +33336,9 @@
       }
     },
     "jest-snapshot": {
-      "version": "27.0.2",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.0.2.tgz",
-      "integrity": "sha512-4RcgvZbPrrbEE/hT6XQ4hr+NVVLNrmsgUnYSnZRT6UAvW9Q2yzGMS+tfJh+xlQJAapnnkNJzsMn6vUa+yfiVHA==",
+      "version": "27.0.4",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.0.4.tgz",
+      "integrity": "sha512-hnjrvpKGdSMvKfbHyaG5Kul7pDJGZvjVy0CKpzhu28MmAssDXS6GpynhXzgst1wBQoKD8c9b2VS2a5yhDLQRCA==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.7.2",
@@ -33356,7 +33360,7 @@
         "jest-haste-map": "^27.0.2",
         "jest-matcher-utils": "^27.0.2",
         "jest-message-util": "^27.0.2",
-        "jest-resolve": "^27.0.2",
+        "jest-resolve": "^27.0.4",
         "jest-util": "^27.0.2",
         "natural-compare": "^1.4.0",
         "pretty-format": "^27.0.2",
diff --git a/package.json b/package.json
index 38b3ced6..64021c50 100644
--- a/package.json
+++ b/package.json
@@ -192,8 +192,8 @@
     "@electron-forge/plugin-webpack": "6.0.0-beta.56",
     "@fullhuman/postcss-purgecss": "^3.1.3",
     "@marshallofsound/webpack-asset-relocator-loader": "^0.5.0",
-    "@testing-library/jest-dom": "^5.12.0",
-    "@testing-library/react": "^11.2.6",
+    "@testing-library/jest-dom": "^5.13.0",
+    "@testing-library/react": "^11.2.7",
     "@types/jest": "^26.0.23",
     "@types/lodash": "^4.14.168",
     "@types/node": "^14.14.41",
@@ -210,7 +210,7 @@
     "eslint": "^7.27.0",
     "fork-ts-checker-webpack-plugin": "^5.2.0",
     "husky": "^6.0.0",
-    "jest": "^27.0.3",
+    "jest": "^27.0.4",
     "lint-staged": "^10.5.4",
     "mini-css-extract-plugin": "^1.6.0",
     "node-loader": "^1.0.2",
diff --git a/src/renderer/components/organisms/tiles.test.tsx b/src/renderer/components/organisms/tiles.test.tsx
index 181567cc..3d0f7922 100644
--- a/src/renderer/components/organisms/tiles.test.tsx
+++ b/src/renderer/components/organisms/tiles.test.tsx
@@ -27,8 +27,7 @@ test('tiles', () => {
   ).toBeVisible()
 
   expect(screen.getAllByRole('button', { name: /[A-z]+ Tile/u })).toHaveLength(
-    // Includes affiliate
-    4,
+    3,
   )
 
   // Set Safari as favourite
@@ -177,8 +176,7 @@ test('tiles order', () => {
   // Check tiles and tile logos shown
   const tiles = screen.getAllByRole('button', { name: /[A-z]+ Tile/u })
 
-  // Includes affiliate
-  expect(tiles).toHaveLength(6)
+  expect(tiles).toHaveLength(5)
 
   // Set hotkeys
   fireEvent.click(screen.getByRole('button', { name: 'Settings menu' }))
@@ -194,10 +192,8 @@ test('tiles order', () => {
 
   const updatedTiles = screen.getAllByRole('button', { name: /[A-z]+ Tile/u })
   expect(updatedTiles[0]).toHaveAttribute('aria-label', 'Safari Tile')
-  // Affiliate
-  expect(updatedTiles[1]).toHaveAttribute('aria-label', 'Contribute Tile')
-  expect(updatedTiles[2]).toHaveAttribute('aria-label', 'Opera Tile')
-  expect(updatedTiles[3]).toHaveAttribute('aria-label', 'Brave Tile')
-  expect(updatedTiles[4]).toHaveAttribute('aria-label', 'Firefox Tile')
-  expect(updatedTiles[5]).toHaveAttribute('aria-label', 'Microsoft Edge Tile')
+  expect(updatedTiles[1]).toHaveAttribute('aria-label', 'Opera Tile')
+  expect(updatedTiles[2]).toHaveAttribute('aria-label', 'Brave Tile')
+  expect(updatedTiles[3]).toHaveAttribute('aria-label', 'Firefox Tile')
+  expect(updatedTiles[4]).toHaveAttribute('aria-label', 'Microsoft Edge Tile')
 })
diff --git a/src/renderer/components/organisms/url-bar.test.tsx b/src/renderer/components/organisms/url-bar.test.tsx
index 83804088..1b56812f 100644
--- a/src/renderer/components/organisms/url-bar.test.tsx
+++ b/src/renderer/components/organisms/url-bar.test.tsx
@@ -8,10 +8,10 @@ import Wrapper from '../_bootstrap'
 const multiElementText =
   (text: string): MatcherFunction =>
   (_, node) => {
-    const nodeHasText = Boolean(node?.textContent?.startsWith(text))
+    const nodeHasText = node?.textContent === text
     const childrenDontHaveText = [
       ...(node?.children as unknown as HTMLElement[]),
-    ].every((child) => Boolean(child?.textContent?.startsWith(text)))
+    ].every((child) => child?.textContent !== text)
 
     return nodeHasText && childrenDontHaveText
   }

From 007501ee2ca5725ed105d6845d2d99816ab1b9e0 Mon Sep 17 00:00:00 2001
From: Will Stone <654103+will-stone@users.noreply.github.com>
Date: Fri, 4 Jun 2021 17:15:56 +0100
Subject: [PATCH 10/12] Start support message

---
 src/main/store.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/store.ts b/src/main/store.ts
index 39fad8c9..2eb11bc8 100644
--- a/src/main/store.ts
+++ b/src/main/store.ts
@@ -9,6 +9,7 @@ import { App } from '../config/types'
 export type Hotkeys = { [key in string]: App['id'] }
 
 export interface Store {
+  supportMessage: number | 'hidden'
   fav: string
   firstRun?: boolean
   hotkeys: Hotkeys
@@ -21,6 +22,7 @@ export interface Store {
 export const store = new ElectronStore<Store>({
   name: 'store',
   defaults: {
+    supportMessage: 0,
     fav: 'com.apple.Safari',
     firstRun: true,
     hotkeys: {},

From 324953941bfe631fb9271bc315d16c206b1b3ebb Mon Sep 17 00:00:00 2001
From: Will Stone <654103+will-stone@users.noreply.github.com>
Date: Fri, 4 Jun 2021 21:02:19 +0100
Subject: [PATCH 11/12] Add support message

---
 src/main/main.ts                              | 13 ++++
 src/main/store.ts                             |  2 +-
 src/renderer/components/atoms/button.tsx      |  2 +-
 src/renderer/components/layout.tsx            |  2 +
 .../components/organisms/support-message.tsx  | 65 +++++++++++++++++++
 src/renderer/components/organisms/url-bar.tsx |  2 +-
 src/renderer/store/actions.ts                 | 10 +++
 src/renderer/store/reducers.ts                | 19 +++++-
 src/renderer/store/selector-hooks.ts          | 21 +++---
 tailwind.config.js                            |  2 +
 10 files changed, 123 insertions(+), 15 deletions(-)
 create mode 100644 src/renderer/components/organisms/support-message.tsx

diff --git a/src/main/main.ts b/src/main/main.ts
index ffe3e180..c0f2261a 100644
--- a/src/main/main.ts
+++ b/src/main/main.ts
@@ -13,11 +13,14 @@ import { apps } from '../config/apps'
 import {
   appStarted,
   changedHotkey,
+  clickedAlreadyDonated,
   clickedBWebsiteButton,
   clickedCloseMenuButton,
   clickedCopyButton,
+  clickedDonate,
   clickedEyeButton,
   clickedFavButton,
+  clickedMaybeLater,
   clickedQuitButton,
   clickedReloadButton,
   clickedSetAsDefaultBrowserButton,
@@ -411,4 +414,14 @@ electron.ipcMain.on('FROM_RENDERER', async (_, action: AnyAction) => {
       bWindow?.hide()
     }
   }
+
+  // Donate button or maybe later buttons clicked
+  else if (clickedDonate.match(action) || clickedMaybeLater.match(action)) {
+    store.set('supportMessage', Date.now())
+  }
+
+  // Already donated button clicked
+  else if (clickedAlreadyDonated.match(action)) {
+    store.set('supportMessage', -1)
+  }
 })
diff --git a/src/main/store.ts b/src/main/store.ts
index 2eb11bc8..babc15a6 100644
--- a/src/main/store.ts
+++ b/src/main/store.ts
@@ -9,7 +9,7 @@ import { App } from '../config/types'
 export type Hotkeys = { [key in string]: App['id'] }
 
 export interface Store {
-  supportMessage: number | 'hidden'
+  supportMessage: number
   fav: string
   firstRun?: boolean
   hotkeys: Hotkeys
diff --git a/src/renderer/components/atoms/button.tsx b/src/renderer/components/atoms/button.tsx
index fb4fc88d..da604e4c 100644
--- a/src/renderer/components/atoms/button.tsx
+++ b/src/renderer/components/atoms/button.tsx
@@ -12,7 +12,7 @@ const Button: React.FC<React.ComponentPropsWithoutRef<'button'>> = ({
     <button
       className={clsx(
         className,
-        'active:shadow-none focus:outline-none active:opacity-75',
+        'focus:outline-none active:opacity-75',
         'px-3 py-2',
         'rounded-md',
         'leading-none',
diff --git a/src/renderer/components/layout.tsx b/src/renderer/components/layout.tsx
index 330a0b7a..d95a04a2 100644
--- a/src/renderer/components/layout.tsx
+++ b/src/renderer/components/layout.tsx
@@ -3,6 +3,7 @@ import React from 'react'
 
 import { useSelector } from '../store'
 import { useKeyboardEvents } from './hooks/use-keyboard-events'
+import SupportMessage from './organisms/support-message'
 import Tiles from './organisms/tiles'
 import UrlBar from './organisms/url-bar'
 
@@ -19,6 +20,7 @@ const App: React.FC = () => {
     >
       <Tiles />
       <UrlBar />
+      <SupportMessage />
     </div>
   )
 }
diff --git a/src/renderer/components/organisms/support-message.tsx b/src/renderer/components/organisms/support-message.tsx
new file mode 100644
index 00000000..68179e98
--- /dev/null
+++ b/src/renderer/components/organisms/support-message.tsx
@@ -0,0 +1,65 @@
+import clsx from 'clsx'
+import React from 'react'
+import { useDispatch } from 'react-redux'
+
+import {
+  clickedAlreadyDonated,
+  clickedDonate,
+  clickedMaybeLater,
+} from '../../store/actions'
+import { useIsSupportMessageHidden } from '../../store/selector-hooks'
+
+const SupportMessage = (): JSX.Element => {
+  const dispatch = useDispatch()
+  const isSupportMessageHidden = useIsSupportMessageHidden()
+
+  return (
+    <div
+      className={clsx(
+        'absolute inset-0',
+        'grid grid-cols-2 gap-4 bg-blueGray-800 text-blueGray-400 overflow-y-auto px-8',
+        isSupportMessageHidden && 'hidden',
+      )}
+    >
+      <div className="flex flex-col justify-center space-y-2">
+        <p>
+          Browserosaurus is freely available but funded by only a few. If you
+          use Browserosaurus in your day-to-day, please consider a contribution.
+        </p>
+        <p>
+          Thank you{' '}
+          <span aria-label="kiss emoji" role="img">
+            😘
+          </span>
+        </p>
+        <p>— Will</p>
+      </div>
+
+      <div className="flex flex-col justify-center items-stretch space-y-4">
+        <button
+          className="bg-blueGray-900 text-blueGray-100 p-4 rounded text-xl focus:outline-none active:opacity-75"
+          onClick={() => dispatch(clickedDonate())}
+          type="button"
+        >
+          Donate
+        </button>
+        <button
+          className="bg-blueGray-900 text-blueGray-300 p-2 rounded focus:outline-none active:opacity-75"
+          onClick={() => dispatch(clickedMaybeLater())}
+          type="button"
+        >
+          Maybe Later
+        </button>
+        <button
+          className="bg-blueGray-900 text-blueGray-500 p-2 rounded focus:outline-none active:opacity-75"
+          onClick={() => dispatch(clickedAlreadyDonated())}
+          type="button"
+        >
+          Already Donated
+        </button>
+      </div>
+    </div>
+  )
+}
+
+export default SupportMessage
diff --git a/src/renderer/components/organisms/url-bar.tsx b/src/renderer/components/organisms/url-bar.tsx
index b1276058..dc910c27 100644
--- a/src/renderer/components/organisms/url-bar.tsx
+++ b/src/renderer/components/organisms/url-bar.tsx
@@ -100,7 +100,7 @@ const UrlBar: React.FC<Props> = ({ className }) => {
           >
             {url === CARROT_URL && (
               <div>
-                <Carrot /> Contribute
+                <Carrot /> Donation URL:
               </div>
             )}
             <span>{parsedUrl.protocol}</span>
diff --git a/src/renderer/store/actions.ts b/src/renderer/store/actions.ts
index 51e2c960..7750dc4e 100644
--- a/src/renderer/store/actions.ts
+++ b/src/renderer/store/actions.ts
@@ -76,14 +76,24 @@ const clickedSettingsButton = cA('urlBar/clickedSettingsButton')
 const clickedUrlBackspaceButton = cA('urlBar/clickedUrlBackspaceButton')
 const clickedCopyButton = cA<string>('urlBar/clickedCopyButton')
 
+// -----------------------------------------------------------------------------
+// Support Message
+// -----------------------------------------------------------------------------
+const clickedDonate = cA('urlBar/clickedDonate')
+const clickedMaybeLater = cA('urlBar/clickedMaybeLater')
+const clickedAlreadyDonated = cA('urlBar/clickedAlreadyDonated')
+
 export {
   appStarted,
   changedHotkey,
+  clickedAlreadyDonated,
   clickedBWebsiteButton,
   clickedCloseMenuButton,
   clickedCopyButton,
+  clickedDonate,
   clickedEyeButton,
   clickedFavButton,
+  clickedMaybeLater,
   clickedQuitButton,
   clickedReloadButton,
   clickedSetAsDefaultBrowserButton,
diff --git a/src/renderer/store/reducers.ts b/src/renderer/store/reducers.ts
index b85bc208..f5098cf8 100644
--- a/src/renderer/store/reducers.ts
+++ b/src/renderer/store/reducers.ts
@@ -1,17 +1,20 @@
 import { createReducer } from '@reduxjs/toolkit'
 import xor from 'lodash/xor'
 
-import { B_URL } from '../../config/CONSTANTS'
+import { B_URL, CARROT_URL } from '../../config/CONSTANTS'
 import { App } from '../../config/types'
 import { Store as MainStore } from '../../main/store'
 import { alterHotkeys } from '../../utils/alterHotkeys'
 import { backspaceUrlParse } from '../../utils/backspaceUrlParse'
 import {
   changedHotkey,
+  clickedAlreadyDonated,
   clickedBWebsiteButton,
   clickedCloseMenuButton,
+  clickedDonate,
   clickedEyeButton,
   clickedFavButton,
+  clickedMaybeLater,
   clickedSetAsDefaultBrowserButton,
   clickedSettingsButton,
   clickedUrlBackspaceButton,
@@ -66,6 +69,7 @@ interface UiState {
   fav: MainStore['fav']
   hiddenTileIds: MainStore['hiddenTileIds']
   hotkeys: MainStore['hotkeys']
+  supportMessage: MainStore['supportMessage']
 }
 
 const ui = createReducer<UiState>(
@@ -80,6 +84,8 @@ const ui = createReducer<UiState>(
     fav: '',
     hiddenTileIds: [],
     hotkeys: {},
+    // Hide by default to prevent flash of message on reload
+    supportMessage: -1,
   },
   (builder) =>
     builder
@@ -127,6 +133,7 @@ const ui = createReducer<UiState>(
         state.fav = action.payload.fav
         state.hiddenTileIds = action.payload.hiddenTileIds
         state.hotkeys = action.payload.hotkeys
+        state.supportMessage = action.payload.supportMessage
       })
       .addCase(receivedUpdateAvailable, (state) => {
         state.updateStatus = 'available'
@@ -143,6 +150,16 @@ const ui = createReducer<UiState>(
       })
       .addCase(clickedSetAsDefaultBrowserButton, (state) => {
         state.isEditMode = false
+      })
+      .addCase(clickedDonate, (state) => {
+        state.url = CARROT_URL
+        state.supportMessage = Date.now()
+      })
+      .addCase(clickedMaybeLater, (state) => {
+        state.supportMessage = Date.now()
+      })
+      .addCase(clickedAlreadyDonated, (state) => {
+        state.supportMessage = -1
       }),
 )
 
diff --git a/src/renderer/store/selector-hooks.ts b/src/renderer/store/selector-hooks.ts
index 3ccd9884..2b036c35 100644
--- a/src/renderer/store/selector-hooks.ts
+++ b/src/renderer/store/selector-hooks.ts
@@ -51,16 +51,15 @@ export const useNormalTiles = (): ExtendedApp[] => {
   return normalTiles
 }
 
-export const useAffiliateApp = (): ExtendedApp | undefined => {
-  const hiddenTileIds = useShallowEqualSelector(
-    (state) => state.ui.hiddenTileIds,
-  )
+export const useIsSupportMessageHidden = (): boolean => {
+  const supportMessageNumber = useSelector((state) => state.ui.supportMessage)
 
-  return {
-    name: 'Contribute',
-    id: 'carrot',
-    isVisible: !hiddenTileIds.includes('carrot'),
-    isFav: false,
-    hotkey: undefined,
-  }
+  const ONE_WEEK = 604_800_000
+
+  return (
+    // Hidden by user
+    supportMessageNumber === -1 ||
+    // Snoozing
+    supportMessageNumber > Date.now() - ONE_WEEK
+  )
 }
diff --git a/tailwind.config.js b/tailwind.config.js
index 02bf82f8..e8e61e38 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -1,8 +1,10 @@
 const plugin = require('tailwindcss/plugin')
+const colors = require('tailwindcss/colors')
 
 module.exports = {
   purge: ['./src/**/*.tsx', './src/**/*.html'],
   theme: {
+    colors,
     fontSize: {
       'xxs': '.6rem',
       'xs': '.75rem',

From b28d5209a54e2da16597c4971daf05d7959a9803 Mon Sep 17 00:00:00 2001
From: Will Stone <654103+will-stone@users.noreply.github.com>
Date: Fri, 4 Jun 2021 21:04:45 +0100
Subject: [PATCH 12/12] Up Electron

---
 package-lock.json | 14 +++++++-------
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3c8d51e6..0930786f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -86,7 +86,7 @@
         "copy-webpack-plugin": "^6.0.3",
         "css-loader": "^5.2.4",
         "dotenv": "^8.2.0",
-        "electron": "^13.0.0",
+        "electron": "^13.1.1",
         "eslint": "^7.27.0",
         "fork-ts-checker-webpack-plugin": "^5.2.0",
         "husky": "^6.0.0",
@@ -8227,9 +8227,9 @@
       "dev": true
     },
     "node_modules/electron": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-13.0.0.tgz",
-      "integrity": "sha512-5SgpU7BgR4DJM1TPuZmKQ89A0AMN9vq7J7OfJebbHjsAuYP+rmJwosVna/RpLYFBuQNM90gnny5sffYGDZFQ4w==",
+      "version": "13.1.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-13.1.1.tgz",
+      "integrity": "sha512-kySSb5CbIkWU2Kd9mf2rpGZC9p1nWhVVNl+CJjuOUGeVPXHbojHvTkDU1iC8AvV28eik3gqHisSJss40Caprog==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -28891,9 +28891,9 @@
       "dev": true
     },
     "electron": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-13.0.0.tgz",
-      "integrity": "sha512-5SgpU7BgR4DJM1TPuZmKQ89A0AMN9vq7J7OfJebbHjsAuYP+rmJwosVna/RpLYFBuQNM90gnny5sffYGDZFQ4w==",
+      "version": "13.1.1",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-13.1.1.tgz",
+      "integrity": "sha512-kySSb5CbIkWU2Kd9mf2rpGZC9p1nWhVVNl+CJjuOUGeVPXHbojHvTkDU1iC8AvV28eik3gqHisSJss40Caprog==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
diff --git a/package.json b/package.json
index 64021c50..f079efad 100644
--- a/package.json
+++ b/package.json
@@ -206,7 +206,7 @@
     "copy-webpack-plugin": "^6.0.3",
     "css-loader": "^5.2.4",
     "dotenv": "^8.2.0",
-    "electron": "^13.0.0",
+    "electron": "^13.1.1",
     "eslint": "^7.27.0",
     "fork-ts-checker-webpack-plugin": "^5.2.0",
     "husky": "^6.0.0",