From 728da763b3fe849e53bcd296791aa3a6787d553c Mon Sep 17 00:00:00 2001
From: fmtabbara <fmtabbara@hotmail.co.uk>
Date: Mon, 23 Aug 2021 22:54:30 +0100
Subject: [PATCH 1/4] fix padding issue

---
 tauri-wallet/src/routes/send/SendWizard.tsx | 2 +-
 tauri-wallet/src/theme.tsx                  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tauri-wallet/src/routes/send/SendWizard.tsx b/tauri-wallet/src/routes/send/SendWizard.tsx
index 6b3aa6eb3a..b0ead550bd 100644
--- a/tauri-wallet/src/routes/send/SendWizard.tsx
+++ b/tauri-wallet/src/routes/send/SendWizard.tsx
@@ -27,7 +27,7 @@ export const SendWizard = () => {
   }
 
   return (
-    <div style={{ padding: theme.spacing(3, 0) }}>
+    <div style={{ paddingTop: theme.spacing(3) }}>
       <Stepper
         activeStep={activeStep}
         style={{
diff --git a/tauri-wallet/src/theme.tsx b/tauri-wallet/src/theme.tsx
index 3db326f2d7..a6d7a2b7d0 100644
--- a/tauri-wallet/src/theme.tsx
+++ b/tauri-wallet/src/theme.tsx
@@ -27,9 +27,9 @@ export const theme = createTheme({
         borderRadius: 50,
         background: '#fff',
       },
-      notchedOutline: {
-        margin: -2,
-      },
+      // notchedOutline: {
+      //   margin: -2,
+      // },
     },
   },
 })

From 66210658cb68c8383c30b2d1ecb84e5e5c37a07a Mon Sep 17 00:00:00 2001
From: fmtabbara <fmtabbara@hotmail.co.uk>
Date: Tue, 24 Aug 2021 10:35:54 +0100
Subject: [PATCH 2/4] add favicon

---
 tauri-wallet/package.json       |    1 +
 tauri-wallet/public/favicon.ico |  Bin 0 -> 5430 bytes
 tauri-wallet/src/theme.tsx      |    8 +-
 tauri-wallet/webpack.config.js  |    2 +
 tauri-wallet/yarn.lock          | 1059 ++++++++++++++++++++++++++++++-
 5 files changed, 1043 insertions(+), 27 deletions(-)
 create mode 100644 tauri-wallet/public/favicon.ico

diff --git a/tauri-wallet/package.json b/tauri-wallet/package.json
index 3da57e9d6f..631cd97f0f 100644
--- a/tauri-wallet/package.json
+++ b/tauri-wallet/package.json
@@ -32,6 +32,7 @@
     "@types/react-router-dom": "^5.1.8",
     "babel-loader": "^8.2.2",
     "css-loader": "^6.2.0",
+    "favicons-webpack-plugin": "^5.0.2",
     "file-loader": "^6.2.0",
     "html-webpack-plugin": "^5.3.2",
     "style-loader": "^3.2.1",
diff --git a/tauri-wallet/public/favicon.ico b/tauri-wallet/public/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..bc951a1c6f2c406072df036cea6e73163f6a687e
GIT binary patch
literal 5430
zcmc&%drVtp6tBjAwtraU57|Idos<T2TaoeT#&c!#aSMIjwzN=Q0WoZ_F&E;7vl}y;
zCYa0^L&hsH#z(R!8snn=w?EWG5Hq>~Ef+d5%b>g&1$p%NeV5&G3m5tT=9hdq_kQ=B
z^E=<U=R4myJl-?BXL<Yf@et+nDxc%=1Uw#(&tHB23ax*H)`VycJtB_Pbwqd>Xx-n)
zt#yjjH3Lnu{O{}%;^v}6adT0w`qr*D_ca-f4$)@v<k{gp%Jcorsq!nHSbhu$UU=ST
z#=R5+nPRI)udy|g<nSK09xN-b?YwjN^$Z`G^*Zpo=+$)4Dt^7g)<InCZ$5m;zbvB<
z>o5?uW^6<56{qN!y1~PI3zTLhSUpCWL!`J&HO0On^xEC|`)_dLgKOS*tgq5y0@uh0
z;BSon*P>z|U)tMr;?xgzW(`wEUmrAoa>L74Ra^)Q3kz_+=Pvz?&8tfN#-3i>y2xH*
z%bzYQhJTT4U3C?F{Nc3?^0K6+#m(f;RFu-PZ&y{)wrnQPWq+@&hnB6aEcfn%OCH<L
z<-f7fQK%^|^~&P?UAJE1^xt;>AC7^b<LBU7{9yU*#xJ9TIX`jywRmFw?N;Xp%QGX?
z^UKHwOL3mzqnUvw&PRAyapDPakabj;`V3`OpB`$}R8d`;w+6?xZw{_#%c&Jz88uFp
zP+d9;)v7C?%p^&Lg$T1jOkGO}ROg1;RcD9Xd8c|ITmL1bo~VbUq+&=oqD4~!$qB`f
zmRb)|#TTG8-vhmQz-=%Nv>OZ*PQf7!rS;)nRo!4?-g)PewDc!POtFA4GSVmZnHXSG
z;ekj<K2iuu<!vw+29^vY)u>cH+#8G$ME!7d?mJE!QPT}aQwl*45$+e4ZNutwI3yn`
z0IjMMj9Q1yq@|(*v4ObYjL*I3bY+)zKrCMn0`9u|<wXGy*|)%`cDM{0NBmYc;C(CK
zb-J<&KZBS95!=RQd=j%i0%Ym!ke}ypnFww_;Qy_(I&G5jjvd8j+n~(41^G&ct%4&S
z2&=PEUe^t=FK^%H4CZ<o7bO5v_6L{<M<e?`$gTefh|A8Ugj5u3D5vk{Oo=N1lftoN
zkoS7eCeh$*%dY+<#5fPu-f&Q5{s<<yy$$<7a-9kz8XmY4(u+9v-QM&mx}SUL`9?IK
zlZWwFjyMtScK_++$Fj^fHcg2w1e46}CM5{_s?)4^&kn*U?%Z<w`wn16qVOQ6KCD}I
zJQ+qGJz`jCie=fj%(HNRBp7pgkPQyA;_BZmSruP%@?ri!@D*udaE*@8n7FR-csyI;
zW4*+&&!Irt-=cW`L6<o1QpotqjN>rwa?yAT^Yc(<Bw=M`*)M*k=mMB?>|F?d{Ai|c
zO~d%f-~My6(qLkIjK-RGyP-s{q4yC8zBslB<Buc!<@gj`(EC?OGGKCIg2r~c=fI*>
zd36MWpA@6U_{*W-Yffgt)Z`?MJva9l3e-w3HuhPN_(Az!C(VZGsVN%!@$4*^@)SPU
zf#S3LA8`Ctn2j(qGfiX9&dh+3kZ!;Z6yF<vL7cyZg?So#W_lX*@{^p{f#NggZ!P~s
zaq45Ae+-U&uainRc`<e%`0V`SFaNfo9BN1T7f;-4;n-tvHlzLb@6r5NmWzj-fAJmg
zwC^7^>;A#`Yxl2((_XGUgu2Fc|I$97>yN+wm-++a?{@tqL^a@6^%w1fU8+AZwk%`o
z`V-^h;ZuL_KrI*-ME$*L0kVPJe~6!M|H0Vc+kgFx`mdrO`Y+42`Y*-?OmY9IJ~z~c
z`%jfm|5@^+|J1JbpJ~4Rr#|1&ww?ZyZ3BMB{kNu?GHI#@Tb}gaW2paLM*a7)u554&
W_upg@)k0b*(@yr^>+RU-_x}JZi=y2C

literal 0
HcmV?d00001

diff --git a/tauri-wallet/src/theme.tsx b/tauri-wallet/src/theme.tsx
index a6d7a2b7d0..688d745914 100644
--- a/tauri-wallet/src/theme.tsx
+++ b/tauri-wallet/src/theme.tsx
@@ -27,9 +27,11 @@ export const theme = createTheme({
         borderRadius: 50,
         background: '#fff',
       },
-      // notchedOutline: {
-      //   margin: -2,
-      // },
+    },
+    MuiStepIcon: {
+      text: {
+        fill: '#fff',
+      },
     },
   },
 })
diff --git a/tauri-wallet/webpack.config.js b/tauri-wallet/webpack.config.js
index 59ba660af7..98f0e568ab 100644
--- a/tauri-wallet/webpack.config.js
+++ b/tauri-wallet/webpack.config.js
@@ -1,4 +1,5 @@
 const HtmlWebpackPlugin = require('html-webpack-plugin')
+const FaviconsWebpackPlugin = require('favicons-webpack-plugin')
 var path = require('path')
 
 module.exports = {
@@ -15,6 +16,7 @@ module.exports = {
       template: path.resolve(__dirname, 'public/index.html'),
       filename: 'index.html',
     }),
+    new FaviconsWebpackPlugin(path.resolve(__dirname, 'public/favicon.ico')),
   ],
   module: {
     rules: [
diff --git a/tauri-wallet/yarn.lock b/tauri-wallet/yarn.lock
index e1c7025e01..107adde6be 100644
--- a/tauri-wallet/yarn.lock
+++ b/tauri-wallet/yarn.lock
@@ -906,7 +906,7 @@
     "@babel/helper-validator-option" "^7.14.5"
     "@babel/plugin-transform-typescript" "^7.15.0"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
   "integrity" "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA=="
   "resolved" "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz"
   "version" "7.15.3"
@@ -955,6 +955,296 @@
   "resolved" "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz"
   "version" "0.8.0"
 
+"@jimp/bmp@^0.16.1":
+  "integrity" "sha512-iwyNYQeBawrdg/f24x3pQ5rEx+/GwjZcCXd3Kgc+ZUd+Ivia7sIqBsOnDaMZdKCBPlfW364ekexnlOqyVa0NWg=="
+  "resolved" "https://registry.npmjs.org/@jimp/bmp/-/bmp-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+    "bmp-js" "^0.1.0"
+
+"@jimp/core@^0.16.1":
+  "integrity" "sha512-la7kQia31V6kQ4q1kI/uLimu8FXx7imWVajDGtwUG8fzePLWDFJyZl0fdIXVCL1JW2nBcRHidUot6jvlRDi2+g=="
+  "resolved" "https://registry.npmjs.org/@jimp/core/-/core-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+    "any-base" "^1.1.0"
+    "buffer" "^5.2.0"
+    "exif-parser" "^0.1.12"
+    "file-type" "^9.0.0"
+    "load-bmfont" "^1.3.1"
+    "mkdirp" "^0.5.1"
+    "phin" "^2.9.1"
+    "pixelmatch" "^4.0.2"
+    "tinycolor2" "^1.4.1"
+
+"@jimp/custom@^0.16.1", "@jimp/custom@>=0.3.5":
+  "integrity" "sha512-DNUAHNSiUI/j9hmbatD6WN/EBIyeq4AO0frl5ETtt51VN1SvE4t4v83ZA/V6ikxEf3hxLju4tQ5Pc3zmZkN/3A=="
+  "resolved" "https://registry.npmjs.org/@jimp/custom/-/custom-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/core" "^0.16.1"
+
+"@jimp/gif@^0.16.1":
+  "integrity" "sha512-r/1+GzIW1D5zrP4tNrfW+3y4vqD935WBXSc8X/wm23QTY9aJO9Lw6PEdzpYCEY+SOklIFKaJYUAq/Nvgm/9ryw=="
+  "resolved" "https://registry.npmjs.org/@jimp/gif/-/gif-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+    "gifwrap" "^0.9.2"
+    "omggif" "^1.0.9"
+
+"@jimp/jpeg@^0.16.1":
+  "integrity" "sha512-8352zrdlCCLFdZ/J+JjBslDvml+fS3Z8gttdml0We759PnnZGqrnPRhkOEOJbNUlE+dD4ckLeIe6NPxlS/7U+w=="
+  "resolved" "https://registry.npmjs.org/@jimp/jpeg/-/jpeg-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+    "jpeg-js" "0.4.2"
+
+"@jimp/plugin-blit@^0.16.1", "@jimp/plugin-blit@>=0.3.5":
+  "integrity" "sha512-fKFNARm32RoLSokJ8WZXHHH2CGzz6ire2n1Jh6u+XQLhk9TweT1DcLHIXwQMh8oR12KgjbgsMGvrMVlVknmOAg=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-blit/-/plugin-blit-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-blur@^0.16.1", "@jimp/plugin-blur@>=0.3.5":
+  "integrity" "sha512-1WhuLGGj9MypFKRcPvmW45ht7nXkOKu+lg3n2VBzIB7r4kKNVchuI59bXaCYQumOLEqVK7JdB4glaDAbCQCLyw=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-blur/-/plugin-blur-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-circle@^0.16.1":
+  "integrity" "sha512-JK7yi1CIU7/XL8hdahjcbGA3V7c+F+Iw+mhMQhLEi7Q0tCnZ69YJBTamMiNg3fWPVfMuvWJJKOBRVpwNTuaZRg=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-circle/-/plugin-circle-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-color@^0.16.1", "@jimp/plugin-color@>=0.8.0":
+  "integrity" "sha512-9yQttBAO5SEFj7S6nJK54f+1BnuBG4c28q+iyzm1JjtnehjqMg6Ljw4gCSDCvoCQ3jBSYHN66pmwTV74SU1B7A=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-color/-/plugin-color-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+    "tinycolor2" "^1.4.1"
+
+"@jimp/plugin-contain@^0.16.1":
+  "integrity" "sha512-44F3dUIjBDHN+Ym/vEfg+jtjMjAqd2uw9nssN67/n4FdpuZUVs7E7wadKY1RRNuJO+WgcD5aDQcsvurXMETQTg=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-contain/-/plugin-contain-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-cover@^0.16.1":
+  "integrity" "sha512-YztWCIldBAVo0zxcQXR+a/uk3/TtYnpKU2CanOPJ7baIuDlWPsG+YE4xTsswZZc12H9Kl7CiziEbDtvF9kwA/Q=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-cover/-/plugin-cover-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-crop@^0.16.1", "@jimp/plugin-crop@>=0.3.5":
+  "integrity" "sha512-UQdva9oQzCVadkyo3T5Tv2CUZbf0klm2cD4cWMlASuTOYgaGaFHhT9st+kmfvXjKL8q3STkBu/zUPV6PbuV3ew=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-crop/-/plugin-crop-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-displace@^0.16.1":
+  "integrity" "sha512-iVAWuz2+G6Heu8gVZksUz+4hQYpR4R0R/RtBzpWEl8ItBe7O6QjORAkhxzg+WdYLL2A/Yd4ekTpvK0/qW8hTVw=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-displace/-/plugin-displace-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-dither@^0.16.1":
+  "integrity" "sha512-tADKVd+HDC9EhJRUDwMvzBXPz4GLoU6s5P7xkVq46tskExYSptgj5713J5Thj3NMgH9Rsqu22jNg1H/7tr3V9Q=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-dither/-/plugin-dither-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-fisheye@^0.16.1":
+  "integrity" "sha512-BWHnc5hVobviTyIRHhIy9VxI1ACf4CeSuCfURB6JZm87YuyvgQh5aX5UDKtOz/3haMHXBLP61ZBxlNpMD8CG4A=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-fisheye/-/plugin-fisheye-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-flip@^0.16.1":
+  "integrity" "sha512-KdxTf0zErfZ8DyHkImDTnQBuHby+a5YFdoKI/G3GpBl3qxLBvC+PWkS2F/iN3H7wszP7/TKxTEvWL927pypT0w=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-flip/-/plugin-flip-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-gaussian@^0.16.1":
+  "integrity" "sha512-u9n4wjskh3N1mSqketbL6tVcLU2S5TEaFPR40K6TDv4phPLZALi1Of7reUmYpVm8mBDHt1I6kGhuCJiWvzfGyg=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-gaussian/-/plugin-gaussian-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-invert@^0.16.1":
+  "integrity" "sha512-2DKuyVXANH8WDpW9NG+PYFbehzJfweZszFYyxcaewaPLN0GxvxVLOGOPP1NuUTcHkOdMFbE0nHDuB7f+sYF/2w=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-invert/-/plugin-invert-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-mask@^0.16.1":
+  "integrity" "sha512-snfiqHlVuj4bSFS0v96vo2PpqCDMe4JB+O++sMo5jF5mvGcGL6AIeLo8cYqPNpdO6BZpBJ8MY5El0Veckhr39Q=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-mask/-/plugin-mask-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-normalize@^0.16.1":
+  "integrity" "sha512-dOQfIOvGLKDKXPU8xXWzaUeB0nvkosHw6Xg1WhS1Z5Q0PazByhaxOQkSKgUryNN/H+X7UdbDvlyh/yHf3ITRaw=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-normalize/-/plugin-normalize-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-print@^0.16.1":
+  "integrity" "sha512-ceWgYN40jbN4cWRxixym+csyVymvrryuKBQ+zoIvN5iE6OyS+2d7Mn4zlNgumSczb9GGyZZESIgVcBDA1ezq0Q=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-print/-/plugin-print-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+    "load-bmfont" "^1.4.0"
+
+"@jimp/plugin-resize@^0.16.1", "@jimp/plugin-resize@>=0.3.5", "@jimp/plugin-resize@>=0.8.0":
+  "integrity" "sha512-u4JBLdRI7dargC04p2Ha24kofQBk3vhaf0q8FwSYgnCRwxfvh2RxvhJZk9H7Q91JZp6wgjz/SjvEAYjGCEgAwQ=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-resize/-/plugin-resize-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-rotate@^0.16.1", "@jimp/plugin-rotate@>=0.3.5":
+  "integrity" "sha512-ZUU415gDQ0VjYutmVgAYYxC9Og9ixu2jAGMCU54mSMfuIlmohYfwARQmI7h4QB84M76c9hVLdONWjuo+rip/zg=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-rotate/-/plugin-rotate-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-scale@^0.16.1", "@jimp/plugin-scale@>=0.3.5":
+  "integrity" "sha512-jM2QlgThIDIc4rcyughD5O7sOYezxdafg/2Xtd1csfK3z6fba3asxDwthqPZAgitrLgiKBDp6XfzC07Y/CefUw=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-scale/-/plugin-scale-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-shadow@^0.16.1":
+  "integrity" "sha512-MeD2Is17oKzXLnsphAa1sDstTu6nxscugxAEk3ji0GV1FohCvpHBcec0nAq6/czg4WzqfDts+fcPfC79qWmqrA=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-shadow/-/plugin-shadow-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugin-threshold@^0.16.1":
+  "integrity" "sha512-iGW8U/wiCSR0+6syrPioVGoSzQFt4Z91SsCRbgNKTAk7D+XQv6OI78jvvYg4o0c2FOlwGhqz147HZV5utoSLxA=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugin-threshold/-/plugin-threshold-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+
+"@jimp/plugins@^0.16.1":
+  "integrity" "sha512-c+lCqa25b+4q6mJZSetlxhMoYuiltyS+ValLzdwK/47+aYsq+kcJNl+TuxIEKf59yr9+5rkbpsPkZHLF/V7FFA=="
+  "resolved" "https://registry.npmjs.org/@jimp/plugins/-/plugins-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/plugin-blit" "^0.16.1"
+    "@jimp/plugin-blur" "^0.16.1"
+    "@jimp/plugin-circle" "^0.16.1"
+    "@jimp/plugin-color" "^0.16.1"
+    "@jimp/plugin-contain" "^0.16.1"
+    "@jimp/plugin-cover" "^0.16.1"
+    "@jimp/plugin-crop" "^0.16.1"
+    "@jimp/plugin-displace" "^0.16.1"
+    "@jimp/plugin-dither" "^0.16.1"
+    "@jimp/plugin-fisheye" "^0.16.1"
+    "@jimp/plugin-flip" "^0.16.1"
+    "@jimp/plugin-gaussian" "^0.16.1"
+    "@jimp/plugin-invert" "^0.16.1"
+    "@jimp/plugin-mask" "^0.16.1"
+    "@jimp/plugin-normalize" "^0.16.1"
+    "@jimp/plugin-print" "^0.16.1"
+    "@jimp/plugin-resize" "^0.16.1"
+    "@jimp/plugin-rotate" "^0.16.1"
+    "@jimp/plugin-scale" "^0.16.1"
+    "@jimp/plugin-shadow" "^0.16.1"
+    "@jimp/plugin-threshold" "^0.16.1"
+    "timm" "^1.6.1"
+
+"@jimp/png@^0.16.1":
+  "integrity" "sha512-iyWoCxEBTW0OUWWn6SveD4LePW89kO7ZOy5sCfYeDM/oTPLpR8iMIGvZpZUz1b8kvzFr27vPst4E5rJhGjwsdw=="
+  "resolved" "https://registry.npmjs.org/@jimp/png/-/png-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/utils" "^0.16.1"
+    "pngjs" "^3.3.3"
+
+"@jimp/tiff@^0.16.1":
+  "integrity" "sha512-3K3+xpJS79RmSkAvFMgqY5dhSB+/sxhwTFA9f4AVHUK0oKW+u6r52Z1L0tMXHnpbAdR9EJ+xaAl2D4x19XShkQ=="
+  "resolved" "https://registry.npmjs.org/@jimp/tiff/-/tiff-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "utif" "^2.0.1"
+
+"@jimp/types@^0.16.1":
+  "integrity" "sha512-g1w/+NfWqiVW4CaXSJyD28JQqZtm2eyKMWPhBBDCJN9nLCN12/Az0WFF3JUAktzdsEC2KRN2AqB1a2oMZBNgSQ=="
+  "resolved" "https://registry.npmjs.org/@jimp/types/-/types-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/bmp" "^0.16.1"
+    "@jimp/gif" "^0.16.1"
+    "@jimp/jpeg" "^0.16.1"
+    "@jimp/png" "^0.16.1"
+    "@jimp/tiff" "^0.16.1"
+    "timm" "^1.6.1"
+
+"@jimp/utils@^0.16.1":
+  "integrity" "sha512-8fULQjB0x4LzUSiSYG6ZtQl355sZjxbv8r9PPAuYHzS9sGiSHJQavNqK/nKnpDsVkU88/vRGcE7t3nMU0dEnVw=="
+  "resolved" "https://registry.npmjs.org/@jimp/utils/-/utils-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "regenerator-runtime" "^0.13.3"
+
 "@material-ui/core@^4.0.0", "@material-ui/core@^4.12.1", "@material-ui/core@^4.12.3":
   "integrity" "sha512-sdpgI/PL56QVsEJldwEe4FFaFTLUqN+rd7sSZiRCdx2E/C7z5yK0y/khAWVBH24tXwto7I1hCzNWfJGZIYJKnw=="
   "resolved" "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.3.tgz"
@@ -1165,6 +1455,13 @@
   "resolved" "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz"
   "version" "0.0.50"
 
+"@types/favicons@5.5.0":
+  "integrity" "sha512-s76OlRaBfqtGu2ZBobnZv2NETfqsQUVfKKlOkKNGo4ArBsqiblodKsnQ3j29hCCgmpQacEfLxealV96za+tzVQ=="
+  "resolved" "https://registry.npmjs.org/@types/favicons/-/favicons-5.5.0.tgz"
+  "version" "5.5.0"
+  dependencies:
+    "@types/node" "*"
+
 "@types/glob@^7.1.1":
   "integrity" "sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA=="
   "resolved" "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz"
@@ -1443,7 +1740,7 @@
   "resolved" "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"
   "version" "3.5.2"
 
-"ajv@^6.1.0", "ajv@^6.12.4", "ajv@^6.12.5", "ajv@^6.9.1", "ajv@>=5.0.0":
+"ajv@^6.1.0", "ajv@^6.12.3", "ajv@^6.12.4", "ajv@^6.12.5", "ajv@^6.9.1", "ajv@>=5.0.0":
   "integrity" "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="
   "resolved" "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"
   "version" "6.12.6"
@@ -1523,6 +1820,11 @@
   dependencies:
     "color-convert" "^2.0.1"
 
+"any-base@^1.1.0":
+  "integrity" "sha512-uMgjozySS8adZZYePpaWs8cxB9/kdzmpX6SgJZ+wbz1K5eYk5QMYDVJaZKhxyIHUdnnJkfR7SVgStgH7LkGUyg=="
+  "resolved" "https://registry.npmjs.org/any-base/-/any-base-1.1.0.tgz"
+  "version" "1.1.0"
+
 "anymatch@^2.0.0":
   "integrity" "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw=="
   "resolved" "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz"
@@ -1608,6 +1910,23 @@
   "resolved" "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz"
   "version" "0.3.2"
 
+"arrify@^1.0.1":
+  "integrity" "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
+  "resolved" "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz"
+  "version" "1.0.1"
+
+"asn1@~0.2.3":
+  "integrity" "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="
+  "resolved" "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz"
+  "version" "0.2.4"
+  dependencies:
+    "safer-buffer" "~2.1.0"
+
+"assert-plus@^1.0.0", "assert-plus@1.0.0":
+  "integrity" "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+  "resolved" "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+  "version" "1.0.0"
+
 "assign-symbols@^1.0.0":
   "integrity" "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c="
   "resolved" "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz"
@@ -1630,11 +1949,31 @@
   dependencies:
     "lodash" "^4.17.14"
 
+"asynckit@^0.4.0":
+  "integrity" "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+  "resolved" "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
+  "version" "0.4.0"
+
 "atob@^2.1.2":
   "integrity" "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg=="
   "resolved" "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz"
   "version" "2.1.2"
 
+"author-regex@^1.0.0":
+  "integrity" "sha1-0IiFvmubv5Q5/gh8dihyRfCoFFA="
+  "resolved" "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz"
+  "version" "1.0.0"
+
+"aws-sign2@~0.7.0":
+  "integrity" "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+  "resolved" "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"
+  "version" "0.7.0"
+
+"aws4@^1.8.0":
+  "integrity" "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
+  "resolved" "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"
+  "version" "1.11.0"
+
 "babel-loader@^8.2.2":
   "integrity" "sha512-JvTd0/D889PQBtUXJ2PXaKU/pjZDMtHA9V2ecm+eNRmmBCMR09a+fmpGTNwnJtFmFl5Ei7Vy47LjBb+L0wQ99g=="
   "resolved" "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz"
@@ -1711,11 +2050,23 @@
   "resolved" "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz"
   "version" "0.6.1"
 
+"bcrypt-pbkdf@^1.0.0":
+  "integrity" "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4="
+  "resolved" "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"
+  "version" "1.0.2"
+  dependencies:
+    "tweetnacl" "^0.14.3"
+
 "big.js@^5.2.2":
   "integrity" "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
   "resolved" "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz"
   "version" "5.2.2"
 
+"bignumber.js@^2.1.0":
+  "integrity" "sha1-g4qZLan51zfg9LLbC+YrsJ3Qxeg="
+  "resolved" "https://registry.npmjs.org/bignumber.js/-/bignumber.js-2.4.0.tgz"
+  "version" "2.4.0"
+
 "bin-build@^3.0.0":
   "integrity" "sha512-jcUOof71/TNAI2uM5uoUaDq2ePcVBQ3R/qhxAz1rX7UfvduAL/RXD3jXzvn8cVcDJdGVkiR1shal3OH0ImpuhA=="
   "resolved" "https://registry.yarnpkg.com/bin-build/-/bin-build-3.0.0.tgz"
@@ -1786,6 +2137,21 @@
     "inherits" "^2.0.4"
     "readable-stream" "^3.4.0"
 
+"bmp-js@^0.1.0":
+  "integrity" "sha1-4Fpj95amwf8l9Hcex62twUjAcjM="
+  "resolved" "https://registry.npmjs.org/bmp-js/-/bmp-js-0.1.0.tgz"
+  "version" "0.1.0"
+
+"bmp-js@0.0.1":
+  "integrity" "sha1-WtAUcJnROp84qnuZrx1ueGZu038="
+  "resolved" "https://registry.npmjs.org/bmp-js/-/bmp-js-0.0.1.tgz"
+  "version" "0.0.1"
+
+"bmp-js@0.0.3":
+  "integrity" "sha1-ZBE+nHzxICs3btYHvzBibr5XsYo="
+  "resolved" "https://registry.npmjs.org/bmp-js/-/bmp-js-0.0.3.tgz"
+  "version" "0.0.3"
+
 "body-parser@1.19.0":
   "integrity" "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="
   "resolved" "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz"
@@ -1892,7 +2258,7 @@
   "resolved" "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz"
   "version" "1.1.0"
 
-"buffer-alloc@^1.2.0":
+"buffer-alloc@^1.1.0", "buffer-alloc@^1.2.0":
   "integrity" "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow=="
   "resolved" "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz"
   "version" "1.2.0"
@@ -1905,6 +2271,11 @@
   "resolved" "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
   "version" "0.2.13"
 
+"buffer-equal@0.0.1":
+  "integrity" "sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs="
+  "resolved" "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz"
+  "version" "0.0.1"
+
 "buffer-fill@^1.0.0":
   "integrity" "sha1-+PeLdniYiO858gXNY39o5wISKyw="
   "resolved" "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz"
@@ -1920,7 +2291,7 @@
   "resolved" "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz"
   "version" "1.1.1"
 
-"buffer@^5.2.1", "buffer@^5.5.0":
+"buffer@^5.2.0", "buffer@^5.2.1", "buffer@^5.5.0":
   "integrity" "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="
   "resolved" "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz"
   "version" "5.7.1"
@@ -2041,6 +2412,11 @@
   "resolved" "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz"
   "version" "1.0.30001251"
 
+"caseless@~0.12.0":
+  "integrity" "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+  "resolved" "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"
+  "version" "0.12.0"
+
 "caw@^2.0.0", "caw@^2.0.1":
   "integrity" "sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="
   "resolved" "https://registry.yarnpkg.com/caw/-/caw-2.0.1.tgz"
@@ -2167,6 +2543,11 @@
     "strip-ansi" "^5.2.0"
     "wrap-ansi" "^5.1.0"
 
+"clone-buffer@^1.0.0":
+  "integrity" "sha1-4+JbIHrE5wGvch4staFnksrD3Fg="
+  "resolved" "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz"
+  "version" "1.0.0"
+
 "clone-deep@^4.0.1":
   "integrity" "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ=="
   "resolved" "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz"
@@ -2183,11 +2564,35 @@
   dependencies:
     "mimic-response" "^1.0.0"
 
+"clone-stats@^1.0.0":
+  "integrity" "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA="
+  "resolved" "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz"
+  "version" "1.0.0"
+
 "clone@^1.0.2":
   "integrity" "sha1-2jCcwmPfFZlMaIypAheco8fNfH4="
   "resolved" "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz"
   "version" "1.0.4"
 
+"clone@^2.1.1":
+  "integrity" "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
+  "resolved" "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"
+  "version" "2.1.2"
+
+"clone@^2.1.2":
+  "integrity" "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
+  "resolved" "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"
+  "version" "2.1.2"
+
+"cloneable-readable@^1.0.0":
+  "integrity" "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ=="
+  "resolved" "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz"
+  "version" "1.1.3"
+  dependencies:
+    "inherits" "^2.0.1"
+    "process-nextick-args" "^2.0.0"
+    "readable-stream" "^2.3.5"
+
 "clsx@^1.0.4", "clsx@^1.1.1":
   "integrity" "sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA=="
   "resolved" "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz"
@@ -2251,6 +2656,18 @@
   "resolved" "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz"
   "version" "1.3.0"
 
+"colors@^1.4.0":
+  "integrity" "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA=="
+  "resolved" "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz"
+  "version" "1.4.0"
+
+"combined-stream@^1.0.6", "combined-stream@~1.0.6":
+  "integrity" "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="
+  "resolved" "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
+  "version" "1.0.8"
+  dependencies:
+    "delayed-stream" "~1.0.0"
+
 "commander@^2.20.0", "commander@^2.8.1":
   "integrity" "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
   "resolved" "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz"
@@ -2378,7 +2795,7 @@
     "browserslist" "^4.16.7"
     "semver" "7.0.0"
 
-"core-util-is@~1.0.0":
+"core-util-is@~1.0.0", "core-util-is@1.0.2":
   "integrity" "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
   "resolved" "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"
   "version" "1.0.2"
@@ -2484,6 +2901,13 @@
   dependencies:
     "array-find-index" "^1.0.1"
 
+"dashdash@^1.12.0":
+  "integrity" "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA="
+  "resolved" "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"
+  "version" "1.14.1"
+  dependencies:
+    "assert-plus" "^1.0.0"
+
 "debug@^2.2.0", "debug@^2.3.3", "debug@2.6.9":
   "integrity" "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="
   "resolved" "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz"
@@ -2687,6 +3111,11 @@
     "pify" "^4.0.1"
     "rimraf" "^2.6.3"
 
+"delayed-stream@~1.0.0":
+  "integrity" "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+  "resolved" "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+  "version" "1.0.0"
+
 "delegates@^1.0.0":
   "integrity" "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o="
   "resolved" "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz"
@@ -2763,6 +3192,11 @@
     "domhandler" "^4.2.0"
     "entities" "^2.0.0"
 
+"dom-walk@^0.1.0":
+  "integrity" "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
+  "resolved" "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz"
+  "version" "0.1.2"
+
 "domelementtype@^2.0.1", "domelementtype@^2.2.0":
   "integrity" "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A=="
   "resolved" "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz"
@@ -2839,6 +3273,14 @@
   "resolved" "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz"
   "version" "0.1.4"
 
+"ecc-jsbn@~0.1.1":
+  "integrity" "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk="
+  "resolved" "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"
+  "version" "0.1.2"
+  dependencies:
+    "jsbn" "~0.1.0"
+    "safer-buffer" "^2.1.0"
+
 "ee-first@1.1.1":
   "integrity" "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
   "resolved" "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz"
@@ -2918,6 +3360,11 @@
   "resolved" "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz"
   "version" "4.1.1"
 
+"es6-promise@^3.0.2":
+  "integrity" "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM="
+  "resolved" "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz"
+  "version" "3.3.1"
+
 "escalade@^3.1.1":
   "integrity" "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
   "resolved" "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz"
@@ -3054,6 +3501,11 @@
   dependencies:
     "pify" "^2.2.0"
 
+"exif-parser@^0.1.12", "exif-parser@^0.1.9":
+  "integrity" "sha1-WKnS1ywCwfbwKg70qRZicrd2CSI="
+  "resolved" "https://registry.npmjs.org/exif-parser/-/exif-parser-0.1.12.tgz"
+  "version" "0.1.12"
+
 "expand-brackets@^2.1.4":
   "integrity" "sha1-t3c14xXOMPa27/D4OwQVGiJEliI="
   "resolved" "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz"
@@ -3146,6 +3598,11 @@
     "assign-symbols" "^1.0.0"
     "is-extendable" "^1.0.1"
 
+"extend@~3.0.2":
+  "integrity" "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+  "resolved" "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
+  "version" "3.0.2"
+
 "external-editor@^3.0.3":
   "integrity" "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew=="
   "resolved" "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz"
@@ -3169,6 +3626,11 @@
     "snapdragon" "^0.8.1"
     "to-regex" "^3.0.1"
 
+"extsprintf@^1.2.0", "extsprintf@1.3.0":
+  "integrity" "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+  "resolved" "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"
+  "version" "1.3.0"
+
 "fast-deep-equal@^3.1.1":
   "integrity" "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
   "resolved" "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
@@ -3202,6 +3664,38 @@
   dependencies:
     "reusify" "^1.0.4"
 
+"favicons-webpack-plugin@^5.0.2":
+  "integrity" "sha512-D/A+Ze0x57+YZBU69hK/lR3NI636qQnKduWyQm0THGl1y3jt16whPHHsi8yjsuXvetv84Eh/I/yYJbAMC2iQxg=="
+  "resolved" "https://registry.npmjs.org/favicons-webpack-plugin/-/favicons-webpack-plugin-5.0.2.tgz"
+  "version" "5.0.2"
+  dependencies:
+    "@types/favicons" "5.5.0"
+    "find-root" "^1.1.0"
+    "html-webpack-plugin" ">=5.0.0"
+    "parse-author" "^2.0.0"
+    "parse5" "^6.0.1"
+  optionalDependencies:
+    "html-webpack-plugin" ">=5.0.0"
+
+"favicons@>= 6.2.0":
+  "integrity" "sha512-qhvFqbhlXA/JYIDYuxTrE4uT9rcpTCrWvF3UG0GxBoLl/XgFBBTrZkQvASrkMebSwDCJ9kKGypRWIbvoRZLBsw=="
+  "resolved" "https://registry.npmjs.org/favicons/-/favicons-6.2.2.tgz"
+  "version" "6.2.2"
+  dependencies:
+    "clone" "^2.1.2"
+    "colors" "^1.4.0"
+    "image-size" "^0.8.3"
+    "jimp" "^0.16.1"
+    "jsontoxml" "^1.0.1"
+    "lodash.defaultsdeep" "^4.6.1"
+    "require-directory" "^2.1.1"
+    "sharp" "^0.28.2"
+    "through2" "^4.0.2"
+    "tinycolor2" "^1.4.2"
+    "to-ico" "^1.1.5"
+    "vinyl" "^2.2.1"
+    "xml2js" "^0.4.23"
+
 "faye-websocket@^0.11.3":
   "integrity" "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g=="
   "resolved" "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz"
@@ -3248,9 +3742,9 @@
     "strtok3" "^6.2.4"
     "token-types" "^4.1.1"
 
-"file-type@^3.8.0":
+"file-type@^3.1.0", "file-type@^3.8.0":
   "integrity" "sha1-JXoHg4TR24CHvESdEH1SpSZyuek="
-  "resolved" "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz"
+  "resolved" "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz"
   "version" "3.9.0"
 
 "file-type@^4.2.0":
@@ -3273,6 +3767,11 @@
   "resolved" "https://registry.yarnpkg.com/file-type/-/file-type-8.1.0.tgz"
   "version" "8.1.0"
 
+"file-type@^9.0.0":
+  "integrity" "sha512-Qe/5NJrgIOlwijpq3B7BEpzPFcgzggOTagZmkXQY4LA6bsXKTUstK7Wp12lEJ/mLKTpvIZxmIuRcLYWT6ov9lw=="
+  "resolved" "https://registry.npmjs.org/file-type/-/file-type-9.0.0.tgz"
+  "version" "9.0.0"
+
 "filename-reserved-regex@^2.0.0":
   "integrity" "sha1-q/c9+rc10EVECr/qLZHzieu/oik="
   "resolved" "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz"
@@ -3326,6 +3825,11 @@
     "make-dir" "^3.0.2"
     "pkg-dir" "^4.1.0"
 
+"find-root@^1.1.0":
+  "integrity" "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="
+  "resolved" "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz"
+  "version" "1.1.0"
+
 "find-up@^1.0.0":
   "integrity" "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8="
   "resolved" "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz"
@@ -3366,6 +3870,20 @@
   "resolved" "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz"
   "version" "1.0.2"
 
+"forever-agent@~0.6.1":
+  "integrity" "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+  "resolved" "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+  "version" "0.6.1"
+
+"form-data@~2.3.2":
+  "integrity" "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ=="
+  "resolved" "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz"
+  "version" "2.3.3"
+  dependencies:
+    "asynckit" "^0.4.0"
+    "combined-stream" "^1.0.6"
+    "mime-types" "^2.1.12"
+
 "forwarded@0.2.0":
   "integrity" "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="
   "resolved" "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz"
@@ -3460,6 +3978,14 @@
   "resolved" "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz"
   "version" "4.0.1"
 
+"get-stream@^2.0.0":
+  "integrity" "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4="
+  "resolved" "https://registry.npmjs.org/get-stream/-/get-stream-2.3.1.tgz"
+  "version" "2.3.1"
+  dependencies:
+    "object-assign" "^4.0.1"
+    "pinkie-promise" "^2.0.0"
+
 "get-stream@^2.2.0":
   "integrity" "sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4="
   "resolved" "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz"
@@ -3504,6 +4030,21 @@
   "resolved" "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz"
   "version" "2.0.6"
 
+"getpass@^0.1.1":
+  "integrity" "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo="
+  "resolved" "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"
+  "version" "0.1.7"
+  dependencies:
+    "assert-plus" "^1.0.0"
+
+"gifwrap@^0.9.2":
+  "integrity" "sha512-fcIswrPaiCDAyO8xnWvHSZdWChjKXUanKKpAiWWJ/UTkEi/aYKn5+90e7DE820zbEaVR9CE2y4z9bzhQijZ0BA=="
+  "resolved" "https://registry.npmjs.org/gifwrap/-/gifwrap-0.9.2.tgz"
+  "version" "0.9.2"
+  dependencies:
+    "image-q" "^1.1.1"
+    "omggif" "^1.0.10"
+
 "github-from-package@0.0.0":
   "integrity" "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
   "resolved" "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz"
@@ -3560,6 +4101,14 @@
   dependencies:
     "ini" "2.0.0"
 
+"global@~4.4.0":
+  "integrity" "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w=="
+  "resolved" "https://registry.npmjs.org/global/-/global-4.4.0.tgz"
+  "version" "4.4.0"
+  dependencies:
+    "min-document" "^2.19.0"
+    "process" "^0.11.10"
+
 "globals@^11.1.0":
   "integrity" "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
   "resolved" "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz"
@@ -3682,6 +4231,19 @@
   "resolved" "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz"
   "version" "2.0.1"
 
+"har-schema@^2.0.0":
+  "integrity" "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+  "resolved" "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"
+  "version" "2.0.0"
+
+"har-validator@~5.1.3":
+  "integrity" "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w=="
+  "resolved" "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz"
+  "version" "5.1.5"
+  dependencies:
+    "ajv" "^6.12.3"
+    "har-schema" "^2.0.0"
+
 "has-ansi@^2.0.0":
   "integrity" "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE="
   "resolved" "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz"
@@ -3828,7 +4390,7 @@
     "relateurl" "^0.2.7"
     "terser" "^4.6.3"
 
-"html-webpack-plugin@^5.3.2":
+"html-webpack-plugin@^5.3.2", "html-webpack-plugin@>=5.0.0":
   "integrity" "sha512-HvB33boVNCz2lTyBsSiMffsJ+m0YLIQ+pskblXgN9fnjS1BgEcuAfdInfXfGrkdXV406k9FiDi86eVCDBgJOyQ=="
   "resolved" "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.3.2.tgz"
   "version" "5.3.2"
@@ -3920,6 +4482,15 @@
     "follow-redirects" "^1.0.0"
     "requires-port" "^1.0.0"
 
+"http-signature@~1.2.0":
+  "integrity" "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE="
+  "resolved" "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"
+  "version" "1.2.0"
+  dependencies:
+    "assert-plus" "^1.0.0"
+    "jsprim" "^1.2.2"
+    "sshpk" "^1.7.0"
+
 "http2-wrapper@^1.0.0-beta.5.2":
   "integrity" "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg=="
   "resolved" "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz"
@@ -3960,6 +4531,23 @@
   "resolved" "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz"
   "version" "5.1.8"
 
+"image-q@^1.1.1":
+  "integrity" "sha1-/IQJlmRGC5DKhi2TALa/u7+/gFY="
+  "resolved" "https://registry.npmjs.org/image-q/-/image-q-1.1.1.tgz"
+  "version" "1.1.1"
+
+"image-size@^0.5.0":
+  "integrity" "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w="
+  "resolved" "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"
+  "version" "0.5.5"
+
+"image-size@^0.8.3":
+  "integrity" "sha512-SMtq1AJ+aqHB45c3FsB4ERK0UCiA2d3H1uq8s+8T0Pf8A3W4teyBQyaFaktH6xvZqh+npwlKU7i4fJo0r7TYTg=="
+  "resolved" "https://registry.npmjs.org/image-size/-/image-size-0.8.3.tgz"
+  "version" "0.8.3"
+  dependencies:
+    "queue" "6.0.1"
+
 "imagemin-optipng@8.0.0":
   "integrity" "sha512-CUGfhfwqlPjAC0rm8Fy+R2DJDBGjzy2SkfyT09L8rasnF9jSoHFqJ1xxSZWK6HVPZBMhGPMxCTL70OgTHlLF5A=="
   "resolved" "https://registry.yarnpkg.com/imagemin-optipng/-/imagemin-optipng-8.0.0.tgz"
@@ -4098,6 +4686,11 @@
     "from2" "^2.1.1"
     "p-is-promise" "^1.1.0"
 
+"ip-regex@^1.0.1":
+  "integrity" "sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0="
+  "resolved" "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz"
+  "version" "1.0.3"
+
 "ip-regex@^2.1.0":
   "integrity" "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk="
   "resolved" "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz"
@@ -4254,6 +4847,11 @@
   "resolved" "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
   "version" "3.0.0"
 
+"is-function@^1.0.1":
+  "integrity" "sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="
+  "resolved" "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz"
+  "version" "1.0.2"
+
 "is-glob@^3.1.0":
   "integrity" "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo="
   "resolved" "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz"
@@ -4387,7 +4985,7 @@
   "resolved" "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz"
   "version" "2.0.1"
 
-"is-typedarray@^1.0.0":
+"is-typedarray@^1.0.0", "is-typedarray@~1.0.0":
   "integrity" "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo="
   "resolved" "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz"
   "version" "1.0.0"
@@ -4444,6 +5042,11 @@
   "resolved" "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz"
   "version" "3.0.1"
 
+"isstream@~0.1.2":
+  "integrity" "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+  "resolved" "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+  "version" "0.1.2"
+
 "isurl@^1.0.0-alpha5":
   "integrity" "sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w=="
   "resolved" "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz"
@@ -4461,11 +5064,64 @@
     "merge-stream" "^2.0.0"
     "supports-color" "^8.0.0"
 
+"jimp@^0.16.1":
+  "integrity" "sha512-+EKVxbR36Td7Hfd23wKGIeEyHbxShZDX6L8uJkgVW3ESA9GiTEPK08tG1XI2r/0w5Ch0HyJF5kPqF9K7EmGjaw=="
+  "resolved" "https://registry.npmjs.org/jimp/-/jimp-0.16.1.tgz"
+  "version" "0.16.1"
+  dependencies:
+    "@babel/runtime" "^7.7.2"
+    "@jimp/custom" "^0.16.1"
+    "@jimp/plugins" "^0.16.1"
+    "@jimp/types" "^0.16.1"
+    "regenerator-runtime" "^0.13.3"
+
+"jimp@^0.2.21":
+  "integrity" "sha1-3VKak3GQ9ClXp5N9Gsw6d2KZbqI="
+  "resolved" "https://registry.npmjs.org/jimp/-/jimp-0.2.28.tgz"
+  "version" "0.2.28"
+  dependencies:
+    "bignumber.js" "^2.1.0"
+    "bmp-js" "0.0.3"
+    "es6-promise" "^3.0.2"
+    "exif-parser" "^0.1.9"
+    "file-type" "^3.1.0"
+    "jpeg-js" "^0.2.0"
+    "load-bmfont" "^1.2.3"
+    "mime" "^1.3.4"
+    "mkdirp" "0.5.1"
+    "pixelmatch" "^4.0.0"
+    "pngjs" "^3.0.0"
+    "read-chunk" "^1.0.1"
+    "request" "^2.65.0"
+    "stream-to-buffer" "^0.1.0"
+    "tinycolor2" "^1.1.2"
+    "url-regex" "^3.0.0"
+
+"jpeg-js@^0.1.1":
+  "integrity" "sha1-E1uZLAV1yYXPoPSUoyJ+0jhYPs4="
+  "resolved" "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.1.2.tgz"
+  "version" "0.1.2"
+
+"jpeg-js@^0.2.0":
+  "integrity" "sha1-U+RI7J0mPmgyZkZ+lELSxaLvVII="
+  "resolved" "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.2.0.tgz"
+  "version" "0.2.0"
+
+"jpeg-js@0.4.2":
+  "integrity" "sha512-+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw=="
+  "resolved" "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.2.tgz"
+  "version" "0.4.2"
+
 "js-tokens@^3.0.0 || ^4.0.0", "js-tokens@^4.0.0":
   "integrity" "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
   "resolved" "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"
   "version" "4.0.0"
 
+"jsbn@~0.1.0":
+  "integrity" "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+  "resolved" "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
+  "version" "0.1.1"
+
 "jsesc@^2.5.1":
   "integrity" "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA=="
   "resolved" "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz"
@@ -4496,7 +5152,12 @@
   "resolved" "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
   "version" "0.4.1"
 
-"json-stringify-safe@^5.0.1":
+"json-schema@0.2.3":
+  "integrity" "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+  "resolved" "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"
+  "version" "0.2.3"
+
+"json-stringify-safe@^5.0.1", "json-stringify-safe@~5.0.1":
   "integrity" "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
   "resolved" "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
   "version" "5.0.1"
@@ -4530,6 +5191,21 @@
   optionalDependencies:
     "graceful-fs" "^4.1.6"
 
+"jsontoxml@^1.0.1":
+  "integrity" "sha512-dtKGq0K8EWQBRqcAaePSgKR4Hyjfsz/LkurHSV3Cxk4H+h2fWDeaN2jzABz+ZmOJylgXS7FGeWmbZ6jgYUMdJQ=="
+  "resolved" "https://registry.npmjs.org/jsontoxml/-/jsontoxml-1.0.1.tgz"
+  "version" "1.0.1"
+
+"jsprim@^1.2.2":
+  "integrity" "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI="
+  "resolved" "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz"
+  "version" "1.4.1"
+  dependencies:
+    "assert-plus" "1.0.0"
+    "extsprintf" "1.3.0"
+    "json-schema" "0.2.3"
+    "verror" "1.10.0"
+
 "jss-plugin-camel-case@^10.5.1":
   "integrity" "sha512-+ioIyWvmAfgDCWXsQcW1NMnLBvRinOVFkSYJUgewQ6TynOcSj5F1bSU23B7z0p1iqK0PPHIU62xY1iNJD33WGA=="
   "resolved" "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.7.1.tgz"
@@ -4676,6 +5352,20 @@
   dependencies:
     "package-json" "^6.3.0"
 
+"load-bmfont@^1.2.3", "load-bmfont@^1.3.1", "load-bmfont@^1.4.0":
+  "integrity" "sha512-8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA=="
+  "resolved" "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.1.tgz"
+  "version" "1.4.1"
+  dependencies:
+    "buffer-equal" "0.0.1"
+    "mime" "^1.3.4"
+    "parse-bmfont-ascii" "^1.0.3"
+    "parse-bmfont-binary" "^1.0.5"
+    "parse-bmfont-xml" "^1.1.4"
+    "phin" "^2.9.1"
+    "xhr" "^2.0.1"
+    "xtend" "^4.0.0"
+
 "load-json-file@^1.0.0":
   "integrity" "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA="
   "resolved" "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz"
@@ -4730,6 +5420,11 @@
   "resolved" "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
   "version" "4.0.8"
 
+"lodash.defaultsdeep@^4.6.1":
+  "integrity" "sha512-3j8wdDzYuWO3lM3Reg03MuQR957t287Rpcxp1njpEa8oDrikb+FwGdW3n+FELh/A6qib6yPit0j/pv9G/yeAqA=="
+  "resolved" "https://registry.npmjs.org/lodash.defaultsdeep/-/lodash.defaultsdeep-4.6.1.tgz"
+  "version" "4.6.1"
+
 "lodash@^4.17.11", "lodash@^4.17.14", "lodash@^4.17.20", "lodash@^4.17.21":
   "integrity" "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
   "resolved" "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz"
@@ -4956,13 +5651,18 @@
   "resolved" "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz"
   "version" "1.49.0"
 
-"mime-types@^2.1.27", "mime-types@~2.1.17", "mime-types@~2.1.24":
+"mime-types@^2.1.12", "mime-types@^2.1.27", "mime-types@~2.1.17", "mime-types@~2.1.19", "mime-types@~2.1.24":
   "integrity" "sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A=="
   "resolved" "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz"
   "version" "2.1.32"
   dependencies:
     "mime-db" "1.49.0"
 
+"mime@^1.3.4":
+  "integrity" "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
+  "resolved" "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"
+  "version" "1.6.0"
+
 "mime@^2.4.4":
   "integrity" "sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg=="
   "resolved" "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz"
@@ -4993,6 +5693,13 @@
   "resolved" "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz"
   "version" "3.1.0"
 
+"min-document@^2.19.0":
+  "integrity" "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU="
+  "resolved" "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz"
+  "version" "2.19.0"
+  dependencies:
+    "dom-walk" "^0.1.0"
+
 "mini-create-react-context@^0.4.0":
   "integrity" "sha512-YWCYEmd5CQeHGSAKrYvXgmzzkrvssZcuuQDDeqkT+PziKGMgE+0MCCtcKbROzocGBG1meBLl2FotlRwf4gAzbQ=="
   "resolved" "https://registry.yarnpkg.com/mini-create-react-context/-/mini-create-react-context-0.4.1.tgz"
@@ -5018,6 +5725,11 @@
   "resolved" "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz"
   "version" "1.2.5"
 
+"minimist@0.0.8":
+  "integrity" "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+  "resolved" "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
+  "version" "0.0.8"
+
 "mixin-deep@^1.2.0":
   "integrity" "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA=="
   "resolved" "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz"
@@ -5038,6 +5750,13 @@
   dependencies:
     "minimist" "^1.2.5"
 
+"mkdirp@0.5.1":
+  "integrity" "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM="
+  "resolved" "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"
+  "version" "0.5.1"
+  dependencies:
+    "minimist" "0.0.8"
+
 "ms@^2.1.1", "ms@2.1.3":
   "integrity" "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
   "resolved" "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"
@@ -5233,6 +5952,11 @@
   "resolved" "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"
   "version" "1.0.1"
 
+"oauth-sign@~0.9.0":
+  "integrity" "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+  "resolved" "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"
+  "version" "0.9.0"
+
 "object-assign@^4.0.1", "object-assign@^4.1.0", "object-assign@^4.1.1":
   "integrity" "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
   "resolved" "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz"
@@ -5289,6 +6013,11 @@
   "resolved" "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz"
   "version" "1.1.2"
 
+"omggif@^1.0.10", "omggif@^1.0.9":
+  "integrity" "sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw=="
+  "resolved" "https://registry.npmjs.org/omggif/-/omggif-1.0.10.tgz"
+  "version" "1.0.10"
+
 "on-finished@~2.3.0":
   "integrity" "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc="
   "resolved" "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz"
@@ -5495,6 +6224,11 @@
     "registry-url" "^5.0.0"
     "semver" "^6.2.0"
 
+"pako@^1.0.5":
+  "integrity" "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+  "resolved" "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"
+  "version" "1.0.11"
+
 "param-case@^3.0.3":
   "integrity" "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A=="
   "resolved" "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz"
@@ -5503,6 +6237,36 @@
     "dot-case" "^3.0.4"
     "tslib" "^2.0.3"
 
+"parse-author@^2.0.0":
+  "integrity" "sha1-00YL8d3Q367tQtp1QkLmX7aEqB8="
+  "resolved" "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz"
+  "version" "2.0.0"
+  dependencies:
+    "author-regex" "^1.0.0"
+
+"parse-bmfont-ascii@^1.0.3":
+  "integrity" "sha1-Eaw8P/WPfCAgqyJ2kHkQjU36AoU="
+  "resolved" "https://registry.npmjs.org/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz"
+  "version" "1.0.6"
+
+"parse-bmfont-binary@^1.0.5":
+  "integrity" "sha1-0Di0dtPp3Z2x4RoLDlOiJ5K2kAY="
+  "resolved" "https://registry.npmjs.org/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz"
+  "version" "1.0.6"
+
+"parse-bmfont-xml@^1.1.4":
+  "integrity" "sha512-bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ=="
+  "resolved" "https://registry.npmjs.org/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz"
+  "version" "1.1.4"
+  dependencies:
+    "xml-parse-from-string" "^1.0.0"
+    "xml2js" "^0.4.5"
+
+"parse-headers@^2.0.0":
+  "integrity" "sha512-psZ9iZoCNFLrgRjZ1d8mn0h9WRqJwFxM9q3x7iUjN/YT2OksthDJ5TiPCu2F38kS4zutqfW+YdVVkBZZx3/1aw=="
+  "resolved" "https://registry.npmjs.org/parse-headers/-/parse-headers-2.0.4.tgz"
+  "version" "2.0.4"
+
 "parse-json@^2.2.0":
   "integrity" "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck="
   "resolved" "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz"
@@ -5510,6 +6274,18 @@
   dependencies:
     "error-ex" "^1.2.0"
 
+"parse-png@^1.0.0", "parse-png@^1.1.1":
+  "integrity" "sha1-9cKtfHmTSQmGAgooTBmu5FlxH/I="
+  "resolved" "https://registry.npmjs.org/parse-png/-/parse-png-1.1.2.tgz"
+  "version" "1.1.2"
+  dependencies:
+    "pngjs" "^3.2.0"
+
+"parse5@^6.0.1":
+  "integrity" "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="
+  "resolved" "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"
+  "version" "6.0.1"
+
 "parseurl@~1.3.2", "parseurl@~1.3.3":
   "integrity" "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="
   "resolved" "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz"
@@ -5616,6 +6392,16 @@
   "resolved" "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz"
   "version" "1.2.0"
 
+"performance-now@^2.1.0":
+  "integrity" "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
+  "resolved" "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"
+  "version" "2.1.0"
+
+"phin@^2.9.1":
+  "integrity" "sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA=="
+  "resolved" "https://registry.npmjs.org/phin/-/phin-2.9.3.tgz"
+  "version" "2.9.3"
+
 "picomatch@^2.2.3":
   "integrity" "sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="
   "resolved" "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz"
@@ -5648,6 +6434,13 @@
   "resolved" "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz"
   "version" "2.0.4"
 
+"pixelmatch@^4.0.0", "pixelmatch@^4.0.2":
+  "integrity" "sha1-j0fc7FARtHe2fbA8JDvB8wheiFQ="
+  "resolved" "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz"
+  "version" "4.0.2"
+  dependencies:
+    "pngjs" "^3.0.0"
+
 "pkg-dir@^3.0.0":
   "integrity" "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw=="
   "resolved" "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz"
@@ -5667,6 +6460,11 @@
   "resolved" "https://registry.yarnpkg.com/png2icons/-/png2icons-2.0.1.tgz"
   "version" "2.0.1"
 
+"pngjs@^3.0.0", "pngjs@^3.2.0", "pngjs@^3.3.3":
+  "integrity" "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w=="
+  "resolved" "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz"
+  "version" "3.4.0"
+
 "popper.js@1.16.1-lts":
   "integrity" "sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA=="
   "resolved" "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz"
@@ -5773,11 +6571,16 @@
     "lodash" "^4.17.20"
     "renderkid" "^2.0.6"
 
-"process-nextick-args@~2.0.0":
+"process-nextick-args@^2.0.0", "process-nextick-args@~2.0.0":
   "integrity" "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
   "resolved" "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
   "version" "2.0.1"
 
+"process@^0.11.10":
+  "integrity" "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
+  "resolved" "https://registry.npmjs.org/process/-/process-0.11.10.tgz"
+  "version" "0.11.10"
+
 "prop-types@^15.0.0", "prop-types@^15.6.2", "prop-types@^15.7.2":
   "integrity" "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ=="
   "resolved" "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz"
@@ -5810,6 +6613,11 @@
   "resolved" "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz"
   "version" "1.0.2"
 
+"psl@^1.1.28":
+  "integrity" "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="
+  "resolved" "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"
+  "version" "1.8.0"
+
 "pump@^3.0.0":
   "integrity" "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww=="
   "resolved" "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz"
@@ -5823,6 +6631,11 @@
   "resolved" "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"
   "version" "2.1.1"
 
+"punycode@^2.1.1":
+  "integrity" "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
+  "resolved" "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
+  "version" "2.1.1"
+
 "punycode@1.3.2":
   "integrity" "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0="
   "resolved" "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz"
@@ -5835,6 +6648,11 @@
   dependencies:
     "escape-goat" "^2.0.0"
 
+"qs@~6.5.2":
+  "integrity" "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+  "resolved" "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz"
+  "version" "6.5.2"
+
 "qs@6.7.0":
   "integrity" "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="
   "resolved" "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz"
@@ -5864,6 +6682,13 @@
   "resolved" "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz"
   "version" "1.2.3"
 
+"queue@6.0.1":
+  "integrity" "sha512-AJBQabRCCNr9ANq8v77RJEv73DPbn55cdTb+Giq4X0AVnNVZvMHlYp7XlQiN+1npCZj1DuSmaA2hYVUUDgxFDg=="
+  "resolved" "https://registry.npmjs.org/queue/-/queue-6.0.1.tgz"
+  "version" "6.0.1"
+  dependencies:
+    "inherits" "~2.0.3"
+
 "quick-lru@^5.1.1":
   "integrity" "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="
   "resolved" "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz"
@@ -5962,6 +6787,11 @@
     "loose-envify" "^1.1.0"
     "object-assign" "^4.1.1"
 
+"read-chunk@^1.0.1":
+  "integrity" "sha1-X2jKswfmY/GZk1J9m1icrORmEZQ="
+  "resolved" "https://registry.npmjs.org/read-chunk/-/read-chunk-1.0.1.tgz"
+  "version" "1.0.1"
+
 "read-chunk@3.2.0":
   "integrity" "sha512-CEjy9LCzhmD7nUpJ1oVOE6s/hBkejlcJEgLQHVnQznOSilOPb+kpKktlLfFDK3/WP43+F80xkUTM2VOkYoSYvQ=="
   "resolved" "https://registry.yarnpkg.com/read-chunk/-/read-chunk-3.2.0.tgz"
@@ -6036,6 +6866,15 @@
     "string_decoder" "^1.1.1"
     "util-deprecate" "^1.0.1"
 
+"readable-stream@3":
+  "integrity" "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="
+  "resolved" "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"
+  "version" "3.6.0"
+  dependencies:
+    "inherits" "^2.0.3"
+    "string_decoder" "^1.1.1"
+    "util-deprecate" "^1.0.1"
+
 "readable-web-to-node-stream@^3.0.0":
   "integrity" "sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw=="
   "resolved" "https://registry.yarnpkg.com/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.2.tgz"
@@ -6079,7 +6918,7 @@
   "resolved" "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz"
   "version" "1.4.2"
 
-"regenerator-runtime@^0.13.4":
+"regenerator-runtime@^0.13.3", "regenerator-runtime@^0.13.4":
   "integrity" "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
   "resolved" "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz"
   "version" "0.13.9"
@@ -6183,11 +7022,42 @@
   dependencies:
     "is-finite" "^1.0.0"
 
+"replace-ext@^1.0.0":
+  "integrity" "sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw=="
+  "resolved" "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz"
+  "version" "1.0.1"
+
 "replace-ext@^2.0.0":
   "integrity" "sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug=="
   "resolved" "https://registry.yarnpkg.com/replace-ext/-/replace-ext-2.0.0.tgz"
   "version" "2.0.0"
 
+"request@^2.65.0":
+  "integrity" "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="
+  "resolved" "https://registry.npmjs.org/request/-/request-2.88.2.tgz"
+  "version" "2.88.2"
+  dependencies:
+    "aws-sign2" "~0.7.0"
+    "aws4" "^1.8.0"
+    "caseless" "~0.12.0"
+    "combined-stream" "~1.0.6"
+    "extend" "~3.0.2"
+    "forever-agent" "~0.6.1"
+    "form-data" "~2.3.2"
+    "har-validator" "~5.1.3"
+    "http-signature" "~1.2.0"
+    "is-typedarray" "~1.0.0"
+    "isstream" "~0.1.2"
+    "json-stringify-safe" "~5.0.1"
+    "mime-types" "~2.1.19"
+    "oauth-sign" "~0.9.0"
+    "performance-now" "^2.1.0"
+    "qs" "~6.5.2"
+    "safe-buffer" "^5.1.2"
+    "tough-cookie" "~2.5.0"
+    "tunnel-agent" "^0.6.0"
+    "uuid" "^3.3.2"
+
 "require-directory@^2.1.1":
   "integrity" "sha1-jGStX9MNqxyXbiNE/+f3kqam30I="
   "resolved" "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz"
@@ -6203,6 +7073,18 @@
   "resolved" "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz"
   "version" "1.0.0"
 
+"resize-img@^1.1.0":
+  "integrity" "sha1-+tZQ+vPvLFPqYxErwnLZXp2SVQ4="
+  "resolved" "https://registry.npmjs.org/resize-img/-/resize-img-1.1.2.tgz"
+  "version" "1.1.2"
+  dependencies:
+    "bmp-js" "0.0.1"
+    "file-type" "^3.8.0"
+    "get-stream" "^2.0.0"
+    "jimp" "^0.2.21"
+    "jpeg-js" "^0.1.1"
+    "parse-png" "^1.1.1"
+
 "resolve-alpn@^1.0.0":
   "integrity" "sha512-e4FNQs+9cINYMO5NMFc6kOUCdohjqFPSgMuwuZAOUWqrfWsen+Yjy5qZFkV5K7VO7tFSLKcUL97olkED7sCBHA=="
   "resolved" "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.0.tgz"
@@ -6325,7 +7207,7 @@
   dependencies:
     "tslib" "~2.1.0"
 
-"safe-buffer@^5.0.1", "safe-buffer@^5.1.0", "safe-buffer@^5.1.1", "safe-buffer@>=5.1.0", "safe-buffer@~5.2.0":
+"safe-buffer@^5.0.1", "safe-buffer@^5.1.0", "safe-buffer@^5.1.1", "safe-buffer@^5.1.2", "safe-buffer@>=5.1.0", "safe-buffer@~5.2.0":
   "integrity" "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
   "resolved" "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"
   "version" "5.2.1"
@@ -6352,11 +7234,16 @@
   dependencies:
     "ret" "~0.1.10"
 
-"safer-buffer@>= 2.1.2 < 3":
+"safer-buffer@^2.0.2", "safer-buffer@^2.1.0", "safer-buffer@>= 2.1.2 < 3", "safer-buffer@~2.1.0":
   "integrity" "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
   "resolved" "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz"
   "version" "2.1.2"
 
+"sax@>=0.6.0":
+  "integrity" "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
+  "resolved" "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"
+  "version" "1.2.4"
+
 "scheduler@^0.20.2":
   "integrity" "sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ=="
   "resolved" "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz"
@@ -6586,7 +7473,7 @@
   dependencies:
     "kind-of" "^6.0.2"
 
-"sharp@0.28.3":
+"sharp@^0.28.2", "sharp@0.28.3":
   "integrity" "sha512-21GEP45Rmr7q2qcmdnjDkNP04Ooh5v0laGS5FDpojOO84D1DJwUijLiSq8XNNM6e8aGXYtoYRh3sVNdm8NodMA=="
   "resolved" "https://registry.yarnpkg.com/sharp/-/sharp-0.28.3.tgz"
   "version" "0.28.3"
@@ -6851,6 +7738,21 @@
     "console-stream" "^0.1.1"
     "lpad-align" "^1.0.1"
 
+"sshpk@^1.7.0":
+  "integrity" "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg=="
+  "resolved" "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz"
+  "version" "1.16.1"
+  dependencies:
+    "asn1" "~0.2.3"
+    "assert-plus" "^1.0.0"
+    "bcrypt-pbkdf" "^1.0.0"
+    "dashdash" "^1.12.0"
+    "ecc-jsbn" "~0.1.1"
+    "getpass" "^0.1.1"
+    "jsbn" "~0.1.0"
+    "safer-buffer" "^2.0.2"
+    "tweetnacl" "~0.14.0"
+
 "static-extend@^0.1.1":
   "integrity" "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY="
   "resolved" "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz"
@@ -6864,19 +7766,24 @@
   "resolved" "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz"
   "version" "1.5.0"
 
+"stream-to-buffer@^0.1.0":
+  "integrity" "sha1-JnmdkDqyAlyb1VCsRxcbAPjdgKk="
+  "resolved" "https://registry.npmjs.org/stream-to-buffer/-/stream-to-buffer-0.1.0.tgz"
+  "version" "0.1.0"
+  dependencies:
+    "stream-to" "~0.2.0"
+
+"stream-to@~0.2.0":
+  "integrity" "sha1-hDBgmNhf25kLn6MAsbPM9V6O8B0="
+  "resolved" "https://registry.npmjs.org/stream-to/-/stream-to-0.2.2.tgz"
+  "version" "0.2.2"
+
 "strict-uri-encode@^1.0.0":
   "integrity" "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM="
   "resolved" "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"
   "version" "1.1.0"
 
-"string_decoder@^1.1.1":
-  "integrity" "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="
-  "resolved" "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz"
-  "version" "1.3.0"
-  dependencies:
-    "safe-buffer" "~5.2.0"
-
-"string_decoder@~1.1.1":
+"string_decoder@^1.1.1", "string_decoder@~1.1.1":
   "integrity" "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="
   "resolved" "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"
   "version" "1.1.1"
@@ -7145,6 +8052,13 @@
   "resolved" "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz"
   "version" "2.3.8"
 
+"through2@^4.0.2":
+  "integrity" "sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw=="
+  "resolved" "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz"
+  "version" "4.0.2"
+  dependencies:
+    "readable-stream" "3"
+
 "thunky@^1.0.2":
   "integrity" "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
   "resolved" "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz"
@@ -7155,6 +8069,11 @@
   "resolved" "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz"
   "version" "4.0.1"
 
+"timm@^1.6.1":
+  "integrity" "sha512-IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw=="
+  "resolved" "https://registry.npmjs.org/timm/-/timm-1.7.1.tgz"
+  "version" "1.7.1"
+
 "tiny-invariant@^1.0.2":
   "integrity" "sha512-ytxQvrb1cPc9WBEI/HSeYYoGD0kWnGEOR8RY6KomWLBVhqz0RgTwVO9dLrGz7dC+nN9llyI7OKAgRq8Vq4ZBSw=="
   "resolved" "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.1.0.tgz"
@@ -7165,6 +8084,11 @@
   "resolved" "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz"
   "version" "1.0.3"
 
+"tinycolor2@^1.1.2", "tinycolor2@^1.4.1", "tinycolor2@^1.4.2":
+  "integrity" "sha512-vJhccZPs965sV/L2sU4oRQVAos0pQXwsvTLkWYdqJ+a8Q5kPFzJTuOFwy7UniPli44NKQGAglksjvOcpo95aZA=="
+  "resolved" "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.2.tgz"
+  "version" "1.4.2"
+
 "tmp@^0.0.33":
   "integrity" "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw=="
   "resolved" "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz"
@@ -7182,6 +8106,17 @@
   "resolved" "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
   "version" "2.0.0"
 
+"to-ico@^1.1.5":
+  "integrity" "sha512-5kIh7m7bkIlqIESEZkL8gAMMzucXKfPe3hX2FoDY5HEAfD9OJU+Qh9b6Enp74w0qRcxVT5ejss66PHKqc3AVkg=="
+  "resolved" "https://registry.npmjs.org/to-ico/-/to-ico-1.1.5.tgz"
+  "version" "1.1.5"
+  dependencies:
+    "arrify" "^1.0.1"
+    "buffer-alloc" "^1.1.0"
+    "image-size" "^0.5.0"
+    "parse-png" "^1.0.0"
+    "resize-img" "^1.1.0"
+
 "to-object-path@^0.3.0":
   "integrity" "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68="
   "resolved" "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz"
@@ -7232,6 +8167,14 @@
     "@tokenizer/token" "^0.3.0"
     "ieee754" "^1.2.1"
 
+"tough-cookie@~2.5.0":
+  "integrity" "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="
+  "resolved" "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"
+  "version" "2.5.0"
+  dependencies:
+    "psl" "^1.1.28"
+    "punycode" "^2.1.1"
+
 "trim-newlines@^1.0.0":
   "integrity" "sha1-WIeWa7WCpFA6QetST301ARgVphM="
   "resolved" "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz"
@@ -7261,6 +8204,11 @@
   dependencies:
     "safe-buffer" "^5.0.1"
 
+"tweetnacl@^0.14.3", "tweetnacl@~0.14.0":
+  "integrity" "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+  "resolved" "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
+  "version" "0.14.5"
+
 "type-fest@^0.13.1":
   "integrity" "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="
   "resolved" "https://registry.yarnpkg.com/type-fest/-/type-fest-0.13.1.tgz"
@@ -7425,6 +8373,13 @@
     "querystringify" "^2.1.1"
     "requires-port" "^1.0.0"
 
+"url-regex@^3.0.0":
+  "integrity" "sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ="
+  "resolved" "https://registry.npmjs.org/url-regex/-/url-regex-3.2.0.tgz"
+  "version" "3.2.0"
+  dependencies:
+    "ip-regex" "^1.0.1"
+
 "url-to-options@^1.0.1":
   "integrity" "sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k="
   "resolved" "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz"
@@ -7443,6 +8398,13 @@
   "resolved" "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz"
   "version" "3.1.1"
 
+"utif@^2.0.1":
+  "integrity" "sha512-Z/S1fNKCicQTf375lIP9G8Sa1H/phcysstNrrSdZKj1f9g58J4NMgb5IgiEZN9/nLMPDwF0W7hdOe9Qq2IYoLg=="
+  "resolved" "https://registry.npmjs.org/utif/-/utif-2.0.1.tgz"
+  "version" "2.0.1"
+  dependencies:
+    "pako" "^1.0.5"
+
 "util-deprecate@^1.0.1", "util-deprecate@^1.0.2", "util-deprecate@~1.0.1":
   "integrity" "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
   "resolved" "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz"
@@ -7486,6 +8448,27 @@
   "resolved" "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz"
   "version" "1.1.2"
 
+"verror@1.10.0":
+  "integrity" "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA="
+  "resolved" "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"
+  "version" "1.10.0"
+  dependencies:
+    "assert-plus" "^1.0.0"
+    "core-util-is" "1.0.2"
+    "extsprintf" "^1.2.0"
+
+"vinyl@^2.2.1":
+  "integrity" "sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw=="
+  "resolved" "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz"
+  "version" "2.2.1"
+  dependencies:
+    "clone" "^2.1.1"
+    "clone-buffer" "^1.0.0"
+    "clone-stats" "^1.0.0"
+    "cloneable-readable" "^1.0.0"
+    "remove-trailing-separator" "^1.0.1"
+    "replace-ext" "^1.0.0"
+
 "watchpack@^2.2.0":
   "integrity" "sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA=="
   "resolved" "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz"
@@ -7734,6 +8717,34 @@
   "resolved" "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz"
   "version" "4.0.0"
 
+"xhr@^2.0.1":
+  "integrity" "sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA=="
+  "resolved" "https://registry.npmjs.org/xhr/-/xhr-2.6.0.tgz"
+  "version" "2.6.0"
+  dependencies:
+    "global" "~4.4.0"
+    "is-function" "^1.0.1"
+    "parse-headers" "^2.0.0"
+    "xtend" "^4.0.0"
+
+"xml-parse-from-string@^1.0.0":
+  "integrity" "sha1-qQKekp09vN7RafPG4oI42VpdWig="
+  "resolved" "https://registry.npmjs.org/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz"
+  "version" "1.0.1"
+
+"xml2js@^0.4.23", "xml2js@^0.4.5":
+  "integrity" "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug=="
+  "resolved" "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz"
+  "version" "0.4.23"
+  dependencies:
+    "sax" ">=0.6.0"
+    "xmlbuilder" "~11.0.0"
+
+"xmlbuilder@~11.0.0":
+  "integrity" "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
+  "resolved" "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz"
+  "version" "11.0.1"
+
 "xtend@^4.0.0":
   "integrity" "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
   "resolved" "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz"

From 3ce7888c073a74bbac7f07541e585c9c4d42bc97 Mon Sep 17 00:00:00 2001
From: fmtabbara <fmtabbara@hotmail.co.uk>
Date: Tue, 24 Aug 2021 11:59:10 +0100
Subject: [PATCH 3/4] address and balance cards

---
 tauri-wallet/src/components/BalanceCard.tsx | 122 ++++++--------------
 tauri-wallet/src/components/Nav.tsx         |   1 -
 tauri-wallet/src/components/NymCard.tsx     |   3 +
 tauri-wallet/src/components/Page.tsx        |  11 +-
 4 files changed, 47 insertions(+), 90 deletions(-)

diff --git a/tauri-wallet/src/components/BalanceCard.tsx b/tauri-wallet/src/components/BalanceCard.tsx
index 65116de259..0807a74a00 100644
--- a/tauri-wallet/src/components/BalanceCard.tsx
+++ b/tauri-wallet/src/components/BalanceCard.tsx
@@ -1,98 +1,46 @@
 import React, { useContext } from 'react'
-import { makeStyles } from '@material-ui/core/styles'
-import {
-  Card,
-  CardMedia,
-  CardContent,
-  Typography,
-  CardHeader,
-  IconButton,
-} from '@material-ui/core'
-import logo from '../images/logo.png'
-import { theme } from '../theme'
+import { CardContent, IconButton, useTheme } from '@material-ui/core'
 import { ClientContext } from '../context/main'
 import { FileCopy, Refresh } from '@material-ui/icons'
+import { NymCard } from './NymCard'
 
-const useStyles = makeStyles(({ spacing }) => ({
-  root: {
-    margin: spacing(10, 5, 3, 7),
-    borderRadius: spacing(2), // 16px
-    display: 'flex',
-    flexDirection: 'row',
-    alignItems: 'center',
-    paddingBottom: spacing(2),
-    paddingTop: spacing(2),
-    minWidth: 300,
-    position: 'relative',
-  },
-}))
-
-export const BalanceCard = React.memo(function BlogCard() {
-  const styles = useStyles()
+export const BalanceCard = () => {
+  const theme = useTheme()
   const { client } = useContext(ClientContext)
-  return (
-    <Card className={styles.root}>
-      <CardContent>
-        <BalanceCardField
-          primaryText="Balance"
-          subText={client.balance}
-          Action={
-            <IconButton size="small">
-              <Refresh fontSize="small" />
-            </IconButton>
-          }
-        />
-        <BalanceCardField
-          primaryText="Address"
-          subText={client.address}
-          Action={
-            <IconButton size="small">
-              <FileCopy fontSize="small" />
-            </IconButton>
-          }
-          lastChild
-        />
-      </CardContent>
-    </Card>
-  )
-})
 
-const BalanceCardField = ({
-  primaryText,
-  subText,
-  Action,
-  lastChild,
-}: {
-  primaryText: string
-  subText: string
-  Action?: React.ReactNode
-  lastChild?: boolean
-}) => {
   return (
-    <div style={!lastChild ? { marginBottom: theme.spacing(1) } : {}}>
-      <Typography variant="body2" style={{}}>
-        {primaryText}
-      </Typography>
-      <div
-        style={{
-          display: 'flex',
-          justifyContent: 'space-between',
-          alignItems: 'ceneter',
-        }}
+    <div style={{ margin: theme.spacing(3) }}>
+      <NymCard
+        title="Balance"
+        noPadding
+        Action={
+          <IconButton>
+            <Refresh />
+          </IconButton>
+        }
       >
-        <Typography
-          variant="caption"
-          style={{
-            wordBreak: 'break-all',
-            fontWeight: theme.typography.fontWeightBold,
-            color: theme.palette.grey[600],
-            marginRight: theme.spacing(1),
-          }}
-        >
-          {subText}
-        </Typography>
-        {Action}
-      </div>
+        <CardContent>{client.balance}</CardContent>
+      </NymCard>
+    </div>
+  )
+}
+
+export const AddressCard = () => {
+  const theme = useTheme()
+  const { client } = useContext(ClientContext)
+  return (
+    <div style={{ margin: theme.spacing(3) }}>
+      <NymCard
+        title="Address"
+        noPadding
+        Action={
+          <IconButton>
+            <FileCopy />
+          </IconButton>
+        }
+      >
+        <CardContent>{client.address}</CardContent>
+      </NymCard>
     </div>
   )
 }
diff --git a/tauri-wallet/src/components/Nav.tsx b/tauri-wallet/src/components/Nav.tsx
index f0c1a564b1..9c6678192c 100644
--- a/tauri-wallet/src/components/Nav.tsx
+++ b/tauri-wallet/src/components/Nav.tsx
@@ -84,7 +84,6 @@ export const Nav = () => {
         display: 'flex',
         alignItems: 'center',
         justifyContent: 'center',
-        marginTop: theme.spacing(6),
       }}
     >
       <List>
diff --git a/tauri-wallet/src/components/NymCard.tsx b/tauri-wallet/src/components/NymCard.tsx
index a73d0866dd..3ba0820662 100644
--- a/tauri-wallet/src/components/NymCard.tsx
+++ b/tauri-wallet/src/components/NymCard.tsx
@@ -4,11 +4,13 @@ import { Card, CardContent, CardHeader, useTheme } from '@material-ui/core'
 export const NymCard = ({
   title,
   subheader,
+  Action,
   noPadding,
   children,
 }: {
   title: string
   subheader?: string
+  Action?: React.ReactNode
   noPadding?: boolean
   children: React.ReactElement
 }) => {
@@ -20,6 +22,7 @@ export const NymCard = ({
         subheader={subheader}
         titleTypographyProps={{ variant: 'h5' }}
         subheaderTypographyProps={{ variant: 'subtitle1' }}
+        action={Action}
         style={{
           padding: theme.spacing(2.5),
           borderBottom: `1px solid ${theme.palette.grey[200]}`,
diff --git a/tauri-wallet/src/components/Page.tsx b/tauri-wallet/src/components/Page.tsx
index 198da00e08..4f9ee67ee1 100644
--- a/tauri-wallet/src/components/Page.tsx
+++ b/tauri-wallet/src/components/Page.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { BalanceCard } from './BalanceCard'
+import { AddressCard, BalanceCard } from './BalanceCard'
 import { Nav } from './Nav'
 import Logo from '../images/logo.png'
 import { theme } from '../theme'
@@ -44,7 +44,14 @@ export const Page = ({ children }: { children: React.ReactElement }) => {
             marginTop: theme.spacing(6),
           }}
         />
-        <Nav />
+        <div style={{ marginTop: theme.spacing(10) }}>
+          <BalanceCard />
+          <AddressCard />
+        </div>
+
+        <div style={{ marginTop: theme.spacing(7) }}>
+          <Nav />
+        </div>
         <div />
       </div>
       <div

From 4ad25114c3b97f3b35f32997f67a6c940267066f Mon Sep 17 00:00:00 2001
From: fmtabbara <fmtabbara@hotmail.co.uk>
Date: Tue, 24 Aug 2021 12:46:34 +0100
Subject: [PATCH 4/4] update nav cards

---
 tauri-wallet/src/components/BalanceCard.tsx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tauri-wallet/src/components/BalanceCard.tsx b/tauri-wallet/src/components/BalanceCard.tsx
index 0807a74a00..39bbbb6cd1 100644
--- a/tauri-wallet/src/components/BalanceCard.tsx
+++ b/tauri-wallet/src/components/BalanceCard.tsx
@@ -1,5 +1,10 @@
 import React, { useContext } from 'react'
-import { CardContent, IconButton, useTheme } from '@material-ui/core'
+import {
+  CardContent,
+  IconButton,
+  Typography,
+  useTheme,
+} from '@material-ui/core'
 import { ClientContext } from '../context/main'
 import { FileCopy, Refresh } from '@material-ui/icons'
 import { NymCard } from './NymCard'
@@ -12,6 +17,7 @@ export const BalanceCard = () => {
     <div style={{ margin: theme.spacing(3) }}>
       <NymCard
         title="Balance"
+        subheader="Current wallet balance"
         noPadding
         Action={
           <IconButton>
@@ -19,7 +25,9 @@ export const BalanceCard = () => {
           </IconButton>
         }
       >
-        <CardContent>{client.balance}</CardContent>
+        <CardContent>
+          <Typography>{client.balance}</Typography>
+        </CardContent>
       </NymCard>
     </div>
   )
@@ -32,6 +40,7 @@ export const AddressCard = () => {
     <div style={{ margin: theme.spacing(3) }}>
       <NymCard
         title="Address"
+        subheader="Wallet payments address"
         noPadding
         Action={
           <IconButton>