diff --git a/.eslintrc.json b/.eslintrc.json
index 274e73d453..210af778d3 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -7,7 +7,7 @@
       "jsx": true // Allows for the parsing of JSX
     }
   },
-  "plugins": ["@typescript-eslint", "cypress", "ternary"],
+  "plugins": ["@typescript-eslint", "cypress", "no-only-tests", "ternary"],
   "extends": [
     "eslint:recommended",
     "plugin:@typescript-eslint/eslint-recommended",
@@ -24,6 +24,7 @@
   },
   "rules": {
     "comma-spacing": ["error", { "before": false, "after": true }],
+    "cypress/no-pause": "error",
     "indent": ["error", 2],
     "linebreak-style": ["error", "unix"],
     "quotes": ["error", "double"],
@@ -46,6 +47,7 @@
     "space-infix-ops": "error",
     "no-trailing-spaces": ["error", { "ignoreComments": true }],
     "comma-dangle": ["error", "never"],
+    "no-only-tests/no-only-tests": "error",
     "object-curly-spacing": ["error", "always"],
     "space-in-parens": ["error", "never"],
     "ternary/no-unreachable": "off",
diff --git a/.github/pr-labeler.yml b/.github/pr-labeler.yml
index d4e1e9790d..0d8b387518 100644
--- a/.github/pr-labeler.yml
+++ b/.github/pr-labeler.yml
@@ -1,3 +1,3 @@
 "Type: Feature": ['feature/*', 'feat/*']
 "Type: Bug Fix": fix/*
-"Type: Maintenance": ['chore/*', 'mnt/*']
+"Type: Maintenance": ['chore/*', 'mnt/*', 'weblate*']
diff --git a/.github/workflows/test-storage.yml b/.github/workflows/test-storage.yml
index 7fe3b2dc50..f03c0dc27e 100644
--- a/.github/workflows/test-storage.yml
+++ b/.github/workflows/test-storage.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   cypress-run:
     runs-on: ubuntu-latest
-    container: cypress/browsers:node14.16.0-chrome90-ff88
+    container: cypress/browsers:node14.17.0-chrome91-ff89
     steps:
       - name: Checkout
         uses: actions/checkout@v2
diff --git a/package.json b/package.json
index b70fe61bd4..a62f07950c 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "chalk": "^4.1.0",
     "eslint": "^6.8.0",
     "eslint-plugin-cypress": "^2.11.3",
+    "eslint-plugin-no-only-tests": "^2.6.0",
     "eslint-plugin-react": "^7.22.0",
     "eslint-plugin-react-hooks": "^4.2.0",
     "eslint-plugin-ternary": "^1.0.4",
diff --git a/packages/common-components/src/CheckboxInput/CheckboxInput.tsx b/packages/common-components/src/CheckboxInput/CheckboxInput.tsx
index 94260664ed..7d508154fa 100644
--- a/packages/common-components/src/CheckboxInput/CheckboxInput.tsx
+++ b/packages/common-components/src/CheckboxInput/CheckboxInput.tsx
@@ -99,14 +99,14 @@ const useStyles = makeStyles(
     })
 )
 
-interface ICheckboxProps
-  extends Omit<React.HTMLProps<HTMLInputElement>, "value" | "label"> {
+interface ICheckboxProps extends Omit<React.HTMLProps<HTMLInputElement>, "value" | "label"> {
   className?: string
   label?: string | ReactNode
   error?: string
   value: boolean
   indeterminate?: boolean
-  onChange(event: FormEvent<HTMLInputElement>): void
+  onChange: (event: FormEvent<HTMLInputElement>) => void
+  testId?: string
 }
 
 const CheckboxInput: React.FC<ICheckboxProps> = ({
@@ -117,6 +117,7 @@ const CheckboxInput: React.FC<ICheckboxProps> = ({
   indeterminate = false,
   value,
   error,
+  testId,
   ...props
 }) => {
   const classes = useStyles(props)
@@ -126,7 +127,10 @@ const CheckboxInput: React.FC<ICheckboxProps> = ({
   }
 
   return (
-    <label className={clsx(classes.root, className)}>
+    <label
+      className={clsx(classes.root, className)}
+      data-testid={`checkbox-${testId}`}
+    >
       <input
         type="checkbox"
         {...props}
diff --git a/packages/common-components/src/FileInput/FileInput.tsx b/packages/common-components/src/FileInput/FileInput.tsx
index ef4066cab0..1a66575270 100644
--- a/packages/common-components/src/FileInput/FileInput.tsx
+++ b/packages/common-components/src/FileInput/FileInput.tsx
@@ -99,6 +99,10 @@ const useStyles = makeStyles(({ constants, palette, overrides }: ITheme) =>
   })
 )
 
+interface FileWithPath extends File {
+  path?: string
+}
+
 interface IFileInputProps extends DropzoneOptions {
   className?: string
   variant?: "dropzone" | "filepicker"
@@ -137,21 +141,22 @@ const FileInput = ({
   const classes = useStyles()
   const [previews, setPreviews] = useState<any[]>([])
   const [errors, setErrors] = useState<any[]>([])
-  const [{ value }, meta, helpers] = useField(name)
+  const [{ value }, meta, helpers] = useField<Array<FileWithPath>>(name)
 
   useEffect(() => {
     onFileNumberChange && onFileNumberChange(value.length)
   }, [onFileNumberChange, value.length])
 
   const onDrop = useCallback(
-    async (acceptedFiles: File[], fileRejections: FileRejection[]) => {
+    async (acceptedFiles: Array<FileWithPath>, fileRejections: FileRejection[]) => {
       const filtered = acceptedFiles.filter((file) =>
         maxFileSize ? file.size <= maxFileSize : true
       )
+
       setErrors([])
       if (showPreviews) {
         setPreviews(
-          filtered.map((file: any) =>
+          filtered.map((file) =>
             Object.assign(file, {
               preview: URL.createObjectURL(file)
             })
@@ -188,7 +193,7 @@ const FileInput = ({
   })
 
   const removeItem = (i: number) => {
-    const items = value as any[]
+    const items = value
     items.splice(i, 1)
     helpers.setValue(items)
   }
@@ -220,12 +225,12 @@ const FileInput = ({
           >
             <ScrollbarWrapper className={clsx("scrollbar")}>
               <ul>
-                {value.map((file: any, i: any) => (
+                {value.map((file: any, i: number) => (
                   <li
                     className={clsx(classes.item, classNames?.item)}
                     key={i}
                   >
-                    <span className={classes.itemText}>{file.name}</span>
+                    <span className={classes.itemText}>{file.path}</span>
                     <Button
                       testId="remove-from-file-list"
                       className={clsx(classes.crossIcon, classNames?.closeIcon)}
@@ -246,9 +251,9 @@ const FileInput = ({
         )
       ) : (
         <>
-          {value.value?.length === 0
+          {value?.length === 0
             ? "No files selected"
-            : `${value.value?.length} file(s) selected`}
+            : `${value?.length} file(s) selected`}
           <Button
             onClick={open}
             size="small"
@@ -260,7 +265,6 @@ const FileInput = ({
       {value?.length > 0 && (
         <div
           className={clsx(classes.addFiles, classNames?.addFiles)}
-          onClick={open}
         >
           <PlusIcon
             fontSize="small"
diff --git a/packages/common-components/src/SelectInput/SelectInput.tsx b/packages/common-components/src/SelectInput/SelectInput.tsx
index 4966cf943a..802587398d 100644
--- a/packages/common-components/src/SelectInput/SelectInput.tsx
+++ b/packages/common-components/src/SelectInput/SelectInput.tsx
@@ -1,10 +1,5 @@
 import React, { CSSProperties, ReactNode } from "react"
-import {
-  makeStyles,
-  createStyles,
-  ITheme,
-  useTheme
-} from "@chainsafe/common-theme"
+import { makeStyles, createStyles, ITheme, useTheme } from "@chainsafe/common-theme"
 import clsx from "clsx"
 import Select, { Styles } from "react-select"
 import { Typography } from "../Typography"
@@ -62,7 +57,7 @@ interface ISelectInputProps {
   styles?: Partial<Styles>
 }
 
-const SelectInput: React.FC<ISelectInputProps> = ({
+const SelectInput = ({
   className,
   size = "medium",
   disabled = false,
@@ -77,7 +72,7 @@ const SelectInput: React.FC<ISelectInputProps> = ({
   name,
   isClearable = false,
   styles
-}) => {
+}: ISelectInputProps) => {
   const classes = useStyles()
   const { palette, animation, typography, overrides }: ITheme = useTheme()
   const handleChange = (value: any) => {
@@ -105,9 +100,9 @@ const SelectInput: React.FC<ISelectInputProps> = ({
   //       ...overrides?.SelectInput?.indicatorsContainer
   //     }, state) : overrides?.SelectInput?.indicatorsContainer)
   //   }),
-  const selectOverides: Partial<Styles> = {}
+  const selectOverrides: Partial<Styles> = {}
   overrideKeys.map(key => {
-    selectOverides[key] = (provided: CSSProperties, state: any): CSSProperties => ({
+    selectOverrides[key] = (provided: CSSProperties, state: any): CSSProperties => ({
       ...(
         styles && styles[key]
           ? styles[key]({
@@ -121,7 +116,8 @@ const SelectInput: React.FC<ISelectInputProps> = ({
       )
     })
   })
-  selectOverides.container = (provided, state) => ({
+
+  selectOverrides.container = (provided, state) => ({
     ...provided,
     outline: "none",
     border: `1px solid ${palette.additional["gray"][5]}`,
@@ -145,7 +141,7 @@ const SelectInput: React.FC<ISelectInputProps> = ({
     )
   })
 
-  selectOverides.control = (provided, state) => ({
+  selectOverrides.control = (provided, state) => ({
     ...provided,
     outline: "none",
     border: "none",
@@ -163,7 +159,7 @@ const SelectInput: React.FC<ISelectInputProps> = ({
     )
   })
 
-  selectOverides.menu = (provided, state) => ({
+  selectOverrides.menu = (provided, state) => ({
     ...provided,
     marginTop: 2,
     marginBottom: 0,
@@ -180,7 +176,7 @@ const SelectInput: React.FC<ISelectInputProps> = ({
     )
   })
 
-  selectOverides.dropdownIndicator = (provided, state) => ({
+  selectOverrides.dropdownIndicator = (provided, state) => ({
     ...provided,
     transform: state.selectProps.menuIsOpen && "rotate(180deg)",
     transitionProperty: "transform",
@@ -198,7 +194,7 @@ const SelectInput: React.FC<ISelectInputProps> = ({
     )
   })
 
-  selectOverides.singleValue = (provided, state) => ({
+  selectOverrides.singleValue = (provided, state) => ({
     ...provided,
     ...typography.body2,
     color: !state.isDisabled
@@ -217,7 +213,7 @@ const SelectInput: React.FC<ISelectInputProps> = ({
     )
   })
 
-  selectOverides.placeholder = (provided, state) => ({
+  selectOverrides.placeholder = (provided, state) => ({
     ...provided,
     color: !state.isDisabled
       ? palette.additional["gray"][8]
@@ -235,7 +231,7 @@ const SelectInput: React.FC<ISelectInputProps> = ({
     )
   })
 
-  selectOverides.option = (provided, state) => ({
+  selectOverrides.option = (provided, state) => ({
     ...provided,
     ...typography.body2,
     backgroundColor: state.isSelected && palette.additional["gray"][3],
@@ -257,7 +253,7 @@ const SelectInput: React.FC<ISelectInputProps> = ({
     )
   })
 
-  selectOverides.valueContainer = (provided, state) => ({
+  selectOverrides.valueContainer = (provided, state) => ({
     ...provided,
     ...typography.body2,
     paddingTop: 0,
@@ -275,7 +271,7 @@ const SelectInput: React.FC<ISelectInputProps> = ({
     )
   })
 
-  selectOverides.indicatorsContainer = (provided, state) => ({
+  selectOverrides.indicatorsContainer = (provided, state) => ({
     ...provided,
     "& > div": {
       paddingTop: 0,
@@ -314,12 +310,16 @@ const SelectInput: React.FC<ISelectInputProps> = ({
         value={selectValue}
         isMulti={isMulti}
         name={name}
-        styles={selectOverides}
+        styles={selectOverrides}
         theme={(selectTheme) => ({
           ...selectTheme,
           spacing: {
             ...selectTheme.spacing,
-            controlHeight: size === "large" ? 40 : size === "medium" ? 32 : 24
+            controlHeight: size === "large"
+              ? 40
+              : size === "medium"
+                ? 32
+                : 24
           }
         })}
       />
diff --git a/packages/common-components/src/TagsInput/TagsInput.tsx b/packages/common-components/src/TagsInput/TagsInput.tsx
index a7a4b06867..7636d1a191 100644
--- a/packages/common-components/src/TagsInput/TagsInput.tsx
+++ b/packages/common-components/src/TagsInput/TagsInput.tsx
@@ -3,7 +3,8 @@ import {
   makeStyles,
   createStyles,
   ITheme,
-  useTheme
+  useTheme,
+  debounce
 } from "@chainsafe/common-theme"
 import clsx from "clsx"
 import AsyncSelect from "react-select/async"
@@ -63,6 +64,8 @@ interface ITagsInputProps {
   fetchTags: (searchValue: string) => Promise<Array<ITagOption>>
   onChange: (value: ValueType<ITagOption, true>, action: ActionMeta<ITagOption>) => void
   styles?: Partial<Styles>
+  loadingMessage?: string
+  noOptionsMessage? : string
 }
 
 const TagsInput = ({
@@ -75,7 +78,9 @@ const TagsInput = ({
   fetchTags,
   disabled = false,
   onChange,
-  styles
+  styles,
+  loadingMessage = "Loading...",
+  noOptionsMessage = "No options found."
 }: ITagsInputProps) => {
   const classes = useStyles()
 
@@ -111,6 +116,10 @@ const TagsInput = ({
     })
   })
 
+  const loadOptions = debounce((inputText, callback) => {
+    fetchTags(inputText).then((options) => callback(options))
+  }, 300)
+
   return (
     <label className={clsx(classes.root, className)}>
       {label && label.length > 0 && (
@@ -127,11 +136,8 @@ const TagsInput = ({
         isMulti
         cacheOptions={false}
         value={value}
-        loadOptions={fetchTags}
-        onInputChange={(inputVal) => fetchTags(inputVal)}
+        loadOptions={loadOptions}
         isClearable={false}
-        getOptionLabel={(option) => option.label}
-        getOptionValue={(option) => option.value}
         onChange={onChange}
         openMenuOnClick={false}
         openMenuOnFocus={false}
@@ -139,6 +145,8 @@ const TagsInput = ({
         isDisabled={disabled}
         components={{ DropdownIndicator:() => null, IndicatorSeparator:() => null }}
         styles={selectOverides as Partial<Styles>}
+        loadingMessage={() => loadingMessage}
+        noOptionsMessage={() => noOptionsMessage}
       />
       {caption && (
         <Typography
diff --git a/packages/common-components/src/TextInput/TextInput.tsx b/packages/common-components/src/TextInput/TextInput.tsx
index c95b26fe78..ae4454bf60 100644
--- a/packages/common-components/src/TextInput/TextInput.tsx
+++ b/packages/common-components/src/TextInput/TextInput.tsx
@@ -381,10 +381,7 @@ const useStyles = makeStyles(
 export type InputState = "normal" | "warning" | "success" | "error"
 
 export interface ITextInputProps
-  extends Omit<
-    React.HTMLProps<HTMLInputElement>,
-    "onChange" | "label" | "size" | "value"
-  > {
+  extends Omit<React.HTMLProps<HTMLInputElement>, "onChange" | "label" | "size" | "value"> {
   className?: string
   label?: string
   labelClassName?: string
diff --git a/packages/files-ui/cypress/support/page-objects/binPage.ts b/packages/files-ui/cypress/support/page-objects/binPage.ts
index 7b868098f8..7b8f48429b 100644
--- a/packages/files-ui/cypress/support/page-objects/binPage.ts
+++ b/packages/files-ui/cypress/support/page-objects/binPage.ts
@@ -8,6 +8,8 @@ export const binPage = {
   // bin page specific file browser elements
   recoverSelectedButton: () => cy.get("[data-testId=button-recover-selected-file]"),
   deleteSelectedButton: () => cy.get("[data-testId=button-delete-selected-file]"),
+  permanentDeleteSuccessToast: () => cy.get("[data-testId=toast-deletion-success]", { timeout: 10000 }),
+  selectAllCheckbox: () => cy.get("[data-testId=checkbox-select-all]"),
 
   // kebab menu elements
   recoverMenuOption: () => cy.get("[data-cy=menu-recover]"),
diff --git a/packages/files-ui/cypress/support/page-objects/homePage.ts b/packages/files-ui/cypress/support/page-objects/homePage.ts
index 85b8851cc0..87a161e0a3 100644
--- a/packages/files-ui/cypress/support/page-objects/homePage.ts
+++ b/packages/files-ui/cypress/support/page-objects/homePage.ts
@@ -11,7 +11,9 @@ export const homePage = {
   uploadButton: () => cy.get("[data-cy=button-upload-file]"),
   moveSelectedButton: () => cy.get("[data-testId=button-move-selected-file]"),
   deleteSelectedButton: () => cy.get("[data-testId=button-delete-selected-file]"),
+  selectAllCheckbox: () => cy.get("[data-testId=checkbox-select-all]"),
   uploadStatusToast: () => cy.get("[data-testId=toast-upload-status]", { timeout: 10000 }),
+  deleteSuccessToast: () => cy.get("[data-testId=toast-deletion-success]", { timeout: 10000 }),
   fileRenameInput: () => cy.get("[data-cy=rename-form] input"),
   fileRenameSubmitButton: () => cy.get("[data-cy=rename-submit-button]"),
   fileRenameErrorLabel: () => cy.get("[data-cy=rename-form] span.minimal.error"),
diff --git a/packages/files-ui/cypress/support/page-objects/navigationMenu.ts b/packages/files-ui/cypress/support/page-objects/navigationMenu.ts
index 8d05fe5209..a19842843e 100644
--- a/packages/files-ui/cypress/support/page-objects/navigationMenu.ts
+++ b/packages/files-ui/cypress/support/page-objects/navigationMenu.ts
@@ -5,7 +5,7 @@ export const navigationMenu = {
   homeNavButton: () => cy.get("[data-cy=home-nav]"),
   binNavButton: () => cy.get("[data-cy=bin-nav]"),
   settingsNavButton: () => cy.get("[data-cy=settings-nav]"),
-  spaceUsedLabel: () => cy.get("[data-cy=label-space-used]"),
+  spaceUsedLabel: () => cy.get("[data-cy=label-space-used]", { timeout: 10000 }),
   spaceUsedProgressBar: () => cy.get("[data-cy=progress-bar-space-used]"),
   sendFeedbackNavButton: () => cy.get("[data-cy=send-feedback-nav]"),
   // mobile view only
diff --git a/packages/files-ui/cypress/tests/file-management-spec.ts b/packages/files-ui/cypress/tests/file-management-spec.ts
index e7dbb06e9f..fdabafa8ad 100644
--- a/packages/files-ui/cypress/tests/file-management-spec.ts
+++ b/packages/files-ui/cypress/tests/file-management-spec.ts
@@ -87,9 +87,72 @@ describe("File management", () => {
         homePage.fileItemRow().should("have.length", 2)
         homePage.fileItemName().should("contain.text", folderName)
         homePage.fileItemName().should("contain.text", $fileName)
+
+        // ensure folder already in the root cannot be moved to Home
+        homePage.fileItemName().contains(`${$fileName}`).click()
+        homePage.moveSelectedButton().click()
+        moveItemModal.folderList().contains("Home").click()
+        moveItemModal.errorLabel().should("be.visible")
+        moveItemModal.moveButton().should("be.disabled")
+        moveItemModal.cancelButton().should("be.enabled")
       })
     })
 
+    it("can see errors when attempting illogical folder move", () => {
+      cy.web3Login({ clearCSFBucket: true })
+
+      // create the necessary folder structure
+      apiTestHelper.createFolder("/Parent/Child")
+
+      // select a parent folder and initiate move action
+      homePage.fileItemName().contains("Parent").click()
+      homePage.moveSelectedButton().click()
+
+      // ensure folder already in the root cannot be moved to Home
+      moveItemModal.folderList().contains("Home").click()
+      moveItemModal.body().should("be.visible")
+      moveItemModal.errorLabel().should("be.visible")
+      moveItemModal.moveButton().should("be.disabled")
+      moveItemModal.cancelButton().should("be.enabled")
+
+      // ensure a parent folder cannot be moved to itself
+      moveItemModal.folderList().contains("Home").click()
+      moveItemModal.folderList().contains("Parent").click()
+      moveItemModal.body().should("be.visible")
+      moveItemModal.errorLabel().should("be.visible")
+      moveItemModal.moveButton().should("be.disabled")
+      moveItemModal.cancelButton().should("be.enabled")
+
+      // ensure a parent folder cannot be moved to a child folder
+      moveItemModal.folderList().contains("Child").click()
+      moveItemModal.body().should("be.visible")
+      moveItemModal.errorLabel().should("be.visible")
+      moveItemModal.moveButton().should("be.disabled")
+      moveItemModal.cancelButton().should("be.enabled")
+
+      // return home
+      moveItemModal.cancelButton().click()
+      moveItemModal.body().should("not.exist")
+
+      // navigate to the child folder and initiate move action
+      homePage.fileItemName().contains("Parent").dblclick()
+      homePage.fileItemName().contains("Child").click()
+      homePage.moveSelectedButton().click()
+
+      // ensure a child folder cannot be moved to the parent folder it is already in
+      moveItemModal.folderList().contains("Parent").click()
+      moveItemModal.body().should("be.visible")
+      moveItemModal.errorLabel().should("be.visible")
+      moveItemModal.moveButton().should("be.disabled")
+      moveItemModal.cancelButton().should("be.enabled")
+
+      // ensure a child folder cannot be moved to itself
+      moveItemModal.folderList().contains("Child").click()
+      moveItemModal.body().should("be.visible")
+      moveItemModal.errorLabel().should("be.visible")
+      moveItemModal.moveButton().should("be.disabled")
+      moveItemModal.cancelButton().should("be.enabled")
+    })
 
     it("can add/remove multiple files and upload", () => {
       cy.web3Login({ clearCSFBucket: true })
@@ -185,7 +248,7 @@ describe("File management", () => {
       binPage.recoverMenuOption().click()
       recoverItemModal.folderList().should("exist")
       recoverItemModal.folderList().contains("Home").click()
-      recoverItemModal.recoverButton().click()
+      recoverItemModal.recoverButton().safeClick()
       binPage.fileItemRow().should("not.exist")
 
       // ensure recovered file is correct
@@ -237,7 +300,7 @@ describe("File management", () => {
       binPage.recoverMenuOption().click()
       recoverItemModal.folderList().should("exist")
       recoverItemModal.folderList().contains("Home").click()
-      recoverItemModal.recoverButton().click()
+      recoverItemModal.recoverButton().safeClick()
       binPage.fileItemRow().should("not.exist")
 
       // ensure recovered folder is correct
@@ -287,5 +350,69 @@ describe("File management", () => {
       createFolderModal.errorLabel().should("be.visible")
       createFolderModal.body().should("contain.text", "Name too long")
     })
+
+    it("can see storage space summary updated accordingly", () => {
+      cy.web3Login({ clearCSFBucket: true, clearTrashBucket: true })
+
+      // Make sure elements exist and that we are starting with 0
+      navigationMenu.spaceUsedProgressBar().should("be.visible")
+      navigationMenu.spaceUsedLabel().should("contain.text", "0 Bytes")
+
+      // upload a file and ensure the storage space label adjusts
+      homePage.uploadFile("../fixtures/uploadedFiles/logo.png")
+      navigationMenu.spaceUsedLabel().should("not.contain.text", "0 Bytes")
+
+      // delete the file from the bin and ensure the storage space label adjusts
+      homePage.fileItemKebabButton().click()
+      homePage.deleteMenuOption().click()
+      deleteFileModal.confirmButton().safeClick()
+      homePage.deleteSuccessToast().should("not.exist")
+      navigationMenu.binNavButton().click()
+      binPage.fileItemKebabButton().click()
+      binPage.deleteMenuOption().click()
+      deleteFileModal.confirmButton().safeClick()
+      binPage.permanentDeleteSuccessToast().should("not.exist")
+      navigationMenu.spaceUsedLabel().should("contain.text", "0 Bytes")
+    })
+
+    it("can delete and recover multiple files", () => {
+      cy.web3Login({ clearCSFBucket: true, clearTrashBucket: true })
+
+      // upload 2 files
+      homePage.uploadFile("../fixtures/uploadedFiles/logo.png")
+      homePage.uploadFile("../fixtures/uploadedFiles/text-file.txt")
+      homePage.fileItemRow().should("have.length", 2)
+
+      // store their file names as cypress aliases for later comparison
+      homePage.fileItemName().eq(0).invoke("text").as("fileNameA")
+      homePage.fileItemName().eq(1).invoke("text").as("fileNameB")
+
+      // delete both of the files in the same action
+      homePage.selectAllCheckbox().click()
+      homePage.deleteSelectedButton().click()
+      deleteFileModal.confirmButton().safeClick()
+      homePage.deleteSuccessToast().should("not.exist")
+      homePage.fileItemRow().should("have.length", 0)
+
+      // recover both of the files in the same action
+      navigationMenu.binNavButton().click()
+      binPage.selectAllCheckbox().click()
+      binPage.recoverSelectedButton().click()
+      recoverItemModal.folderList().should("exist")
+      recoverItemModal.folderList().contains("Home").click()
+      recoverItemModal.recoverButton().safeClick()
+      binPage.fileItemRow().should("not.exist")
+
+      // return home and ensure both of the files were recovered
+      navigationMenu.homeNavButton().click()
+
+      cy.get("@fileNameA").then(($fileNameA) => {
+        homePage.fileItemName().should("contain.text", $fileNameA)
+      })
+
+      cy.get("@fileNameB").then(($fileNameB) => {
+        homePage.fileItemName().should("contain.text", $fileNameB)
+      })
+    })
   })
 })
diff --git a/packages/files-ui/cypress/tests/main-navigation-spec.ts b/packages/files-ui/cypress/tests/main-navigation-spec.ts
index 6c5b6136f2..61b1fd06ff 100644
--- a/packages/files-ui/cypress/tests/main-navigation-spec.ts
+++ b/packages/files-ui/cypress/tests/main-navigation-spec.ts
@@ -19,11 +19,6 @@ describe("Main Navigation", () => {
       cy.url().should("include", "/settings")
     })
 
-    // it("can see data storage summary info", () => {
-    //   navigationMenu.spaceUsedLabel().should("contain.text", "of 20 GB used")
-    //   navigationMenu.spaceUsedProgressBar().should("be.visible")
-    // })
-
     it.skip("can navigate to block survey via send feedback button", () => {
       // TODO: Andrew - find a way to check the button link, cypress doesn't support tabs #1084
     })
diff --git a/packages/files-ui/package.json b/packages/files-ui/package.json
index 96fbb82068..1d9af5079a 100644
--- a/packages/files-ui/package.json
+++ b/packages/files-ui/package.json
@@ -6,16 +6,17 @@
     "@babel/core": "^7.12.10",
     "@babel/runtime": "^7.0.0",
     "@chainsafe/browser-storage-hooks": "^1.0.1",
-    "@chainsafe/files-api-client": "^1.18.5",
+    "@chainsafe/files-api-client": "^1.18.10",
     "@chainsafe/web3-context": "1.1.4",
     "@lingui/core": "^3.7.2",
     "@lingui/react": "^3.7.2",
     "@material-ui/core": "^4.12.3",
     "@sentry/react": "^5.28.0",
-    "@tkey/default": "3.12.0",
-    "@tkey/security-questions": "3.12.0",
-    "@tkey/web-storage": "3.12.0",
-    "@toruslabs/torus-direct-web-sdk": "4.10.0",
+    "@tkey/default": "3.14.2",
+    "@tkey/security-questions": "3.14.2",
+    "@tkey/web-storage": "3.14.2",
+    "@toruslabs/torus-direct-web-sdk": "4.15.1",
+    "@types/filesystem": "^0.0.32",
     "@types/uuid": "^8.3.0",
     "axios": "0.21.4",
     "babel-loader": "8.1.0",
@@ -24,12 +25,14 @@
     "babel-preset-react": "^6.24.1",
     "bnc-onboard": "1.32.0",
     "clsx": "^1.1.1",
+    "datatransfer-files-promise": "^1.3.1",
     "dayjs": "^1.9.7",
     "eth-crypto": "^1.8.0",
     "ethers": "^5.4.3",
     "fflate": "^0.7.1",
     "formik": "^2.2.5",
     "mime-matcher": "^1.0.5",
+    "posthog-js": "^1.13.10",
     "react": "^16.14.0",
     "react-beforeunload": "^2.4.0",
     "react-dnd": "14.0.2",
diff --git a/packages/files-ui/src/App.tsx b/packages/files-ui/src/App.tsx
index 5e25f4cf1f..3e31086125 100644
--- a/packages/files-ui/src/App.tsx
+++ b/packages/files-ui/src/App.tsx
@@ -15,6 +15,7 @@ import { useLocalStorage } from "@chainsafe/browser-storage-hooks"
 import { FilesApiProvider }  from "./Contexts/FilesApiContext"
 import { UserProvider } from "./Contexts/UserContext"
 import { BillingProvider } from "./Contexts/BillingContext"
+import { PosthogProvider } from "./Contexts/PosthogContext"
 
 if (
   process.env.NODE_ENV === "production" &&
@@ -63,6 +64,7 @@ const onboardConfig = {
 
 const App = () => {
   const { canUseLocalStorage } = useLocalStorage()
+
   const apiUrl = process.env.REACT_APP_API_URL || "https://stage.imploy.site/api/v1"
   // This will default to testnet unless mainnet is specifically set in the ENV
   const directAuthNetwork = (process.env.REACT_APP_DIRECT_AUTH_NETWORK === "mainnet") ? "mainnet" : "testnet"
@@ -84,13 +86,14 @@ const App = () => {
       <Button
         onClick={() => showReportDialog({ eventId: eventId || "" })}
       >
-      Provide Additional Details
+        Provide Additional Details
       </Button>
       <Button onClick={resetError}>Reset error</Button>
     </Modal>
   ), [])
 
   return (
+
     <ThemeSwitcher
       storageKey="csf.themeKey"
       themes={{ light: lightTheme, dark: darkTheme }}
@@ -122,9 +125,11 @@ const App = () => {
                     <FilesProvider>
                       <BillingProvider>
                         <Router>
-                          <AppWrapper>
-                            <FilesRoutes />
-                          </AppWrapper>
+                          <PosthogProvider>
+                            <AppWrapper>
+                              <FilesRoutes />
+                            </AppWrapper>
+                          </PosthogProvider>
                         </Router>
                       </BillingProvider>
                     </FilesProvider>
@@ -136,6 +141,7 @@ const App = () => {
         </LanguageProvider>
       </ErrorBoundary>
     </ThemeSwitcher>
+
   )
 }
 
diff --git a/packages/files-ui/src/Components/Elements/PasswordForm.tsx b/packages/files-ui/src/Components/Elements/PasswordForm.tsx
index 91f36d9377..e99eeea19a 100644
--- a/packages/files-ui/src/Components/Elements/PasswordForm.tsx
+++ b/packages/files-ui/src/Components/Elements/PasswordForm.tsx
@@ -94,6 +94,7 @@ const PasswordForm = ({ buttonLabel, setPassword }: Props) => {
       }}
       validationSchema={passwordValidation}
       onSubmit={onSubmit}
+      enableReinitialize
     >
       <Form>
         <FormikTextInput
diff --git a/packages/files-ui/src/Components/Elements/SharedUsers.tsx b/packages/files-ui/src/Components/Elements/SharedUsers.tsx
index ff39669ea7..30d44bfbda 100644
--- a/packages/files-ui/src/Components/Elements/SharedUsers.tsx
+++ b/packages/files-ui/src/Components/Elements/SharedUsers.tsx
@@ -1,8 +1,7 @@
 import React, { useCallback, useMemo } from "react"
 import { makeStyles, createStyles, useThemeSwitcher } from "@chainsafe/common-theme"
 import UserBubble from "./UserBubble"
-import { LookupUser } from "@chainsafe/files-api-client"
-import { BucketKeyPermission } from "../../Contexts/FilesContext"
+import { BucketKeyPermission, RichUserInfo } from "../../Contexts/FilesContext"
 import { getUserDisplayName } from "../../Utils/getUserDisplayName"
 
 const useStyles = makeStyles(() => {
@@ -21,7 +20,7 @@ const SharedUsers = ({ bucket }: Props) => {
   const { desktop } = useThemeSwitcher()
   const { owners, readers, writers } = bucket
 
-  const getUserLabels = useCallback((users: LookupUser[]): string[] => {
+  const getUserLabels = useCallback((users: RichUserInfo[]): string[] => {
     return users.reduce((acc: string[], user): string[] => {
       const displayName = getUserDisplayName(user)
 
diff --git a/packages/files-ui/src/Components/FilesRoutes.tsx b/packages/files-ui/src/Components/FilesRoutes.tsx
index ca53bf18ee..4db2c0a4e2 100644
--- a/packages/files-ui/src/Components/FilesRoutes.tsx
+++ b/packages/files-ui/src/Components/FilesRoutes.tsx
@@ -24,7 +24,6 @@ export const ROUTE_LINKS = {
   Settings: `${SETTINGS_BASE}/:path`,
   SettingsDefault: `${SETTINGS_BASE}`,
   SettingsPath: (settingsPath: SettingsPath) => `${SETTINGS_BASE}/${settingsPath}`,
-  PurchasePlan: "/purchase",
   UserSurvey: "https://calendly.com/colinschwarz/chainsafe-files-chat",
   Plans: "/plans",
   SharedFolders: "/shared-overview",
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/BinFileBrowser.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/BinFileBrowser.tsx
index 295955e533..1cade321ee 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/BinFileBrowser.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/BinFileBrowser.tsx
@@ -68,14 +68,19 @@ const BinFileBrowser: React.FC<IFileBrowserModuleProps> = ({ controls = false }:
 
       refreshContents()
       refreshBuckets()
-      const message = `${itemToDelete.isFolder ? t`Folder` : t`File`} ${t`deleted successfully`}`
+      const message = `${
+        itemToDelete.isFolder ? t`Folder` : t`File`
+      } ${t`deleted successfully`}`
       addToast({
         title: message,
-        type: "success"
+        type: "success",
+        testId: "permanent-deletion-success"
       })
       return Promise.resolve()
     } catch (error) {
-      const message = `${t`There was an error deleting this`} ${itemToDelete.isFolder ? t`folder` : t`file`}`
+      const message = `${t`There was an error deleting this`} ${
+        itemToDelete.isFolder ? t`folder` : t`file`
+      }`
       addToast({
         title: message,
         type: "error"
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/CSFFileBrowser.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/CSFFileBrowser.tsx
index b14364eafb..1727cbb873 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/CSFFileBrowser.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/CSFFileBrowser.tsx
@@ -21,13 +21,10 @@ import { useLocalStorage } from "@chainsafe/browser-storage-hooks"
 import { DISMISSED_SURVEY_KEY } from "../../SurveyBanner"
 import { FileBrowserContext } from "../../../Contexts/FileBrowserContext"
 import { parseFileContentResponse } from "../../../Utils/Helpers"
+import getFilesFromDataTransferItems from "../../../Utils/getFilesFromDataTransferItems"
 
 const CSFFileBrowser: React.FC<IFileBrowserModuleProps> = () => {
-  const {
-    downloadFile,
-    uploadFiles,
-    buckets
-  } = useFiles()
+  const { downloadFile, uploadFiles, buckets } = useFiles()
   const { filesApiClient } = useFilesApi()
   const { addToast } = useToasts()
   const [loadingCurrentPath, setLoadingCurrentPath] = useState(false)
@@ -97,7 +94,8 @@ const CSFFileBrowser: React.FC<IFileBrowserModuleProps> = () => {
             } ${t`deleted successfully`}`
             const id = addToast({
               title: message,
-              type: "success"
+              type: "success",
+              testId: "deletion-success"
             })
             console.log(id)
           }
@@ -178,23 +176,12 @@ const CSFFileBrowser: React.FC<IFileBrowserModuleProps> = () => {
 
   const handleUploadOnDrop = useCallback(async (files: File[], fileItems: DataTransferItemList, path: string) => {
     if (!bucket) return
-    let hasFolder = false
-    for (let i = 0; i < files.length; i++) {
-      if (fileItems[i].webkitGetAsEntry()?.isDirectory) {
-        hasFolder = true
-      }
-    }
-    if (hasFolder) {
-      addToast({
-        title: t`Folder uploads are not supported currently`,
-        type: "error"
-      })
-    } else {
-      uploadFiles(bucket, files, path)
-        .then(() => refreshContents())
-        .catch(console.error)
-    }
-  }, [addToast, uploadFiles, bucket, refreshContents])
+    const flattenedFiles = await getFilesFromDataTransferItems(fileItems)
+    const paths = [...new Set(flattenedFiles.map(f => f.filepath))]
+    paths.forEach(p => {
+      uploadFiles(bucket, flattenedFiles.filter(f => f.filepath === p), getPathWithFile(path, p))
+    })
+  }, [uploadFiles, bucket])
 
   const viewFolder = useCallback((cid: string) => {
     const fileSystemItem = pathContents.find(f => f.cid === cid)
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/CreateFolderModal.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/CreateFolderModal.tsx
index cad44f1d75..d23fcd5d2e 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/CreateFolderModal.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/CreateFolderModal.tsx
@@ -9,7 +9,7 @@ import {
   makeStyles,
   useMediaQuery
 } from "@chainsafe/common-theme"
-import React, { useState } from "react"
+import React, { useCallback, useState } from "react"
 import { Form, FormikProvider, useFormik } from "formik"
 import CustomModal from "../../Elements/CustomModal"
 import CustomButton from "../../Elements/CustomButton"
@@ -77,15 +77,13 @@ interface ICreateFolderModalProps {
   close: () => void
 }
 
-const CreateFolderModal: React.FC<ICreateFolderModalProps> = ({
-  modalOpen,
-  close
-}: ICreateFolderModalProps) => {
+const CreateFolderModal = ({ modalOpen, close }: ICreateFolderModalProps) => {
   const classes = useStyles()
   const { filesApiClient } = useFilesApi()
   const { currentPath, refreshContents, bucket } = useFileBrowser()
   const [creatingFolder, setCreatingFolder] = useState(false)
   const desktop = useMediaQuery("md")
+
   const formik = useFormik({
     initialValues: {
       name: ""
@@ -100,8 +98,8 @@ const CreateFolderModal: React.FC<ICreateFolderModalProps> = ({
         refreshContents && await refreshContents()
         setCreatingFolder(false)
         helpers.resetForm()
-        close()
-      } catch (errors) {
+        onCancel()
+      } catch (errors: any) {
         setCreatingFolder(false)
         if (errors[0].message.includes("Entry with such name can")) {
           helpers.setFieldError("name", t`Folder name is already in use`)
@@ -114,6 +112,11 @@ const CreateFolderModal: React.FC<ICreateFolderModalProps> = ({
     enableReinitialize: true
   })
 
+  const onCancel = useCallback(() => {
+    formik.resetForm()
+    close()
+  }, [close, formik])
+
   return (
     <CustomModal
       className={classes.modalRoot}
@@ -168,7 +171,7 @@ const CreateFolderModal: React.FC<ICreateFolderModalProps> = ({
             >
               <CustomButton
                 data-cy="button-cancel-create-folder"
-                onClick={() => close()}
+                onClick={onCancel}
                 size="medium"
                 className={classes.cancelButton}
                 variant={desktop ? "outline" : "gray"}
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/CreateOrEditSharedFolderModal.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/CreateOrEditSharedFolderModal.tsx
index 347d13ea3b..ebbcd313d0 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/CreateOrEditSharedFolderModal.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/CreateOrEditSharedFolderModal.tsx
@@ -119,14 +119,18 @@ const CreateOrEditSharedFolderModal = ({ mode, isModalOpen, onClose, bucketToEdi
   const { desktop } = useThemeSwitcher()
   const { handleCreateSharedFolder, handleEditSharedFolder, isEditingSharedFolder, isCreatingSharedFolder } = useCreateOrEditSharedFolder()
   const [sharedFolderName, setSharedFolderName] = useState("")
-  const { sharedFolderReaders, sharedFolderWriters, onNewUsers, handleLookupUser, usersError, setUsersError } = useLookupSharedFolderUser()
+  const { sharedFolderReaders, sharedFolderWriters, onNewUsers, handleLookupUser, usersError, resetUsers } = useLookupSharedFolderUser()
   const [hasPermissionsChanged, setHasPermissionsChanged] = useState(false)
   const [nameError, setNameError] = useState("")
 
-  useEffect(() => {
+  const onReset = useCallback(() => {
     setSharedFolderName("")
     setHasPermissionsChanged(false)
-    setUsersError("")
+    resetUsers()
+  }, [resetUsers])
+
+  useEffect(() => {
+    onReset()
 
     if (!bucketToEdit) return
 
@@ -146,20 +150,7 @@ const CreateOrEditSharedFolderModal = ({ mode, isModalOpen, onClose, bucketToEdi
 
     onNewUsers(newWriters, "write")
     onNewUsers(newReaders, "read")
-  }, [bucketToEdit, setUsersError, setHasPermissionsChanged, onNewUsers])
-
-  const onCreateSharedFolder = useCallback(() => {
-    handleCreateSharedFolder(sharedFolderName, sharedFolderReaders, sharedFolderWriters)
-      .catch(console.error)
-      .finally(onClose)
-  }, [handleCreateSharedFolder, sharedFolderName, sharedFolderWriters, sharedFolderReaders, onClose])
-
-  const onEditSharedFolder = useCallback(() => {
-    if (!bucketToEdit) return
-    handleEditSharedFolder(bucketToEdit, sharedFolderReaders, sharedFolderWriters)
-      .catch(console.error)
-      .finally(onClose)
-  }, [handleEditSharedFolder, sharedFolderWriters, sharedFolderReaders, onClose, bucketToEdit])
+  }, [bucketToEdit, onNewUsers, onReset])
 
   const onNameChange = useCallback((value?: string | number) => {
     if (value === undefined) return
@@ -177,6 +168,24 @@ const CreateOrEditSharedFolderModal = ({ mode, isModalOpen, onClose, bucketToEdi
       })
   }, [])
 
+  const handleClose = useCallback(() => {
+    onReset()
+    onClose()
+  }, [onClose, onReset])
+
+  const onCreateSharedFolder = useCallback(() => {
+    handleCreateSharedFolder(sharedFolderName, sharedFolderReaders, sharedFolderWriters)
+      .catch(console.error)
+      .finally(handleClose)
+  }, [handleCreateSharedFolder, sharedFolderName, sharedFolderWriters, sharedFolderReaders, handleClose])
+
+  const onEditSharedFolder = useCallback(() => {
+    if (!bucketToEdit) return
+    handleEditSharedFolder(bucketToEdit, sharedFolderReaders, sharedFolderWriters)
+      .catch(console.error)
+      .finally(handleClose)
+  }, [handleEditSharedFolder, sharedFolderWriters, sharedFolderReaders, handleClose, bucketToEdit])
+
   return (
     <CustomModal
       className={classes.modalRoot}
@@ -240,6 +249,8 @@ const CreateOrEditSharedFolderModal = ({ mode, isModalOpen, onClose, bucketToEdi
                 alignContent: "start"
               })
             }}
+            loadingMessage={t`Loading`}
+            noOptionsMessage={t`No user found for this query.`}
           />
         </div>
         <div className={classes.modalFlexItem}>
@@ -259,7 +270,10 @@ const CreateOrEditSharedFolderModal = ({ mode, isModalOpen, onClose, bucketToEdi
                 minHeight: 90,
                 alignContent: "start"
               })
-            }}/>
+            }}
+            loadingMessage={t`Loading`}
+            noOptionsMessage={t`No user found for this query.`}
+          />
         </div>
         <Grid
           item
@@ -283,7 +297,7 @@ const CreateOrEditSharedFolderModal = ({ mode, isModalOpen, onClose, bucketToEdi
             justifyContent="flex-end"
           >
             <CustomButton
-              onClick={onClose}
+              onClick={handleClose}
               size="medium"
               className={classes.cancelButton}
               variant={desktop ? "outline" : "gray"}
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/FileInfoModal.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/FileInfoModal.tsx
index 73a1122989..98e422c918 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/FileInfoModal.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/FileInfoModal.tsx
@@ -7,7 +7,7 @@ import React, { useState, useEffect } from "react"
 import CustomModal from "../../Elements/CustomModal"
 import CustomButton from "../../Elements/CustomButton"
 import { Trans } from "@lingui/macro"
-import { FileFullInfo, useFiles } from "../../../Contexts/FilesContext"
+import { FileFullInfo } from "../../../Contexts/FilesContext"
 import {
   Button,
   formatBytes,
@@ -161,7 +161,6 @@ interface IFileInfoModuleProps {
 const FileInfoModal = ({ filePath, close }: IFileInfoModuleProps) => {
   const classes = useStyles()
   const { filesApiClient } = useFilesApi()
-  const { personalEncryptionKey } = useFiles()
   const [loadingFileInfo, setLoadingInfo] = useState(false)
   const [fullFileInfo, setFullFullInfo] = useState<FileFullInfo | undefined>()
   const { bucket } = useFileBrowser()
@@ -381,7 +380,7 @@ const FileInfoModal = ({ filePath, close }: IFileInfoModuleProps) => {
                     component="p"
                   >
                     <ToggleHiddenText hiddenLength={14}>
-                      <span>{ personalEncryptionKey }</span>
+                      <span>{bucket?.encryptionKey}</span>
                     </ToggleHiddenText>
                   </Typography>
                 </div>
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/ReportFileModal.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/ReportFileModal.tsx
index 389c860168..8381fd0604 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/ReportFileModal.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/ReportFileModal.tsx
@@ -19,6 +19,7 @@ import { useFileBrowser } from "../../../Contexts/FileBrowserContext"
 import { useThresholdKey } from "../../../Contexts/ThresholdKeyContext"
 import { useCallback } from "react"
 import { ROUTE_LINKS } from "../../FilesRoutes"
+import { useFilesApi } from "../../../Contexts/FilesApiContext"
 
 const useStyles = makeStyles(
   ({ breakpoints, constants, palette, typography, zIndex, animation }: CSFTheme) => {
@@ -129,7 +130,7 @@ const useStyles = makeStyles(
         color: palette.additional["gray"][9],
         [breakpoints.down("md")]: {
           flexBasis: "100%",
-          margin: `${constants.generalUnit * 2}px`
+          margin: constants.generalUnit * 2
         }
       },
       decryptionKey: {
@@ -137,7 +138,11 @@ const useStyles = makeStyles(
         wordBreak: "break-all"
       },
       infoText: {
-        marginBottom: `${constants.generalUnit * 2}px`
+        marginBottom: constants.generalUnit * 2
+      },
+      keysWrapper: {
+        maxHeight: constants.generalUnit * 10,
+        overflow: "scroll"
       }
     })
   }
@@ -148,33 +153,53 @@ interface IReportFileModalProps {
   close: () => void
 }
 
-const TEMP_PUBLIC_KEY = "0x03e8cab05fc70bbc3cb829af9718feb0bfa626209594f64da6685ed13ce4437e19"
+interface KeyMap {
+  pubKey: string
+  encryptedDecryptionKey: string
+}
 
 const ReportFileModal = ({ filePath, close }: IReportFileModalProps) => {
   const classes = useStyles()
   const { bucket } = useFileBrowser()
   const { encryptionKey, id } = bucket || {}
   const [isLoadingAdminKey, setIsloadingAdminKey] = useState(true)
-  const [adminPubKey, setAdminPubkey] = useState("")
-  const [encryptedDecryptionKey, setEncryptedDecryptionKey] = useState("")
+  const [adminPubKeys, setAdminPubkeys] = useState<string[]>([])
+  const [encryptedDecryptionKeyMap, setEncryptedDecryptionKeyMap] = useState<KeyMap[]>([])
   const { encryptForPublicKey } = useThresholdKey()
   const [copied, setCopied] = useState(false)
+  const { filesApiClient } = useFilesApi()
 
   useEffect(() => {
-    // todo fetch admin public key from api instead of this hardcoded one
-    // https://github.com/ChainSafe/ui-monorepo/issues/1244
-    setAdminPubkey(TEMP_PUBLIC_KEY)
-  }, [])
+    filesApiClient.abuseUser()
+      .then((keys) => {
+        if (!keys.length){
+          console.error("No admin public key received")
+        }
+
+        setAdminPubkeys(keys)
+      })
+      .catch(console.error)
+  }, [filesApiClient])
 
   useEffect(() => {
-    if(!adminPubKey || !encryptionKey) return
+    if(!adminPubKeys.length || !encryptionKey) return
 
-    // we need to remove the 0x
-    encryptForPublicKey(adminPubKey.slice(2), encryptionKey)
-      .then(setEncryptedDecryptionKey)
+    Promise.all(adminPubKeys.map((adminPubKey) =>
+      // we need to remove the 0x
+      encryptForPublicKey(adminPubKey.slice(2), encryptionKey)
+    ))
+      .then((encryptedDecryptionKeys) => {
+        const map = adminPubKeys.map((adminPubKey, index) => ({
+          "pubKey": adminPubKey,
+          "encryptedDecryptionKey": encryptedDecryptionKeys[index]
+        }))
+
+        setEncryptedDecryptionKeyMap(map)
+      })
       .catch(console.error)
       .finally(() => setIsloadingAdminKey(false))
-  }, [adminPubKey, encryptForPublicKey, encryptionKey])
+
+  }, [adminPubKeys, encryptForPublicKey, encryptionKey])
 
   const debouncedSwitchCopied = debounce(() => setCopied(false), 3000)
 
@@ -182,14 +207,14 @@ const ReportFileModal = ({ filePath, close }: IReportFileModalProps) => {
     navigator.clipboard.writeText(`{
   bucketId: "${id}",
   path: "${filePath}",
-  encryptedDecryptionKey: "${encryptedDecryptionKey}"
+  encryptedDecryptionKey: ${JSON.stringify(encryptedDecryptionKeyMap)}
 }`)
       .then(() => {
         setCopied(true)
         debouncedSwitchCopied()
       })
       .catch(console.error)
-  }, [debouncedSwitchCopied, encryptedDecryptionKey, filePath, id])
+  }, [debouncedSwitchCopied, encryptedDecryptionKeyMap, filePath, id])
 
   return (
     <CustomModal
@@ -293,13 +318,15 @@ const ReportFileModal = ({ filePath, close }: IReportFileModalProps) => {
                   >
                     <Trans>Decryption key</Trans>
                   </Typography>
-                  <Typography
-                    className={clsx(classes.decryptionKey, classes.subSubtitle)}
-                    variant="body2"
-                    component="p"
-                  >
-                    {encryptedDecryptionKey}
-                  </Typography>
+                  <div className={classes.keysWrapper}>
+                    <Typography
+                      className={clsx(classes.decryptionKey, classes.subSubtitle)}
+                      variant="body2"
+                      component="p"
+                    >
+                      {JSON.stringify(encryptedDecryptionKeyMap)}
+                    </Typography>
+                  </div>
                 </div>
               </div>
             </div>
@@ -317,6 +344,7 @@ const ReportFileModal = ({ filePath, close }: IReportFileModalProps) => {
               variant="primary"
               className={classes.copyButton}
               onClick={onCopyInfo}
+              disabled={isLoadingAdminKey}
             >
               <Trans>Copy info</Trans>
             </Button>
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/ShareToSharedFolderModal.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/ShareModal.tsx
similarity index 88%
rename from packages/files-ui/src/Components/Modules/FileBrowsers/ShareToSharedFolderModal.tsx
rename to packages/files-ui/src/Components/Modules/FileBrowsers/ShareModal.tsx
index e303716d14..7b7bc01bc5 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/ShareToSharedFolderModal.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/ShareModal.tsx
@@ -2,15 +2,7 @@ import { createStyles, makeStyles } from "@chainsafe/common-theme"
 import React, { useState } from "react"
 import CustomModal from "../../Elements/CustomModal"
 import { t, Trans } from "@lingui/macro"
-import {
-  Button,
-  CheckboxInput,
-  SelectInput,
-  ShareAltSvg,
-  TagsInput,
-  TextInput,
-  Typography
-} from "@chainsafe/common-components"
+import { Button, CheckboxInput, SelectInput, ShareAltSvg, TagsInput, TextInput, Typography } from "@chainsafe/common-components"
 import { CSFTheme } from "../../../Themes/types"
 import { useCallback } from "react"
 import { useCreateOrEditSharedFolder } from "./hooks/useCreateOrEditSharedFolder"
@@ -193,11 +185,11 @@ interface IShareFileProps {
   filePath: string
 }
 
-const CopyToSharedFolderModal = ({ close, file, filePath }: IShareFileProps) => {
+const ShareModal = ({ close, file, filePath }: IShareFileProps) => {
   const classes = useStyles()
   const { handleCreateSharedFolder } = useCreateOrEditSharedFolder()
   const [sharedFolderName, setSharedFolderName] = useState("")
-  const { sharedFolderReaders, sharedFolderWriters, handleLookupUser, onNewUsers, usersError } = useLookupSharedFolderUser()
+  const { sharedFolderReaders, sharedFolderWriters, handleLookupUser, onNewUsers, usersError, resetUsers } = useLookupSharedFolderUser()
   const [isUsingCurrentBucket, setIsUsingCurrentBucket] = useState(true)
   const [keepOriginalFile, setKeepOriginalFile] = useState(true)
   const [destinationBucket, setDestinationBucket] = useState<BucketKeyPermission | undefined>()
@@ -205,7 +197,12 @@ const CopyToSharedFolderModal = ({ close, file, filePath }: IShareFileProps) =>
   const { bucket } = useFileBrowser()
   const { profile } = useUser()
   const [nameError, setNameError] = useState("")
+  const inSharedBucket = useMemo(() => bucket?.type === "share", [bucket])
+  const isReader = useMemo(() => {
+    if (!bucket) return false
 
+    return !!(bucket.readers.find(reader => reader.uuid === profile?.userId))
+  }, [bucket, profile])
 
   const bucketsOptions = useMemo(() => {
     if (!profile) {
@@ -213,18 +210,26 @@ const CopyToSharedFolderModal = ({ close, file, filePath }: IShareFileProps) =>
     }
 
     return buckets
-      .filter(buck => buck.type === "share")
+      .filter(buck => buck.type === "share" || buck.type === "csf")
+      // filter out the current bucket
+      .filter(buck => buck.id !== bucket?.id)
       // all buckets where the user is reader or writer
       .filter(buck => !!buck.writers.find((w) => w.uuid === profile.userId) || !!buck.owners.find((o) => o.uuid === profile.userId))
       .map(buck => ({
-        label: buck.name,
+        label: buck.name || t`Home`,
         value: buck.id
       }))
   }
-  , [buckets, profile])
+  , [bucket, buckets, profile])
 
   const hasNoSharedBucket = useMemo(() => bucketsOptions.length === 0, [bucketsOptions.length])
 
+  useEffect(() => {
+    resetUsers()
+    setSharedFolderName("")
+    setNameError("")
+  }, [resetUsers])
+
   // if the user has no shared bucket, we default to new folder creation
   useEffect(() => {
     if (hasNoSharedBucket) {
@@ -296,7 +301,6 @@ const CopyToSharedFolderModal = ({ close, file, filePath }: IShareFileProps) =>
     transferFileBetweenBuckets
   ])
 
-
   return (
     <CustomModal
       className={classes.modalRoot}
@@ -307,13 +311,15 @@ const CopyToSharedFolderModal = ({ close, file, filePath }: IShareFileProps) =>
       mobileStickyBottom={false}
     >
       <div className={classes.root}>
-
         <div className={classes.iconBacking}>
           <ShareAltSvg />
         </div>
         <div className={classes.heading}>
           <Typography className={classes.inputLabel}>
-            <Trans>Share file</Trans>
+            {inSharedBucket
+              ? t`Copy file`
+              : t`Share file`
+            }
           </Typography>
         </div>
 
@@ -322,7 +328,7 @@ const CopyToSharedFolderModal = ({ close, file, filePath }: IShareFileProps) =>
             ? (
               <div className={clsx(classes.modalFlexItem, classes.inputWrapper)}>
                 <SelectInput
-                  label={t`Select an existing shared folder`}
+                  label={t`Select an existing shared folder or your home`}
                   labelClassName={classes.inputLabel}
                   options={bucketsOptions}
                   value={destinationBucket?.id}
@@ -366,7 +372,10 @@ const CopyToSharedFolderModal = ({ close, file, filePath }: IShareFileProps) =>
                         minHeight: 90,
                         alignContent: "start"
                       })
-                    }}/>
+                    }}
+                    loadingMessage={t`Loading`}
+                    noOptionsMessage={t`No user found for this query.`}
+                  />
                 </div>
                 <div className={classes.modalFlexItem}>
                   <TagsInput
@@ -382,7 +391,10 @@ const CopyToSharedFolderModal = ({ close, file, filePath }: IShareFileProps) =>
                         minHeight: 90,
                         alignContent: "start"
                       })
-                    }}/>
+                    }}
+                    loadingMessage={t`Loading...`}
+                    noOptionsMessage={t`No user found for this query.`}
+                  />
                 </div>
                 {!!usersError && (
                   <Typography
@@ -411,13 +423,15 @@ const CopyToSharedFolderModal = ({ close, file, filePath }: IShareFileProps) =>
               </Typography>
             </div>
           )}
-          <div className={classes.checkboxContainer}>
-            <CheckboxInput
-              value={keepOriginalFile}
-              onChange={() => setKeepOriginalFile(!keepOriginalFile)}
-              label={t`Keep original file`}
-            />
-          </div>
+          {!isReader && (
+            <div className={classes.checkboxContainer}>
+              <CheckboxInput
+                value={keepOriginalFile}
+                onChange={() => setKeepOriginalFile(!keepOriginalFile)}
+                label={t`Keep original file`}
+              />
+            </div>
+          )}
           <div className={classes.buttonsContainer}>
             <Button
               size="large"
@@ -450,4 +464,4 @@ const CopyToSharedFolderModal = ({ close, file, filePath }: IShareFileProps) =>
   )
 }
 
-export default CopyToSharedFolderModal
+export default ShareModal
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/SharedFileBrowser.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/SharedFileBrowser.tsx
index 635953d884..2697dd1b98 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/SharedFileBrowser.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/SharedFileBrowser.tsx
@@ -199,7 +199,7 @@ const SharedFileBrowser = () => {
 
   const bulkOperations: IBulkOperations = useMemo(() => ({
     [CONTENT_TYPES.Directory]: ["download", "move", "delete"],
-    [CONTENT_TYPES.File]: ["download", "delete", "move"]
+    [CONTENT_TYPES.File]: ["download", "delete", "move", "share"]
   }), [])
 
   const itemOperations: IFilesTableBrowserProps["itemOperations"] = useMemo(() => {
@@ -211,7 +211,7 @@ const SharedFileBrowser = () => {
         [CONTENT_TYPES.Image]: ["preview"],
         [CONTENT_TYPES.Pdf]: ["preview"],
         [CONTENT_TYPES.Text]: ["preview"],
-        [CONTENT_TYPES.File]: ["download", "info", "rename", "move", "delete"],
+        [CONTENT_TYPES.File]: ["download", "info", "rename", "move", "delete", "share"],
         [CONTENT_TYPES.Directory]: ["rename", "move", "delete"]
       }
     case "writer":
@@ -221,7 +221,7 @@ const SharedFileBrowser = () => {
         [CONTENT_TYPES.Image]: ["preview"],
         [CONTENT_TYPES.Pdf]: ["preview"],
         [CONTENT_TYPES.Text]: ["preview"],
-        [CONTENT_TYPES.File]: ["download", "info", "rename", "move", "delete", "report"],
+        [CONTENT_TYPES.File]: ["download", "info", "rename", "move", "delete", "report", "share"],
         [CONTENT_TYPES.Directory]: ["rename", "move", "delete"]
       }
     // case "reader":
@@ -232,7 +232,7 @@ const SharedFileBrowser = () => {
         [CONTENT_TYPES.Image]: ["preview"],
         [CONTENT_TYPES.Pdf]: ["preview"],
         [CONTENT_TYPES.Text]: ["preview"],
-        [CONTENT_TYPES.File]: ["download", "info", "report"],
+        [CONTENT_TYPES.File]: ["download", "info", "report", "share"],
         [CONTENT_TYPES.Directory]: []
       }
     }
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/SharedFoldersOverview.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/SharedFoldersOverview.tsx
index 29f0956e57..3e6f46d8b9 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/SharedFoldersOverview.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/SharedFoldersOverview.tsx
@@ -25,6 +25,7 @@ import SharedFolderRow from "./views/FileSystemItem/SharedFolderRow"
 import { SharedFolderModalMode } from "./types"
 import SharingExplainerModal from "../../SharingExplainerModal"
 import { useSharingExplainerModalFlag } from "./hooks/useSharingExplainerModalFlag"
+import { usePageTrack } from "../../../Contexts/PosthogContext"
 
 export const desktopSharedGridSettings = "69px 3fr 120px 190px 150px 45px !important"
 export const mobileSharedGridSettings = "3fr 80px 45px !important"
@@ -121,6 +122,8 @@ const SharedFolderOverview = () => {
   const bucketsToShow = useMemo(() => buckets.filter(b => b.type === "share" && b.status !== "deleting"), [buckets])
   const { hasSeenSharingExplainerModal, hideModal } = useSharingExplainerModalFlag()
 
+  usePageTrack()
+
   const handleSortToggle = (targetColumn: SortingType) => {
     if (column !== targetColumn) {
       setColumn(targetColumn)
@@ -157,7 +160,6 @@ const SharedFolderOverview = () => {
   const openSharedFolder = useCallback((bucketId: string) => {
     redirect(ROUTE_LINKS.SharedFolderExplorer(bucketId, "/"))
   }, [redirect])
-
   return (
     <>
       <article
diff --git a/packages/files-ui/src/Components/Modules/UploadFileModule.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/UploadFileModal.tsx
similarity index 85%
rename from packages/files-ui/src/Components/Modules/UploadFileModule.tsx
rename to packages/files-ui/src/Components/Modules/FileBrowsers/UploadFileModal.tsx
index 4be8c3b698..d2a0615753 100644
--- a/packages/files-ui/src/Components/Modules/UploadFileModule.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/UploadFileModal.tsx
@@ -1,14 +1,15 @@
 import { Button, FileInput } from "@chainsafe/common-components"
-import { useFiles } from "../../Contexts/FilesContext"
+import { useFiles } from "../../../Contexts/FilesContext"
 import { createStyles, makeStyles } from "@chainsafe/common-theme"
 import React, { useCallback, useState } from "react"
 import { Formik, Form } from "formik"
 import { array, object } from "yup"
-import CustomModal from "../Elements/CustomModal"
+import CustomModal from "../../Elements/CustomModal"
 import { Trans, t } from "@lingui/macro"
 import clsx from "clsx"
-import { CSFTheme } from "../../Themes/types"
-import { useFileBrowser } from "../../Contexts/FileBrowserContext"
+import { CSFTheme } from "../../../Themes/types"
+import { useFileBrowser } from "../../../Contexts/FileBrowserContext"
+import { getPathWithFile } from "../../../Utils/pathUtils"
 
 const useStyles = makeStyles(({ constants, breakpoints }: CSFTheme) =>
   createStyles({
@@ -89,15 +90,19 @@ const UploadFileModule = ({ modalOpen, close }: IUploadFileModuleProps) => {
     setIsDoneDisabled(filesNumber === 0)
   }, [])
 
-  const onSubmit = useCallback(async (values, helpers) => {
+  const onSubmit = useCallback(async (values: {files: Array<File & {path: string}>}, helpers) => {
     if (!bucket) return
     helpers.setSubmitting(true)
     try {
       close()
-      await uploadFiles(bucket, values.files, currentPath)
+      const paths = [...new Set(values.files.map(f => f.path.substring(0, f.path.lastIndexOf("/"))))]
+      paths.forEach(async p => {
+        const filesToUpload = values.files.filter((f => f.path.substring(0, f.path.lastIndexOf("/")) === p))
+        await uploadFiles(bucket, filesToUpload, getPathWithFile(currentPath, p))
+      })
       refreshContents && refreshContents()
       helpers.resetForm()
-    } catch (errors) {
+    } catch (errors: any) {
       if (errors[0].message.includes("conflict with existing")) {
         helpers.setFieldError("files", "File/Folder exists")
       } else {
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx
index f8dd81a68e..918e956183 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/hooks/useLookupUser.tsx
@@ -60,8 +60,8 @@ export const useLookupSharedFolderUser = () => {
 
       return [{ label: inputVal, value: result.uuid, data: result }]
     } catch (e) {
-      console.error(e)
-      return Promise.reject(e)
+      console.error("No user found", e)
+      return Promise.resolve([])
     }
   }, [filesApiClient, sharedFolderReaders, sharedFolderWriters, profile])
 
@@ -77,12 +77,19 @@ export const useLookupSharedFolderUser = () => {
     }
   }, [])
 
+  const resetUsers = useCallback(() => {
+    setSharedFolderReaders([])
+    setSharedFolderWriters([])
+    setUsersError("")
+  }, [])
+
   return {
     handleLookupUser,
     sharedFolderReaders,
     sharedFolderWriters,
     onNewUsers,
     usersError,
-    setUsersError
+    setUsersError,
+    resetUsers
   }
 }
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/views/FileSystemItem/FileSystemGridItem.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/views/FileSystemItem/FileSystemGridItem.tsx
index 3246876805..c9d140d722 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/views/FileSystemItem/FileSystemGridItem.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/views/FileSystemItem/FileSystemGridItem.tsx
@@ -248,12 +248,14 @@ const FileSystemGridItem = React.forwardRef(
           }
         </div>
         <div>
-          <Menu
-            testId='fileDropdown'
-            icon={<MoreIcon className={classes.dropdownIcon} />}
-            options={menuItems}
-            style={{ focusVisible: classes.focusVisible }}
-          />
+          {!!menuItems.length && (
+            <Menu
+              testId='fileDropdown'
+              icon={<MoreIcon className={classes.dropdownIcon} />}
+              options={menuItems}
+              style={{ focusVisible: classes.focusVisible }}
+            />
+          )}
         </div>
       </div>
     )
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/views/FileSystemItem/FileSystemItem.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/views/FileSystemItem/FileSystemItem.tsx
index 9d0b308196..79c6937151 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/views/FileSystemItem/FileSystemItem.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/views/FileSystemItem/FileSystemItem.tsx
@@ -151,7 +151,7 @@ const FileSystemItem = ({
   const { bucket, downloadFile, currentPath, handleUploadOnDrop, moveItems } = useFileBrowser()
   const { downloadMultipleFiles } = useFiles()
   const { cid, name, isFolder, content_type } = file
-
+  const inSharedFolder = useMemo(() => bucket?.type === "share", [bucket])
   const formik = useFormik({
     initialValues: {
       name
@@ -240,7 +240,10 @@ const FileSystemItem = ({
         <>
           <ShareAltSvg className={classes.menuIcon} />
           <span data-cy="menu-share">
-            <Trans>Share</Trans>
+            {inSharedFolder
+              ? t`Copy to`
+              : t`Share`
+            }
           </span>
         </>
       ),
@@ -320,7 +323,8 @@ const FileSystemItem = ({
     recoverFile,
     onFilePreview,
     viewFolder,
-    reportFile
+    reportFile,
+    inSharedFolder
   ])
 
   const menuItems: IMenuItem[] = itemOperations.map(
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/views/FileSystemItem/FileSystemTableItem.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/views/FileSystemItem/FileSystemTableItem.tsx
index 51b8d6e980..8e4437b263 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/views/FileSystemItem/FileSystemTableItem.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/views/FileSystemItem/FileSystemTableItem.tsx
@@ -234,12 +234,14 @@ const FileSystemTableItem = React.forwardRef(
           </>
         )}
         <TableCell align="right">
-          <Menu
-            testId='fileDropdown'
-            icon={<MoreIcon className={classes.dropdownIcon} />}
-            options={menuItems}
-            style={{ focusVisible: classes.focusVisible }}
-          />
+          {!!menuItems.length && (
+            <Menu
+              testId='fileDropdown'
+              icon={<MoreIcon className={classes.dropdownIcon} />}
+              options={menuItems}
+              style={{ focusVisible: classes.focusVisible }}
+            />
+          )}
         </TableCell>
       </TableRow>
     )
diff --git a/packages/files-ui/src/Components/Modules/FileBrowsers/views/FilesList.tsx b/packages/files-ui/src/Components/Modules/FileBrowsers/views/FilesList.tsx
index e4ad864e98..e46746314f 100644
--- a/packages/files-ui/src/Components/Modules/FileBrowsers/views/FilesList.tsx
+++ b/packages/files-ui/src/Components/Modules/FileBrowsers/views/FilesList.tsx
@@ -36,7 +36,7 @@ import FileSystemItem from "./FileSystemItem/FileSystemItem"
 import FilePreviewModal from "../../FilePreviewModal"
 
 import CreateFolderModal from "../CreateFolderModal"
-import UploadFileModule from "../../UploadFileModule"
+import UploadFileModule from "../UploadFileModal"
 import MoveFileModal from "../MoveFileModal"
 import FileInfoModal from "../FileInfoModal"
 import { CONTENT_TYPES } from "../../../../Utils/Constants"
@@ -48,15 +48,15 @@ import SurveyBanner from "../../../SurveyBanner"
 import { DragPreviewLayer } from "./DragPreviewLayer"
 import { useFileBrowser } from "../../../../Contexts/FileBrowserContext"
 import ReportFileModal from "../ReportFileModal"
-import ShareToSharedFolderModal from "../ShareToSharedFolderModal"
+import ShareModal from "../ShareModal"
 import SharedUsers from "../../../Elements/SharedUsers"
 import Menu from "../../../../UI-components/Menu"
 import SharingExplainerModal from "../../../SharingExplainerModal"
 import { useSharingExplainerModalFlag } from "../hooks/useSharingExplainerModalFlag"
 
-const baseOperations:  FileOperation[] = ["download", "info", "preview"]
+const baseOperations:  FileOperation[] = ["download", "info", "preview", "share"]
 const readerOperations: FileOperation[] = [...baseOperations, "report"]
-const ownerOperations: FileOperation[] = [...baseOperations, "delete", "move", "rename"]
+const ownerOperations: FileOperation[] = [...baseOperations, "delete", "move", "rename", "recover"]
 const csfOperations:  FileOperation[] = [...ownerOperations, "share"]
 const writerOperations: FileOperation[] = [...ownerOperations, "report"]
 
@@ -311,7 +311,7 @@ const FilesList = ({ isShared = false }: Props) => {
   const { themeKey, desktop } = useThemeSwitcher()
   const [isReportFileModalOpen, setIsReportFileModalOpen] = useState(false)
   const [isFileInfoModalOpen, setIsFileInfoModalOpen] = useState(false)
-  const [isCopyToSharedFolderModalOpen, setIsCopyToSharedFolderModalOpen] = useState(false)
+  const [isShareModalOpen, setIsShareModalOpen] = useState(false)
 
   const {
     heading,
@@ -649,7 +649,7 @@ const FilesList = ({ isShared = false }: Props) => {
 
     setFilePath(fileInfoPath)
     setFileIndex(fileIndex)
-    setIsCopyToSharedFolderModalOpen(true)
+    setIsShareModalOpen(true)
   }, [hasSeenSharingExplainerModal])
 
   return (
@@ -870,6 +870,7 @@ const FilesList = ({ isShared = false }: Props) => {
                       <CheckboxInput
                         value={selectedItems.length === items.length}
                         onChange={() => toggleAll()}
+                        testId="select-all"
                       />
                     </TableHeadCell>
                     <TableHeadCell>
@@ -1092,11 +1093,11 @@ const FilesList = ({ isShared = false }: Props) => {
           }}
         />
       }
-      { !showExplainerBeforeShare && isCopyToSharedFolderModalOpen && filePath && fileIndex !== undefined &&
-        <ShareToSharedFolderModal
+      { !showExplainerBeforeShare && isShareModalOpen && filePath && fileIndex !== undefined &&
+        <ShareModal
           file={files[fileIndex]}
           close={() => {
-            setIsCopyToSharedFolderModalOpen(false)
+            setIsShareModalOpen(false)
             setFilePath(undefined)
           }}
           filePath={currentPath}
diff --git a/packages/files-ui/src/Components/Modules/LoginModule/PasswordlessEmail.tsx b/packages/files-ui/src/Components/Modules/LoginModule/PasswordlessEmail.tsx
index 1d0fe08623..a741b3debb 100644
--- a/packages/files-ui/src/Components/Modules/LoginModule/PasswordlessEmail.tsx
+++ b/packages/files-ui/src/Components/Modules/LoginModule/PasswordlessEmail.tsx
@@ -145,6 +145,7 @@ const PasswordlessEmail = ({ resetLogin, email }: IPasswordlessEmail) => {
         }}
         validationSchema={nonceValidation}
         onSubmit={onSubmitNonce}
+        enableReinitialize
       >
         <Form>
           <Typography
diff --git a/packages/files-ui/src/Components/Modules/Settings/ProfileTab/index.tsx b/packages/files-ui/src/Components/Modules/Settings/ProfileTab/index.tsx
index 560fb26332..692c3e5768 100644
--- a/packages/files-ui/src/Components/Modules/Settings/ProfileTab/index.tsx
+++ b/packages/files-ui/src/Components/Modules/Settings/ProfileTab/index.tsx
@@ -217,7 +217,7 @@ const ProfileView = () => {
       addToast({ title: t`Profile updated`, type: "success" })
       setUpdatingProfile(false)
     } catch (error) {
-      addToast({ title: error, type: "error" })
+      error instanceof Error && addToast({ title: error.message, type: "error" })
       setUpdatingProfile(false)
     }
   }
diff --git a/packages/files-ui/src/Components/Pages/BinPage.tsx b/packages/files-ui/src/Components/Pages/BinPage.tsx
index fe8494fa5e..cb5e01957f 100644
--- a/packages/files-ui/src/Components/Pages/BinPage.tsx
+++ b/packages/files-ui/src/Components/Pages/BinPage.tsx
@@ -1,7 +1,10 @@
 import React from "react"
+import { usePageTrack } from "../../Contexts/PosthogContext"
 import BinFileBrowser from "../Modules/FileBrowsers/BinFileBrowser"
 
 const BinPage = () => {
+  usePageTrack()
+
   return <BinFileBrowser />
 }
 
diff --git a/packages/files-ui/src/Components/Pages/DrivePage.tsx b/packages/files-ui/src/Components/Pages/DrivePage.tsx
index f8628bf8c4..18c87bb322 100644
--- a/packages/files-ui/src/Components/Pages/DrivePage.tsx
+++ b/packages/files-ui/src/Components/Pages/DrivePage.tsx
@@ -1,7 +1,10 @@
 import React from "react"
+import { usePageTrack } from "../../Contexts/PosthogContext"
 import CSFFileBrowser from "../Modules/FileBrowsers/CSFFileBrowser"
 
 const DrivePage = () => {
+  usePageTrack()
+
   return <CSFFileBrowser />
 }
 
diff --git a/packages/files-ui/src/Components/Pages/LoginPage.tsx b/packages/files-ui/src/Components/Pages/LoginPage.tsx
index 1e67a99277..8b32ef849e 100644
--- a/packages/files-ui/src/Components/Pages/LoginPage.tsx
+++ b/packages/files-ui/src/Components/Pages/LoginPage.tsx
@@ -16,6 +16,7 @@ import TopLightSVG from "../../Media/landing/layers/light/Top.light.svg"
 import MigrateAccount from "../Modules/LoginModule/MigrateAccount"
 import InitializeAccount from "../Modules/LoginModule/InitializeAccount"
 import { useFilesApi } from "../../Contexts/FilesApiContext"
+import { usePageTrack } from "../../Contexts/PosthogContext"
 
 const useStyles = makeStyles(
   ({ constants, breakpoints, typography, zIndex }: CSFTheme) =>
@@ -158,6 +159,7 @@ const Content = ({ className }: { className: string }) => {
 const LoginPage = () => {
   const classes = useStyles()
   const { themeKey } = useThemeSwitcher()
+  usePageTrack()
 
   return (
     <div className={classes.root}>
diff --git a/packages/files-ui/src/Components/Pages/SearchPage.tsx b/packages/files-ui/src/Components/Pages/SearchPage.tsx
index 0738af143e..4bab829acf 100644
--- a/packages/files-ui/src/Components/Pages/SearchPage.tsx
+++ b/packages/files-ui/src/Components/Pages/SearchPage.tsx
@@ -1,7 +1,10 @@
 import React from "react"
+import { usePageTrack } from "../../Contexts/PosthogContext"
 import SearchFileBrowser from "../Modules/FileBrowsers/SearchFileBrowser"
 
 const SearchPage = () => {
+  usePageTrack()
+
   return <SearchFileBrowser />
 }
 
diff --git a/packages/files-ui/src/Components/Pages/SettingsPage.tsx b/packages/files-ui/src/Components/Pages/SettingsPage.tsx
index c686a37025..703e9399c9 100644
--- a/packages/files-ui/src/Components/Pages/SettingsPage.tsx
+++ b/packages/files-ui/src/Components/Pages/SettingsPage.tsx
@@ -1,7 +1,10 @@
 import React from "react"
+import { usePageTrack } from "../../Contexts/PosthogContext"
 import Settings from "../Modules/Settings"
 
 const SettingsPage = () => {
+  usePageTrack()
+
   return <Settings />
 }
 
diff --git a/packages/files-ui/src/Components/Pages/SharedFilesPage.tsx b/packages/files-ui/src/Components/Pages/SharedFilesPage.tsx
index 7555759c7c..a6232735b1 100644
--- a/packages/files-ui/src/Components/Pages/SharedFilesPage.tsx
+++ b/packages/files-ui/src/Components/Pages/SharedFilesPage.tsx
@@ -1,7 +1,10 @@
 import React from "react"
+import { usePageTrack } from "../../Contexts/PosthogContext"
 import SharedFileBrowser from "../Modules/FileBrowsers/SharedFileBrowser"
 
 const ShareFilesPage = () => {
+  usePageTrack()
+
   return <SharedFileBrowser />
 }
 
diff --git a/packages/files-ui/src/Contexts/FilesContext.tsx b/packages/files-ui/src/Contexts/FilesContext.tsx
index 189f776cd2..732899178a 100644
--- a/packages/files-ui/src/Contexts/FilesContext.tsx
+++ b/packages/files-ui/src/Contexts/FilesContext.tsx
@@ -2,10 +2,11 @@ import {
   FileContentResponse,
   DirectoryContentResponse,
   BucketType,
-  Bucket as FilesBucket,
+  Bucket,
   SearchEntry,
   BucketFileFullInfoResponse,
   BucketSummaryResponse,
+  BucketUser,
   LookupUser
 } from "@chainsafe/files-api-client"
 import React, { useCallback, useEffect } from "react"
@@ -47,12 +48,14 @@ interface GetFileContentParams {
 
 export type BucketPermission = "writer" | "owner" | "reader"
 
-export type BucketKeyPermission = Omit<FilesBucket, "owners" | "writers" | "readers"> & {
+export type RichUserInfo = BucketUser & LookupUser
+
+export interface BucketKeyPermission extends Bucket {
   encryptionKey: string
   permission?: BucketPermission
-  owners: LookupUser[]
-  writers: LookupUser[]
-  readers: LookupUser[]
+  owners: RichUserInfo[]
+  writers: RichUserInfo[]
+  readers: RichUserInfo[]
 }
 
 type FilesContext = {
@@ -127,7 +130,7 @@ const FilesProvider = ({ children }: FilesContextProps) => {
     }
   }, [filesApiClient, setStorageSummary])
 
-  const getPermissionForBucket = useCallback((bucket: FilesBucket) => {
+  const getPermissionForBucket = useCallback((bucket: Bucket) => {
     return bucket.owners.find(owner => owner.uuid === userId)
       ? "owner" as BucketPermission
       : bucket.writers.find(writer => writer.uuid === userId)
@@ -137,7 +140,7 @@ const FilesProvider = ({ children }: FilesContextProps) => {
           : undefined
   }, [userId])
 
-  const getKeyForSharedBucket = useCallback(async (bucket: FilesBucket) => {
+  const getKeyForSharedBucket = useCallback(async (bucket: Bucket) => {
     const bucketUsers = [...bucket.readers, ...bucket.writers, ...bucket.owners]
     const bucketUser = bucketUsers.find(bu => bu.uuid === userId)
 
@@ -151,7 +154,7 @@ const FilesProvider = ({ children }: FilesContextProps) => {
     return decrypted || ""
   }, [decryptMessageWithThresholdKey, userId])
 
-  const getKeyForBucket = useCallback(async (bucket: FilesBucket) => {
+  const getKeyForBucket = useCallback(async (bucket: Bucket) => {
     if (!personalEncryptionKey || !userId) return
 
     let encryptionKey = ""
@@ -170,6 +173,23 @@ const FilesProvider = ({ children }: FilesContextProps) => {
     return encryptionKey
   }, [getKeyForSharedBucket, personalEncryptionKey, userId])
 
+  const enrichUserInfo = useCallback((bucketUser: BucketUser[], lookupUser: LookupUser[]): RichUserInfo[] => {
+
+    const richUsers: RichUserInfo[] = []
+
+    bucketUser.forEach((bu) => {
+      const correspondingLookupUser = lookupUser.find((lu) => lu.uuid === bu.uuid)
+      if (correspondingLookupUser) {
+        richUsers.push({
+          ...bu,
+          ...correspondingLookupUser
+        })
+      }
+    })
+
+    return richUsers
+  }, [])
+
   const refreshBuckets = useCallback(async (showLoading?: boolean) => {
     if (!personalEncryptionKey || !userId) return
 
@@ -183,9 +203,9 @@ const FilesProvider = ({ children }: FilesContextProps) => {
           ...b,
           encryptionKey: await getKeyForBucket(b) || "",
           permission: getPermissionForBucket(b),
-          owners: userData.owners || [],
-          writers: userData.writers || [],
-          readers: userData.readers || []
+          owners: enrichUserInfo(b.owners, userData.owners),
+          writers: enrichUserInfo(b.writers, userData.writers),
+          readers: enrichUserInfo(b.readers, userData.readers)
         }
       })
     )
@@ -193,7 +213,7 @@ const FilesProvider = ({ children }: FilesContextProps) => {
     setIsLoadingBuckets(false)
     getStorageSummary()
     return Promise.resolve()
-  }, [personalEncryptionKey, userId, filesApiClient, getStorageSummary, getKeyForBucket, getPermissionForBucket])
+  }, [personalEncryptionKey, userId, filesApiClient, getStorageSummary, getKeyForBucket, getPermissionForBucket, enrichUserInfo])
 
   useEffect(() => {
     refreshBuckets(true)
@@ -328,7 +348,6 @@ const FilesProvider = ({ children }: FilesContextProps) => {
           }
         })
     )
-
     await filesApiClient.uploadBucketObjects(
       bucket.id,
       filesParam,
@@ -697,29 +716,28 @@ const FilesProvider = ({ children }: FilesContextProps) => {
       .catch(console.error)
   }, [publicKey, encryptForPublicKey, filesApiClient, refreshBuckets, getKeyForBucket, getPermissionForBucket])
 
+  const getUsersWithEncryptionKey = useCallback(async (from: UpdateSharedFolderUser[], bucketEncryptionKey: string) => {
+    return await Promise.all(from?.map(async ({ pubKey, encryption_key, uuid }) => {
+      return !encryption_key && !!pubKey
+        ? {
+          uuid,
+          encryption_key: await encryptForPublicKey(pubKey, bucketEncryptionKey) || ""
+        }
+        : {
+          uuid,
+          encryption_key: encryption_key || ""
+        }
+    }))
+  }, [encryptForPublicKey])
+
   const editSharedFolder = useCallback(
     async (bucket: BucketKeyPermission, writerUsers?: UpdateSharedFolderUser[], readerUsers?: UpdateSharedFolderUser[]) => {
       if (!publicKey) return
 
-      const readers = readerUsers ? await Promise.all(readerUsers?.map(async u => {
-        return u.pubKey ? {
-          uuid: u.uuid,
-          encryption_key: await encryptForPublicKey(u.pubKey, bucket.encryptionKey)
-        } : {
-          uuid: u.uuid,
-          encryption_key: u.encryption_key
-        }
-      })) : []
-
-      const writers = writerUsers ? await Promise.all(writerUsers?.map(async u => {
-        return u.pubKey ? {
-          uuid: u.uuid,
-          encryption_key: await encryptForPublicKey(u.pubKey, bucket.encryptionKey)
-        } : {
-          uuid: u.uuid,
-          encryption_key: u.encryption_key
-        }
-      })) : []
+      if (!readerUsers || !writerUsers) return
+
+      const readers = await getUsersWithEncryptionKey(readerUsers, bucket.encryptionKey)
+      const writers = await getUsersWithEncryptionKey(writerUsers, bucket.encryptionKey)
 
       return filesApiClient.updateBucket(bucket.id, {
         name: bucket.name,
@@ -727,7 +745,7 @@ const FilesProvider = ({ children }: FilesContextProps) => {
         writers
       }).then(() => refreshBuckets(false))
         .catch(console.error)
-    }, [filesApiClient, encryptForPublicKey, publicKey, refreshBuckets])
+    }, [publicKey, getUsersWithEncryptionKey, filesApiClient, refreshBuckets])
 
   const transferFileBetweenBuckets = useCallback(async (
     sourceBucketId: string,
diff --git a/packages/files-ui/src/Contexts/PosthogContext.tsx b/packages/files-ui/src/Contexts/PosthogContext.tsx
new file mode 100644
index 0000000000..5e5e359bf6
--- /dev/null
+++ b/packages/files-ui/src/Contexts/PosthogContext.tsx
@@ -0,0 +1,176 @@
+import React, { useCallback, useEffect, useMemo, useState } from "react"
+import posthog from "posthog-js"
+import { Button, Typography, useLocation } from "@chainsafe/common-components"
+import { createStyles, makeStyles } from "@chainsafe/common-theme"
+import { Trans } from "@lingui/macro"
+import { useLocalStorage } from "@chainsafe/browser-storage-hooks"
+import { CSFTheme } from "../Themes/types"
+
+export type PosthogContext = {
+  hasOptedIn: boolean
+  posthogInitialized: boolean
+}
+
+type PosthogProviderProps = posthog.Config & {
+  children: React.ReactNode | React.ReactNode[]
+}
+
+const PosthogContext = React.createContext<PosthogContext>({
+  hasOptedIn: false,
+  posthogInitialized: false
+})
+
+const useStyles = makeStyles(
+  ({ palette, breakpoints, constants }: CSFTheme) => {
+    return createStyles({
+      cookieBanner: {
+        position: "fixed",
+        bottom: 0,
+        width: "100%",
+        display: "flex",
+        color: palette.common.white.main,
+        flexDirection: "column",
+        backgroundColor: constants.cookieBanner.backgroundColor,
+        padding: "16px 32px",
+        [breakpoints.down("sm")]: {
+          padding: "8px 16px"
+        }
+      },
+      bannerHeading: {
+        fontSize: 24,
+        lineHeight: "28px",
+        [breakpoints.down("sm")]: {
+          fontSize: 18,
+          lineHeight: "22px"
+        }
+      },
+      bannerText: {
+        fontSize: 14,
+        lineHeight: "18px",
+        [breakpoints.down("sm")]: {
+          fontSize: 12,
+          lineHeight: "16px"
+        }
+      },
+      link: {
+        color: palette.common.white.main
+      },
+      buttonSection: {
+        display: "flex",
+        flexDirection: "row",
+        "& > *": {
+          margin: 8
+        }
+      }
+    })
+  }
+)
+
+const TOUCHED_COOKIE_BANNER_KEY = "csf.touchedCookieBanner"
+
+const PosthogProvider = ({ children }: PosthogProviderProps) => {
+  const [hasOptedIn, setHasOptedIn] = useState(false)
+  const [showBanner, setShowBanner] = useState(false)
+  const [hasTouchedCookieBanner, setHasTouchedCookieBanner ] = useState(false)
+  const { localStorageGet, localStorageSet } = useLocalStorage()
+
+  const classes = useStyles()
+  const posthogInitialized = useMemo(() =>
+    !!process.env.REACT_APP_POSTHOG_PROJECT_API_KEY &&
+    !!process.env.REACT_APP_POSTHOG_INSTANCE_ADDRESS,
+  [])
+
+  useEffect(() => {
+    if(localStorageGet(TOUCHED_COOKIE_BANNER_KEY) === null){
+      localStorageSet(TOUCHED_COOKIE_BANNER_KEY, "false")
+    }
+  }, [localStorageGet, localStorageSet])
+
+  useEffect(() => {
+    if(posthogInitialized && !hasTouchedCookieBanner && localStorageGet(TOUCHED_COOKIE_BANNER_KEY) === "false"){
+      setShowBanner(true)
+    } else {
+      setShowBanner(false)
+    }
+  }, [posthogInitialized, hasTouchedCookieBanner, localStorageGet])
+
+  const touchCookieBanner = useCallback(() => {
+    localStorageSet(TOUCHED_COOKIE_BANNER_KEY, "true")
+    setHasTouchedCookieBanner(true)
+  }, [localStorageSet])
+
+  const optInCapturing = useCallback(() => {
+    if (posthogInitialized) {
+      posthog.opt_in_capturing()
+      touchCookieBanner()
+      setHasOptedIn(true)
+    }
+  }, [posthogInitialized, touchCookieBanner])
+
+  const optOutCapturing = useCallback(() => {
+    if (posthogInitialized) {
+      posthog.opt_out_capturing()
+      touchCookieBanner()
+    }
+  }, [posthogInitialized, touchCookieBanner])
+
+  return (
+    <PosthogContext.Provider
+      value={{
+        hasOptedIn,
+        posthogInitialized
+      }}
+    >
+      {children}
+      {showBanner &&
+        <div className={classes.cookieBanner}>
+          <Typography className={classes.bannerHeading}><Trans>This website uses cookies</Trans></Typography>
+          <Typography className={classes.bannerText}>
+            <Trans>
+              This website uses cookies that help the website function and track interactions for analytics purposes.
+              You have the right to decline our use of cookies. For us to provide a customizable user experience to you,
+              please click on the Accept button below.
+              <a className={classes.link}
+                href="https://files.chainsafe.io/privacy-policy"
+                target='_blank'
+                rel='noopener noreferrer'>Learn more
+              </a>
+            </Trans>
+          </Typography>
+          <div className={classes.buttonSection}>
+            <Button
+              onClick={optOutCapturing}
+              variant='secondary'
+            >
+              <Trans>Decline</Trans></Button>
+            <Button
+              onClick={optInCapturing}
+              variant='outline'
+            >
+              <Trans>Accept</Trans>
+            </Button>
+          </div>
+        </div>
+      }
+    </PosthogContext.Provider>
+  )
+}
+
+function usePosthogContext() {
+  const context = React.useContext(PosthogContext)
+  if (context === undefined) {
+    throw new Error("usePosthogContext must be used within a LanguageProvider")
+  }
+  return context
+}
+
+function usePageTrack() {
+  const { pathname } = useLocation()
+  const { hasOptedIn, posthogInitialized } = usePosthogContext()
+
+  useEffect(() => {
+    posthogInitialized && hasOptedIn && posthog.capture("$pageview")
+  }, [pathname, hasOptedIn, posthogInitialized])
+}
+
+export { PosthogProvider, usePosthogContext, usePageTrack }
\ No newline at end of file
diff --git a/packages/files-ui/src/Contexts/ThresholdKeyContext.tsx b/packages/files-ui/src/Contexts/ThresholdKeyContext.tsx
index db3890ed94..086bb98118 100644
--- a/packages/files-ui/src/Contexts/ThresholdKeyContext.tsx
+++ b/packages/files-ui/src/Contexts/ThresholdKeyContext.tsx
@@ -217,7 +217,7 @@ const ThresholdKeyProvider = ({ children, network = "mainnet", enableLogging = f
         await serviceProvider.init({ skipSw: false }).then(() => {
           console.log("initialized")
           setStatus("initialized")
-        }).catch(() => "error initializing")
+        }).catch((e) => console.error("error initializing", e))
       }
       setTKeySdk(tkey)
     }
diff --git a/packages/files-ui/src/Contexts/UserContext.tsx b/packages/files-ui/src/Contexts/UserContext.tsx
index 9a244c9e01..92abc2cd56 100644
--- a/packages/files-ui/src/Contexts/UserContext.tsx
+++ b/packages/files-ui/src/Contexts/UserContext.tsx
@@ -85,9 +85,9 @@ const UserProvider = ({ children }: UserContextProps) => {
         publicAddress: profileData.public_address
       })
       return Promise.resolve()
-    } catch (error) {
+    } catch (error: any) {
       return Promise.reject(
-        error && error.length
+        Array.isArray(error) && error[0]
           ? error[0].message
           : "There was an error updating profile."
       )
@@ -112,9 +112,9 @@ const UserProvider = ({ children }: UserContextProps) => {
         username
       })
       return Promise.resolve()
-    } catch (error) {
+    } catch (error: any) {
       return Promise.reject(
-        error && error.length
+        Array.isArray(error) && error[0]
           ? error[0].message
           : t`There was an error when setting username.`
       )
diff --git a/packages/files-ui/src/Themes/Constants.ts b/packages/files-ui/src/Themes/Constants.ts
index 4ac1dd7752..11ddd93e5e 100644
--- a/packages/files-ui/src/Themes/Constants.ts
+++ b/packages/files-ui/src/Themes/Constants.ts
@@ -167,4 +167,7 @@ export interface CsfColors extends IConstants {
     color: string
     backgroundOptionHover: string
   }
+  cookieBanner: {
+    backgroundColor: string
+  }
 }
\ No newline at end of file
diff --git a/packages/files-ui/src/Themes/DarkTheme.ts b/packages/files-ui/src/Themes/DarkTheme.ts
index 00a80eba21..c78c07646b 100644
--- a/packages/files-ui/src/Themes/DarkTheme.ts
+++ b/packages/files-ui/src/Themes/DarkTheme.ts
@@ -480,6 +480,9 @@ export const darkTheme = createTheme<CsfColors>({
         },
         surveyBanner: {
           color: "var(--gray9)"
+        },
+        cookieBanner: {
+          backgroundColor: "var(--gray9)"
         }
       } as CsfColors)
     },
@@ -555,17 +558,16 @@ export const darkTheme = createTheme<CsfColors>({
             borderColor: "var(--blue3) !important"
           }
         },
-        menu: {
-          backgroundColor: "var(--gray1)",
-          borderColor: "var(--gray4)"
+        menuList: {
+          backgroundColor: "var(--gray4)",
+          color: "var(--gray10)"
         },
         input: {
           color: "var(--gray9)"
         },
         option: {
-          backgroundColor: "var(--gray1)",
-          color: "var(--gray9)",
-          borderColor: "var(--gray4)",
+          backgroundColor: "var(--gray4)",
+          color: "var(--gray10)",
           cursor: "pointer"
         },
         multiValue: {
@@ -589,8 +591,9 @@ export const darkTheme = createTheme<CsfColors>({
           color: "var(--gray9)"
         },
         option: {
-          backgroundColor: "var(--gray1)",
-          color: "var(--gray9)"
+          backgroundColor: "var(--gray4)",
+          color: "var(--gray10)",
+          cursor: "pointer"
         },
         dropdownIndicator: {
           backgroundColor: "var(--gray1)",
@@ -600,9 +603,9 @@ export const darkTheme = createTheme<CsfColors>({
           backgroundColor: "var(--gray1)",
           color: "var(--gray9)"
         },
-        menu: {
-          backgroundColor: "var(--gray1)",
-          color: "var(--gray9)"
+        menuList: {
+          backgroundColor: "var(--gray4)",
+          color: "var(--gray10)"
         },
         indicatorsContainer: {
           backgroundColor: "transparent",
@@ -616,6 +619,9 @@ export const darkTheme = createTheme<CsfColors>({
         },
         singleValue: {
           color: "var(--gray9)"
+        },
+        input: {
+          color: "var(--gray9)"
         }
       },
       Button: {
diff --git a/packages/files-ui/src/Themes/LightTheme.ts b/packages/files-ui/src/Themes/LightTheme.ts
index bd40c2a9b0..90f72c5dfa 100644
--- a/packages/files-ui/src/Themes/LightTheme.ts
+++ b/packages/files-ui/src/Themes/LightTheme.ts
@@ -167,6 +167,9 @@ export const lightTheme = createTheme<CsfColors>({
         },
         surveyBanner: {
           color: "var(--gray1)"
+        },
+        cookieBanner: {
+          backgroundColor: "var(--csf-primary)"
         }
       } as CsfColors)
     },
diff --git a/packages/files-ui/src/Utils/getFilesFromDataTransferItems.ts b/packages/files-ui/src/Utils/getFilesFromDataTransferItems.ts
new file mode 100644
index 0000000000..6b21bb1d21
--- /dev/null
+++ b/packages/files-ui/src/Utils/getFilesFromDataTransferItems.ts
@@ -0,0 +1,78 @@
+//Shamelessly borrowed from https://github.com/anatol-grabowski/datatransfer-files-promise with added Types
+
+type FileWithPath = File & {filepath: string}
+
+const getFilesFromDataTransferItems = async (dataTransferItems: DataTransferItemList): Promise<Array<FileWithPath>> => {
+  const readFile = (entry: FileEntry, path = ""): Promise<FileWithPath> => {
+    return new Promise((resolve, reject) => {
+      entry.file((file: File) => {
+        Object.defineProperty(file, "filepath", {
+          value: path
+        })
+        resolve(file as FileWithPath)
+      }, (err: Error) => {
+        reject(err)
+      })
+    })
+  }
+
+  const dirReadEntries = (dirReader: DirectoryReader, path: string): Promise<FileWithPath[]> => {
+    return new Promise((resolve, reject) => {
+      dirReader.readEntries(async (entries: FileSystemEntry[]) => {
+        let files = [] as Array<FileWithPath>
+        for (const entry of entries) {
+          const itemFiles = await getFilesFromEntry(entry, path) as Array<FileWithPath>
+          files = files.concat(itemFiles)
+        }
+        resolve(files)
+      }, (err: Error) => {
+        reject(err)
+      })
+    })
+  }
+
+  const readDir = async (entry: DirectoryEntry, path: string) => {
+    const dirReader = entry.createReader()
+    const newPath = path + entry.name + "/"
+    let files = [] as Array<FileWithPath>
+    let newFiles
+    do {
+      newFiles = await dirReadEntries(dirReader, newPath)
+      files = files.concat(newFiles)
+    } while (newFiles.length > 0)
+    return files
+  }
+
+  const getFilesFromEntry = async (entry: FileSystemEntry, path = "") => {
+    if (entry.isFile) {
+      const file = await readFile(entry as FileEntry, path)
+      return [file]
+    }
+    if (entry.isDirectory) {
+      const files = await readDir(entry as DirectoryEntry, path)
+      return files
+    }
+  }
+
+  let files = [] as Array<FileWithPath>
+  const entries = []
+
+  // Pull out all entries before reading them
+  for (let i = 0, ii = dataTransferItems.length; i < ii; i++) {
+    entries.push(dataTransferItems[i].webkitGetAsEntry())
+  }
+
+  // Recursively read through all entries
+  for (const entry of entries) {
+    if (entry) {
+      const newFiles = await getFilesFromEntry(entry)
+      if (newFiles) {
+        files = files.concat(newFiles)
+      }
+    }
+  }
+
+  return files
+}
+
+export default getFilesFromDataTransferItems
\ No newline at end of file
diff --git a/packages/files-ui/src/index.tsx b/packages/files-ui/src/index.tsx
index 32e15e9972..85784d8584 100644
--- a/packages/files-ui/src/index.tsx
+++ b/packages/files-ui/src/index.tsx
@@ -3,6 +3,16 @@ import ReactDOM from "react-dom"
 import "./index.css"
 import App from "./App"
 import * as serviceWorker from "./serviceWorker"
+import posthog from "posthog-js"
+
+if (process.env.REACT_APP_POSTHOG_PROJECT_API_KEY &&
+    process.env.REACT_APP_POSTHOG_INSTANCE_ADDRESS)
+{
+  posthog.init(process.env.REACT_APP_POSTHOG_PROJECT_API_KEY, {
+    api_host: process.env.REACT_APP_POSTHOG_INSTANCE_ADDRESS,
+    opt_out_capturing_by_default: true
+  })
+}
 
 ReactDOM.render(<App />, document.getElementById("root"))
 
diff --git a/packages/files-ui/src/locales/de/messages.po b/packages/files-ui/src/locales/de/messages.po
index 06003074a9..2553156418 100644
--- a/packages/files-ui/src/locales/de/messages.po
+++ b/packages/files-ui/src/locales/de/messages.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-04-20 00:28+0200\n"
-"PO-Revision-Date: 2021-09-14 09:14+0000\n"
+"PO-Revision-Date: 2021-09-22 21:38+0000\n"
 "Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/de/>\n"
 "Language: de\n"
@@ -19,6 +19,9 @@ msgstr "Es wird ein Sicherungsgeheimsatz generiert und für Ihr Konto verwendet.
 msgid "A file with the same name already exists"
 msgstr "Es existiert bereits eine Datei mit demselben Namen"
 
+msgid "Accept"
+msgstr "Akzeptieren"
+
 msgid "Account"
 msgstr "Konto"
 
@@ -55,9 +58,6 @@ msgstr "Es ist ein Fehler aufgetreten:"
 msgid "Approve"
 msgstr "Genehmigen"
 
-msgid "Back to plan settings"
-msgstr ""
-
 msgid "Backup secret phrase"
 msgstr "Sicherungsgeheimsatz"
 
@@ -151,12 +151,18 @@ msgstr "Kopiert!"
 msgid "Copy CID"
 msgstr "IID kopieren"
 
+msgid "Copy file"
+msgstr ""
+
 msgid "Copy info"
 msgstr ""
 
 msgid "Copy over"
 msgstr ""
 
+msgid "Copy to"
+msgstr ""
+
 msgid "Create"
 msgstr "Erstellen"
 
@@ -178,15 +184,15 @@ msgstr "Ordner erstellen"
 msgid "Create your public username in <0>Settings</0>!"
 msgstr ""
 
-msgid "Credit card on file"
-msgstr ""
-
 msgid "Dark Theme"
 msgstr "Dunkles Farbschema"
 
 msgid "Date uploaded"
 msgstr "Hochgeladen am"
 
+msgid "Decline"
+msgstr ""
+
 msgid "Decryption key"
 msgstr ""
 
@@ -382,12 +388,18 @@ msgstr "Los geht’s."
 msgid "Light Theme"
 msgstr "Helles Farbschema"
 
+msgid "Loading"
+msgstr ""
+
 msgid "Loading preview"
 msgstr "Vorschau wird geladen"
 
 msgid "Loading your shared folders…"
 msgstr ""
 
+msgid "Loading..."
+msgstr ""
+
 msgid "Looks like you’re signing in from a new browser. Please choose one of the following to continue:"
 msgstr "Sieht aus, als würden Sie sich über einen neuen Browser anmelden. Bitte wählen Sie eine der folgenden Möglichkeiten, um fortzufahren:"
 
@@ -448,6 +460,9 @@ msgstr "Keine Suchergebnisse für"
 msgid "No thanks"
 msgstr "Nein danke"
 
+msgid "No user found for this query."
+msgstr ""
+
 msgid "Number of copies (Replication Factor)"
 msgstr "Anzahl der Kopien (Replikationsfaktor)"
 
@@ -604,7 +619,7 @@ msgstr "Sicherheit"
 msgid "Select a wallet"
 msgstr ""
 
-msgid "Select an existing shared folder"
+msgid "Select an existing shared folder or your home"
 msgstr ""
 
 msgid "Send another email"
@@ -745,6 +760,12 @@ msgstr ""
 msgid "This username is public"
 msgstr "Dieser Benutzername ist öffentlich"
 
+msgid "This website uses cookies"
+msgstr ""
+
+msgid "This website uses cookies that help the website function and track interactions for analytics purposes. You have the right to decline our use of cookies. For us to provide a customizable user experience to you, please click on the Accept button below.<0>Learn more</0>"
+msgstr ""
+
 msgid "Transfer complete"
 msgstr ""
 
@@ -891,6 +912,3 @@ msgstr "{0, plural, one {{1} Datei wird verschlüsselt und hochgeladen} other {{
 
 msgid "{0, plural, one {You are about to delete {1} item.} other {You are about to delete {2} items.}}"
 msgstr "{0, plural, one {Sie sind dabei, {1} Artikel zu löschen.} other {Sie sind dabei, {2} Artikel zu löschen.}}"
-
-msgid "{0} of {1} used ({2}%)"
-msgstr ""
diff --git a/packages/files-ui/src/locales/en/messages.po b/packages/files-ui/src/locales/en/messages.po
index bddc573609..982b845b94 100644
--- a/packages/files-ui/src/locales/en/messages.po
+++ b/packages/files-ui/src/locales/en/messages.po
@@ -19,6 +19,9 @@ msgstr "A backup secret phrase will be generated and used for your account.<0/>W
 msgid "A file with the same name already exists"
 msgstr "A file with the same name already exists"
 
+msgid "Accept"
+msgstr "Accept"
+
 msgid "Account"
 msgstr "Account"
 
@@ -55,9 +58,6 @@ msgstr "An error occurred:"
 msgid "Approve"
 msgstr "Approve"
 
-msgid "Back to plan settings"
-msgstr "Back to plan settings"
-
 msgid "Backup secret phrase"
 msgstr "Backup secret phrase"
 
@@ -151,12 +151,18 @@ msgstr "Copied!"
 msgid "Copy CID"
 msgstr "Copy CID"
 
+msgid "Copy file"
+msgstr "Copy file"
+
 msgid "Copy info"
 msgstr "Copy info"
 
 msgid "Copy over"
 msgstr "Copy over"
 
+msgid "Copy to"
+msgstr "Copy to"
+
 msgid "Create"
 msgstr "Create"
 
@@ -178,15 +184,15 @@ msgstr "Create folder"
 msgid "Create your public username in <0>Settings</0>!"
 msgstr "Create your public username in <0>Settings</0>!"
 
-msgid "Credit card on file"
-msgstr "Credit card on file"
-
 msgid "Dark Theme"
 msgstr "Dark Theme"
 
 msgid "Date uploaded"
 msgstr "Date uploaded"
 
+msgid "Decline"
+msgstr "Decline"
+
 msgid "Decryption key"
 msgstr "Decryption key"
 
@@ -385,12 +391,18 @@ msgstr "Let's get you set up."
 msgid "Light Theme"
 msgstr "Light Theme"
 
+msgid "Loading"
+msgstr "Loading"
+
 msgid "Loading preview"
 msgstr "Loading preview"
 
 msgid "Loading your shared folders…"
 msgstr "Loading your shared folders…"
 
+msgid "Loading..."
+msgstr "Loading..."
+
 msgid "Looks like you’re signing in from a new browser. Please choose one of the following to continue:"
 msgstr "Looks like you’re signing in from a new browser. Please choose one of the following to continue:"
 
@@ -451,6 +463,9 @@ msgstr "No search results for"
 msgid "No thanks"
 msgstr "No thanks"
 
+msgid "No user found for this query."
+msgstr "No user found for this query."
+
 msgid "Number of copies (Replication Factor)"
 msgstr "Number of copies (Replication Factor)"
 
@@ -607,8 +622,8 @@ msgstr "Security"
 msgid "Select a wallet"
 msgstr "Select a wallet"
 
-msgid "Select an existing shared folder"
-msgstr "Select an existing shared folder"
+msgid "Select an existing shared folder or your home"
+msgstr "Select an existing shared folder or your home"
 
 msgid "Send another email"
 msgstr "Send another email"
@@ -748,6 +763,12 @@ msgstr "This username is already taken"
 msgid "This username is public"
 msgstr "This username is public"
 
+msgid "This website uses cookies"
+msgstr "This website uses cookies"
+
+msgid "This website uses cookies that help the website function and track interactions for analytics purposes. You have the right to decline our use of cookies. For us to provide a customizable user experience to you, please click on the Accept button below.<0>Learn more</0>"
+msgstr "This website uses cookies that help the website function and track interactions for analytics purposes. You have the right to decline our use of cookies. For us to provide a customizable user experience to you, please click on the Accept button below.<0>Learn more</0>"
+
 msgid "Transfer complete"
 msgstr "Transfer complete"
 
@@ -894,6 +915,3 @@ msgstr "{0, plural, one {Encrypting and uploading {1} file} other {Encrypting an
 
 msgid "{0, plural, one {You are about to delete {1} item.} other {You are about to delete {2} items.}}"
 msgstr "{0, plural, one {You are about to delete {1} item.} other {You are about to delete {2} items.}}"
-
-msgid "{0} of {1} used ({2}%)"
-msgstr "{0} of {1} used ({2}%)"
diff --git a/packages/files-ui/src/locales/es/messages.po b/packages/files-ui/src/locales/es/messages.po
index ceb5d2aa21..e0741762b6 100644
--- a/packages/files-ui/src/locales/es/messages.po
+++ b/packages/files-ui/src/locales/es/messages.po
@@ -20,6 +20,9 @@ msgstr ""
 msgid "A file with the same name already exists"
 msgstr "Ya existe un archivo con el mismo nombre"
 
+msgid "Accept"
+msgstr ""
+
 msgid "Account"
 msgstr "Cuenta"
 
@@ -56,9 +59,6 @@ msgstr ""
 msgid "Approve"
 msgstr "Aprobar"
 
-msgid "Back to plan settings"
-msgstr ""
-
 msgid "Backup secret phrase"
 msgstr ""
 
@@ -152,12 +152,18 @@ msgstr "Copiado!"
 msgid "Copy CID"
 msgstr "Copiar CID"
 
+msgid "Copy file"
+msgstr ""
+
 msgid "Copy info"
 msgstr ""
 
 msgid "Copy over"
 msgstr ""
 
+msgid "Copy to"
+msgstr ""
+
 msgid "Create"
 msgstr "Crear"
 
@@ -179,15 +185,15 @@ msgstr "Crear Carpeta"
 msgid "Create your public username in <0>Settings</0>!"
 msgstr ""
 
-msgid "Credit card on file"
-msgstr ""
-
 msgid "Dark Theme"
 msgstr "Tema oscuro"
 
 msgid "Date uploaded"
 msgstr "Fecha de subida"
 
+msgid "Decline"
+msgstr ""
+
 msgid "Decryption key"
 msgstr ""
 
@@ -386,12 +392,18 @@ msgstr "Vamos a configurarlo."
 msgid "Light Theme"
 msgstr "Tema Claro"
 
+msgid "Loading"
+msgstr ""
+
 msgid "Loading preview"
 msgstr "Cargando vista previa"
 
 msgid "Loading your shared folders…"
 msgstr ""
 
+msgid "Loading..."
+msgstr ""
+
 msgid "Looks like you’re signing in from a new browser. Please choose one of the following to continue:"
 msgstr "Parece que está iniciando sesión desde un nuevo navegador. Elija una de las siguientes opciones para continuar:"
 
@@ -452,6 +464,9 @@ msgstr "No hay resultados de búsqueda para"
 msgid "No thanks"
 msgstr "No gracias"
 
+msgid "No user found for this query."
+msgstr ""
+
 msgid "Number of copies (Replication Factor)"
 msgstr "Número de copias (factor de replicación)"
 
@@ -608,7 +623,7 @@ msgstr "Seguridad"
 msgid "Select a wallet"
 msgstr "Seleccione una billetera"
 
-msgid "Select an existing shared folder"
+msgid "Select an existing shared folder or your home"
 msgstr ""
 
 msgid "Send another email"
@@ -749,6 +764,12 @@ msgstr ""
 msgid "This username is public"
 msgstr ""
 
+msgid "This website uses cookies"
+msgstr ""
+
+msgid "This website uses cookies that help the website function and track interactions for analytics purposes. You have the right to decline our use of cookies. For us to provide a customizable user experience to you, please click on the Accept button below.<0>Learn more</0>"
+msgstr ""
+
 msgid "Transfer complete"
 msgstr ""
 
@@ -895,6 +916,3 @@ msgstr ""
 
 msgid "{0, plural, one {You are about to delete {1} item.} other {You are about to delete {2} items.}}"
 msgstr ""
-
-msgid "{0} of {1} used ({2}%)"
-msgstr ""
diff --git a/packages/files-ui/src/locales/fr/messages.po b/packages/files-ui/src/locales/fr/messages.po
index 0869b4fc12..f65049a258 100644
--- a/packages/files-ui/src/locales/fr/messages.po
+++ b/packages/files-ui/src/locales/fr/messages.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-04-23 11:05+0200\n"
-"PO-Revision-Date: 2021-09-14 09:14+0000\n"
+"PO-Revision-Date: 2021-09-22 21:38+0000\n"
 "Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/fr/>\n"
 "Language: fr\n"
@@ -20,6 +20,9 @@ msgstr "Une phrase secrète de sauvegarde sera générée et utilisé pour ce co
 msgid "A file with the same name already exists"
 msgstr "Un fichier avec ce nom existe déjà"
 
+msgid "Accept"
+msgstr "Accepter"
+
 msgid "Account"
 msgstr "Compte"
 
@@ -56,9 +59,6 @@ msgstr "Une erreur s'est produite :"
 msgid "Approve"
 msgstr "Accepter"
 
-msgid "Back to plan settings"
-msgstr ""
-
 msgid "Backup secret phrase"
 msgstr "Phrase secrète de sauvegarde"
 
@@ -152,12 +152,18 @@ msgstr "Copié !"
 msgid "Copy CID"
 msgstr "Copier le CID"
 
+msgid "Copy file"
+msgstr "Copier le fichier"
+
 msgid "Copy info"
 msgstr "Copier les infos"
 
 msgid "Copy over"
 msgstr "Copier"
 
+msgid "Copy to"
+msgstr "Copier vers"
+
 msgid "Create"
 msgstr "Créer"
 
@@ -179,15 +185,15 @@ msgstr "Créer un dossier"
 msgid "Create your public username in <0>Settings</0>!"
 msgstr "Créez votre nom d'utilisateur public dans <0>Paramètres</0> !"
 
-msgid "Credit card on file"
-msgstr ""
-
 msgid "Dark Theme"
 msgstr "Thème sombre"
 
 msgid "Date uploaded"
 msgstr "Téléversé le"
 
+msgid "Decline"
+msgstr "Refuser"
+
 msgid "Decryption key"
 msgstr "Clé de déchiffrement"
 
@@ -386,12 +392,18 @@ msgstr "C’est parti."
 msgid "Light Theme"
 msgstr "Thème clair"
 
+msgid "Loading"
+msgstr "Chargement"
+
 msgid "Loading preview"
 msgstr "Chargement de l’aperçu"
 
 msgid "Loading your shared folders…"
 msgstr "Chargement de vos dossiers partagés…"
 
+msgid "Loading..."
+msgstr "Chargement…"
+
 msgid "Looks like you’re signing in from a new browser. Please choose one of the following to continue:"
 msgstr "Il semble que vous vous connectiez à partir d’un nouveau navigateur. Veuillez choisir une des options suivantes pour continuer :"
 
@@ -434,8 +446,8 @@ msgstr "Suivant"
 msgid "Nice to see you again!"
 msgstr "Ravi de te revoir !"
 
-msgid "No Card"
-msgstr ""
+msgid "No file to download."
+msgstr "Aucun fichier à télécharger."
 
 msgid "No file to download."
 msgstr "Aucun fichier à télécharger."
@@ -452,6 +464,9 @@ msgstr "Aucun fichier à afficher"
 msgid "No thanks"
 msgstr "Non merci"
 
+msgid "No user found for this query."
+msgstr "Aucun utilisateur n'a été trouvé pour cette requête."
+
 msgid "Number of copies (Replication Factor)"
 msgstr "Nombre de copies (facteur de réplication)"
 
@@ -594,7 +609,7 @@ msgid "Saved on:"
 msgstr "Enregistré sur :"
 
 msgid "Schedule a 15 min call"
-msgstr ""
+msgstr "Planifier un appel de 15 min"
 
 msgid "Search results"
 msgstr "Résultats de recherche"
@@ -608,8 +623,8 @@ msgstr "Sécurité"
 msgid "Select a wallet"
 msgstr "Sélectionner un wallet"
 
-msgid "Select an existing shared folder"
-msgstr "Sélectionnez un dossier partagé existant"
+msgid "Select an existing shared folder or your home"
+msgstr "Sélectionnez un dossier partagé existant ou votre page d'accueil"
 
 msgid "Send another email"
 msgstr "Envoyer un nouveau courriel"
@@ -749,6 +764,12 @@ msgstr "Ce nom d’utilisateur est déjà pris"
 msgid "This username is public"
 msgstr "Ce nom d’utilisateur est public"
 
+msgid "This website uses cookies"
+msgstr "Ce site web utilise des cookies"
+
+msgid "This website uses cookies that help the website function and track interactions for analytics purposes. You have the right to decline our use of cookies. For us to provide a customizable user experience to you, please click on the Accept button below.<0>Learn more</0>"
+msgstr "Ce site web utilise des cookies qui l'aident à fonctionner et à suivre les interactions à des fins d'analyse. Vous avez le droit de refuser notre utilisation des cookies. Pour que nous puissions vous offrir une expérience utilisateur personnalisable, veuillez cliquer sur le bouton Accepter ci-dessous.<0>En savoir plus</0>"
+
 msgid "Transfer complete"
 msgstr "Transfert terminé"
 
@@ -819,7 +840,7 @@ msgid "Wallet address"
 msgstr "Addresse du wallet"
 
 msgid "Want to help shape this product?"
-msgstr ""
+msgstr "Vous voulez participer à l'élaboration de ce produit ?"
 
 msgid "We can't encrypt files larger than 2GB. Some items will not be uploaded"
 msgstr "Nous ne pouvons pas chiffrer les fichiers de plus de 2 Go. Certains éléments ne pourront pas être téléversés"
@@ -895,6 +916,3 @@ msgstr "{0, plural, one {Chiffrement et téléversement de {1} fichier} other {C
 
 msgid "{0, plural, one {You are about to delete {1} item.} other {You are about to delete {2} items.}}"
 msgstr "{0, plural, one {Vous êtes sur le point de supprimer {1} élément.} other {Vous êtes sur le point de supprimer {2} éléments.}}"
-
-msgid "{0} of {1} used ({2}%)"
-msgstr ""
diff --git a/packages/files-ui/src/locales/no/messages.po b/packages/files-ui/src/locales/no/messages.po
index 36e8da8da0..5274a443d6 100644
--- a/packages/files-ui/src/locales/no/messages.po
+++ b/packages/files-ui/src/locales/no/messages.po
@@ -19,6 +19,9 @@ msgstr ""
 msgid "A file with the same name already exists"
 msgstr ""
 
+msgid "Accept"
+msgstr ""
+
 msgid "Account"
 msgstr "Konto"
 
@@ -55,9 +58,6 @@ msgstr ""
 msgid "Approve"
 msgstr "Godkjenn"
 
-msgid "Back to plan settings"
-msgstr ""
-
 msgid "Backup secret phrase"
 msgstr ""
 
@@ -151,12 +151,18 @@ msgstr "Kopiert!"
 msgid "Copy CID"
 msgstr "Kopier CID"
 
+msgid "Copy file"
+msgstr ""
+
 msgid "Copy info"
 msgstr ""
 
 msgid "Copy over"
 msgstr ""
 
+msgid "Copy to"
+msgstr ""
+
 msgid "Create"
 msgstr "Opprett"
 
@@ -178,15 +184,15 @@ msgstr "Opprett mappe"
 msgid "Create your public username in <0>Settings</0>!"
 msgstr ""
 
-msgid "Credit card on file"
-msgstr ""
-
 msgid "Dark Theme"
 msgstr "Mørk drakt"
 
 msgid "Date uploaded"
 msgstr "Dato opplastet"
 
+msgid "Decline"
+msgstr ""
+
 msgid "Decryption key"
 msgstr ""
 
@@ -382,12 +388,18 @@ msgstr ""
 msgid "Light Theme"
 msgstr "Lys drakt"
 
+msgid "Loading"
+msgstr ""
+
 msgid "Loading preview"
 msgstr ""
 
 msgid "Loading your shared folders…"
 msgstr ""
 
+msgid "Loading..."
+msgstr ""
+
 msgid "Looks like you’re signing in from a new browser. Please choose one of the following to continue:"
 msgstr ""
 
@@ -448,6 +460,9 @@ msgstr ""
 msgid "No thanks"
 msgstr "Nei takk"
 
+msgid "No user found for this query."
+msgstr ""
+
 msgid "Number of copies (Replication Factor)"
 msgstr ""
 
@@ -604,7 +619,7 @@ msgstr ""
 msgid "Select a wallet"
 msgstr ""
 
-msgid "Select an existing shared folder"
+msgid "Select an existing shared folder or your home"
 msgstr ""
 
 msgid "Send another email"
@@ -745,6 +760,12 @@ msgstr ""
 msgid "This username is public"
 msgstr "Dette brukernavnet er offentlig"
 
+msgid "This website uses cookies"
+msgstr ""
+
+msgid "This website uses cookies that help the website function and track interactions for analytics purposes. You have the right to decline our use of cookies. For us to provide a customizable user experience to you, please click on the Accept button below.<0>Learn more</0>"
+msgstr ""
+
 msgid "Transfer complete"
 msgstr ""
 
@@ -891,6 +912,3 @@ msgstr ""
 
 msgid "{0, plural, one {You are about to delete {1} item.} other {You are about to delete {2} items.}}"
 msgstr ""
-
-msgid "{0} of {1} used ({2}%)"
-msgstr ""
diff --git a/packages/gaming-ui/package.json b/packages/gaming-ui/package.json
index 7f9680629a..22d3bdd943 100644
--- a/packages/gaming-ui/package.json
+++ b/packages/gaming-ui/package.json
@@ -6,19 +6,18 @@
     "@babel/core": "^7.12.10",
     "@babel/runtime": "^7.0.0",
     "@chainsafe/browser-storage-hooks": "^1.0.1",
-    "@chainsafe/files-api-client": "1.17.5",
+    "@chainsafe/files-api-client": "^1.18.10",
     "@chainsafe/web3-context": "1.1.4",
     "@lingui/core": "^3.7.2",
     "@lingui/react": "^3.7.2",
     "@sentry/react": "^5.28.0",
-    "@toruslabs/torus-direct-web-sdk": "4.10.0",
+    "@toruslabs/torus-direct-web-sdk": "4.15.1",
     "axios": "0.21.4",
     "babel-loader": "8.1.0",
     "babel-plugin-macros": "^2.8.0",
     "babel-preset-env": "^1.7.0",
     "babel-preset-react": "^6.24.1",
     "bnc-onboard": "1.32.0",
-    "cids": "^1.1.6",
     "clsx": "^1.1.1",
     "dayjs": "^1.9.7",
     "eth-crypto": "^1.8.0",
@@ -26,14 +25,8 @@
     "formik": "^2.2.5",
     "mime-matcher": "^1.0.5",
     "react": "^16.14.0",
-    "react-beforeunload": "^2.4.0",
-    "react-dnd": "14.0.2",
-    "react-dnd-html5-backend": "14.0.0",
     "react-dom": "^16.14.0",
-    "react-h5-audio-player": "^3.5.0",
     "react-hotkeys-hook": "^2.4.0",
-    "react-markdown": "^5.0.3",
-    "react-pdf": "5.3.0",
     "react-scripts": "3.4.4",
     "react-swipeable": "^6.0.1",
     "react-toast-notifications": "^2.4.0",
@@ -73,9 +66,8 @@
     "build": "craco --max_old_space_size=4096 build",
     "sentry": "(export REACT_APP_SENTRY_RELEASE=$(sentry-cli releases propose-version); node scripts/sentry.js)",
     "release": "(export REACT_APP_SENTRY_RELEASE=$(sentry-cli releases propose-version); yarn compile && yarn build && node scripts/sentry.js)",
-    "test": "yarn test:clean && cypress open",
-    "test:ci": "yarn test:clean && cypress run --browser chrome --headless",
-    "test:clean": "rimraf cypress/fixtures/storage",
+    "test": "cypress open",
+    "test:ci": "cypress run --browser chrome --headless",
     "analyze": "source-map-explorer 'build/static/js/*.js'",
     "extract": "lingui extract",
     "compile": "lingui compile",
diff --git a/packages/gaming-ui/public/ChainSafe-logo.png b/packages/gaming-ui/public/ChainSafe-logo.png
new file mode 100644
index 0000000000..cfffdc4a82
Binary files /dev/null and b/packages/gaming-ui/public/ChainSafe-logo.png differ
diff --git a/packages/gaming-ui/public/abstract-image-large.png b/packages/gaming-ui/public/abstract-image-large.png
deleted file mode 100644
index 8780e05d66..0000000000
Binary files a/packages/gaming-ui/public/abstract-image-large.png and /dev/null differ
diff --git a/packages/gaming-ui/public/android-chrome-192x192.png b/packages/gaming-ui/public/android-chrome-192x192.png
index f4b70a3279..cfffdc4a82 100644
Binary files a/packages/gaming-ui/public/android-chrome-192x192.png and b/packages/gaming-ui/public/android-chrome-192x192.png differ
diff --git a/packages/gaming-ui/public/android-chrome-512x512.png b/packages/gaming-ui/public/android-chrome-512x512.png
index 7a884ae88d..300ed95cd2 100644
Binary files a/packages/gaming-ui/public/android-chrome-512x512.png and b/packages/gaming-ui/public/android-chrome-512x512.png differ
diff --git a/packages/gaming-ui/public/apple-touch-icon.png b/packages/gaming-ui/public/apple-touch-icon.png
index f4b70a3279..cfffdc4a82 100644
Binary files a/packages/gaming-ui/public/apple-touch-icon.png and b/packages/gaming-ui/public/apple-touch-icon.png differ
diff --git a/packages/gaming-ui/public/favicon-16x16.png b/packages/gaming-ui/public/favicon-16x16.png
index 977cea724a..c515dca67e 100644
Binary files a/packages/gaming-ui/public/favicon-16x16.png and b/packages/gaming-ui/public/favicon-16x16.png differ
diff --git a/packages/gaming-ui/public/favicon-32x32.png b/packages/gaming-ui/public/favicon-32x32.png
index 2b6e4c1c82..ee6522854f 100644
Binary files a/packages/gaming-ui/public/favicon-32x32.png and b/packages/gaming-ui/public/favicon-32x32.png differ
diff --git a/packages/gaming-ui/public/favicon.ico b/packages/gaming-ui/public/favicon.ico
index ee2819a2e7..6333263689 100644
Binary files a/packages/gaming-ui/public/favicon.ico and b/packages/gaming-ui/public/favicon.ico differ
diff --git a/packages/gaming-ui/src/App.tsx b/packages/gaming-ui/src/App.tsx
index 6eaf3956b7..ea78e7f068 100644
--- a/packages/gaming-ui/src/App.tsx
+++ b/packages/gaming-ui/src/App.tsx
@@ -11,6 +11,7 @@ import { lightTheme } from "./Themes/LightTheme"
 import { darkTheme } from "./Themes/DarkTheme"
 import { useLocalStorage } from "@chainsafe/browser-storage-hooks"
 import { GamingApiProvider }  from "./Contexts/GamingApiContext"
+import { UserProvider } from "./Contexts/UserContext"
 
 if (
   process.env.NODE_ENV === "production" &&
@@ -101,11 +102,13 @@ const App = () => {
                 apiUrl={apiUrl}
                 withLocalStorage={true}
               >
-                <Router>
-                  <AppWrapper>
-                    <StorageRoutes />
-                  </AppWrapper>
-                </Router>
+                <UserProvider>
+                  <Router>
+                    <AppWrapper>
+                      <StorageRoutes />
+                    </AppWrapper>
+                  </Router>
+                </UserProvider>
               </GamingApiProvider>
             </Web3Provider>
           </ToastProvider>
diff --git a/packages/gaming-ui/src/Components/Elements/CustomModal.tsx b/packages/gaming-ui/src/Components/Elements/CustomModal.tsx
index a7aa276273..224b120ab3 100644
--- a/packages/gaming-ui/src/Components/Elements/CustomModal.tsx
+++ b/packages/gaming-ui/src/Components/Elements/CustomModal.tsx
@@ -25,7 +25,7 @@ const useStyles = makeStyles(({ constants, breakpoints }: CSGTheme) =>
         borderRadiusRightBottom: 0
       }
     },
-    close: {
+    closeIcon: {
       [breakpoints.down("md")]: {}
     }
   })
@@ -48,7 +48,7 @@ const CustomModal: React.FC<ICustomModal> = ({
     <Modal
       className={clsx(classes.root, className)}
       injectedClass={{
-        closeIcon: clsx(classes.close, injectedClass?.closeIcon),
+        closeIcon: clsx(classes.closeIcon, injectedClass?.closeIcon),
         inner: clsx(classes.inner, injectedClass?.inner)
       }}
       {...rest}
diff --git a/packages/gaming-ui/src/Components/GamingRoutes.tsx b/packages/gaming-ui/src/Components/GamingRoutes.tsx
index e05e9b16ba..a13dc10f19 100644
--- a/packages/gaming-ui/src/Components/GamingRoutes.tsx
+++ b/packages/gaming-ui/src/Components/GamingRoutes.tsx
@@ -2,18 +2,17 @@ import React from "react"
 import { Switch, ConditionalRoute } from "@chainsafe/common-components"
 import LoginPage from "./Pages/LoginPage"
 import { useGamingApi }  from "../Contexts/GamingApiContext"
-import BillingPage from "./Pages/BillingPage"
-import Products from "./Modules/Products"
-import ApiKeys from "./Modules/ApiKeys"
+import SettingsPage from "./Pages/SettingsPage"
+import DashboardPage from "./Pages/DashboardPage"
 
 export const SETTINGS_PATHS = ["apiKeys", "billing"] as const
 export type SettingsPath = typeof SETTINGS_PATHS[number]
 
 export const ROUTE_LINKS = {
   Landing: "/",
-  // SettingsRoot: "/settings",
-  // Settings: (path: SettingsPath) => `/settings/${path}`,
-  APIKeys: "/keys",
+  Dashboard: "/dashboard",
+  SettingsRoot: "/settings",
+  Settings: (path: SettingsPath) => `/settings/${path}`,
   PrivacyPolicy: "https://files.chainsafe.io/privacy-policy",
   Terms: "https://files.chainsafe.io/terms-of-service",
   ChainSafe: "https://chainsafe.io/",
@@ -21,36 +20,28 @@ export const ROUTE_LINKS = {
   Products: "/products"
 }
 
-
-
 const GamingRoutes = () => {
   const { isLoggedIn } = useGamingApi()
 
   return (
     <Switch>
       <ConditionalRoute
-        path={ROUTE_LINKS.APIKeys}
-        isAuthorized={isLoggedIn}
-        component={ApiKeys}
-        redirectPath={ROUTE_LINKS.Landing}
-      />
-      <ConditionalRoute
-        path={ROUTE_LINKS.Billing}
+        path={ROUTE_LINKS.Dashboard}
         isAuthorized={isLoggedIn}
-        component={BillingPage}
+        component={DashboardPage}
         redirectPath={ROUTE_LINKS.Landing}
       />
       <ConditionalRoute
-        path={ROUTE_LINKS.Products}
+        path={ROUTE_LINKS.SettingsRoot}
         isAuthorized={isLoggedIn}
-        component={Products}
+        component={SettingsPage}
         redirectPath={ROUTE_LINKS.Landing}
       />
       <ConditionalRoute
         path={ROUTE_LINKS.Landing}
         isAuthorized={!isLoggedIn}
         component={LoginPage}
-        redirectPath={ROUTE_LINKS.APIKeys}
+        redirectPath={ROUTE_LINKS.Dashboard}
         redirectToSource
       />
     </Switch>
diff --git a/packages/gaming-ui/src/Components/Layouts/AppHeader.tsx b/packages/gaming-ui/src/Components/Layouts/AppHeader.tsx
index 8609a3a0d8..45ed28b61a 100644
--- a/packages/gaming-ui/src/Components/Layouts/AppHeader.tsx
+++ b/packages/gaming-ui/src/Components/Layouts/AppHeader.tsx
@@ -14,6 +14,7 @@ import { ROUTE_LINKS } from "../GamingRoutes"
 import { Trans } from "@lingui/macro"
 import { CSGTheme } from "../../Themes/types"
 import { useGamingApi } from "../../Contexts/GamingApiContext"
+import { useUser } from "../../Contexts/UserContext"
 
 const useStyles = makeStyles(
   ({ palette, animation, breakpoints, constants, zIndex }: CSGTheme) => {
@@ -154,6 +155,7 @@ const AppHeader = ({ navOpen, setNavOpen }: IAppHeader) => {
   const classes = useStyles()
   const { isLoggedIn, logout } = useGamingApi()
   const { history } = useHistory()
+  const { getProfileTitle } = useUser()
 
   const signOut = useCallback(async () => {
     logout()
@@ -173,17 +175,21 @@ const AppHeader = ({ navOpen, setNavOpen }: IAppHeader) => {
             <>
               <section className={classes.accountControls}>
                 <MenuDropdown
-                  title=''
+                  title={getProfileTitle()}
                   anchor="bottom-right"
                   classNames={{
                     icon: classes.icon,
                     options: classes.options
                   }}
+                  testId="sign-out"
                   menuItems={[
                     {
                       onClick: () => signOut(),
                       contents: (
-                        <div className={classes.menuItem}>
+                        <div
+                          data-cy="menu-sign-out"
+                          className={classes.menuItem}
+                        >
                           <PowerDownSvg />
                           <Typography>
                             <Trans>Sign Out</Trans>
@@ -205,14 +211,14 @@ const AppHeader = ({ navOpen, setNavOpen }: IAppHeader) => {
               />
               <Link
                 className={classes.logo}
-                to={ROUTE_LINKS.APIKeys}
+                to={ROUTE_LINKS.Dashboard}
               >
                 <ChainsafeLogo />
                 <Typography
                   variant="h5"
                   className={classes.title}
                 >
-                  Gaming
+                  Dashboard
                 </Typography>
               </Link>
             </>
diff --git a/packages/gaming-ui/src/Components/Layouts/AppNav.tsx b/packages/gaming-ui/src/Components/Layouts/AppNav.tsx
index add2e9f29a..33eac97cff 100644
--- a/packages/gaming-ui/src/Components/Layouts/AppNav.tsx
+++ b/packages/gaming-ui/src/Components/Layouts/AppNav.tsx
@@ -230,7 +230,7 @@ const AppNav: React.FC<IAppNav> = ({ navOpen, setNavOpen }: IAppNav) => {
             <div>
               <Link
                 className={classes.logo}
-                to={ROUTE_LINKS.APIKeys}
+                to={ROUTE_LINKS.Dashboard}
               >
                 <ChainsafeLogo />
                 <Typography variant="body1">
diff --git a/packages/gaming-ui/src/Components/Modules/ApiKeys.tsx b/packages/gaming-ui/src/Components/Modules/ApiKeys.tsx
index cfa12bd5b2..d22d350fe2 100644
--- a/packages/gaming-ui/src/Components/Modules/ApiKeys.tsx
+++ b/packages/gaming-ui/src/Components/Modules/ApiKeys.tsx
@@ -1,5 +1,5 @@
 import React, { useEffect, useState, useCallback } from "react"
-import { makeStyles, createStyles } from "@chainsafe/common-theme"
+import { makeStyles, createStyles, debounce } from "@chainsafe/common-theme"
 import { useGamingApi } from "../../Contexts/GamingApiContext"
 import { AccessKey } from "@chainsafe/files-api-client"
 import {
@@ -14,16 +14,18 @@ import {
   TableCell,
   MenuDropdown,
   DeleteSvg,
-  MoreIcon } from "@chainsafe/common-components"
+  MoreIcon,
+  CopyIcon,
+  Modal
+} from "@chainsafe/common-components"
 import { CSGTheme } from "../../Themes/types"
 import { Trans } from "@lingui/macro"
 import dayjs from "dayjs"
-import SecretField from "../Elements/SecretField"
 
-export const desktopGridSettings = "3fr 400px 100px 200px 70px !important"
-export const mobileGridSettings = "3fr 400px 100px 200px 70px !important"
+export const desktopGridSettings = "2fr 2fr 1fr 1.5fr 70px !important"
+export const mobileGridSettings = "2fr 2fr 1fr 1.5fr 70px !important"
 
-const useStyles = makeStyles(({ constants, breakpoints, animation }: CSGTheme) =>
+const useStyles = makeStyles(({ constants, breakpoints, animation, zIndex, palette }: CSGTheme) =>
   createStyles({
     root: {
       position: "relative"
@@ -82,6 +84,55 @@ const useStyles = makeStyles(({ constants, breakpoints, animation }: CSGTheme) =
       "& svg": {
         fill: constants.fileSystemItemRow.menuIcon
       }
+    },
+    modalRoot: {
+      zIndex: zIndex?.blocker,
+      [breakpoints.down("md")]: {}
+    },
+    modalInner: {
+      [breakpoints.down("md")]: {
+        bottom:
+        Number(constants?.mobileButtonHeight) + constants.generalUnit,
+        borderTopLeftRadius: `${constants.generalUnit * 1.5}px`,
+        borderTopRightRadius: `${constants.generalUnit * 1.5}px`,
+        maxWidth: `${breakpoints.width("md")}px !important`
+      }
+    },
+    modalHeading: {
+      textAlign: "center",
+      marginBottom: constants.generalUnit * 4
+    },
+    modalContent: {
+      display: "flex",
+      flexDirection: "column",
+      padding: constants.generalUnit * 4
+    },
+    secretContainer: {
+      display: "flex",
+      justifyContent: "space-between",
+      marginBottom: constants.generalUnit * 0.5
+    },
+    copyBox: {
+      display: "flex",
+      justifyContent: "space-between",
+      alignItems: "center",
+      cursor: "pointer",
+      color: palette.text.secondary
+    },
+    copyIcon: {
+      fontSize: "14px",
+      fill: constants.profile.icon,
+      [breakpoints.down("md")]: {
+        fontSize: "18px",
+        fill: palette.additional["gray"][9]
+      }
+    },
+    secret: {
+      maxWidth: "95%",
+      overflowWrap: "anywhere"
+    },
+    field: {
+      marginBottom: constants.generalUnit * 4
     }
   })
 )
@@ -90,16 +141,35 @@ const ApiKeys = () => {
   const classes = useStyles()
   const { gamingApiClient } = useGamingApi()
   const [keys, setKeys] = useState<AccessKey[]>([])
+  const [newKey, setNewKey] = useState<AccessKey | undefined>()
+  const [isNewKeyModalOpen, setIsNewKeyModalOpen] = useState(false)
+  const [copiedSecret, setCopiedSecret] = useState(false)
+  const debouncedCopiedSecret =
+    debounce(() => setCopiedSecret(false), 3000)
+
+  const copySecret = async () => {
+    if (newKey?.secret) {
+      try {
+        await navigator.clipboard.writeText(newKey.secret)
+        setCopiedSecret(true)
+        debouncedCopiedSecret()
+      } catch (err) {
+        console.error(err)
+      }
+    }
+  }
 
   const fetchAccessKeys = useCallback(() => {
     gamingApiClient.listAccessKeys()
-      .then(result => setKeys(result))
+      .then(setKeys)
       .catch(console.error)
   }, [gamingApiClient])
 
-  const createAccessKey = useCallback(() => {
-    gamingApiClient.createAccessKey()
+  const createStorageAccessKey = useCallback(() => {
+    gamingApiClient.createAccessKey({ type: "gaming" })
+      .then(setNewKey)
       .then(fetchAccessKeys)
+      .then(() => setIsNewKeyModalOpen(true))
       .catch(console.error)
   }, [fetchAccessKeys, gamingApiClient])
 
@@ -114,121 +184,184 @@ const ApiKeys = () => {
   }, [fetchAccessKeys])
 
   return (
-    <div className={classes.root}>
-      <header className={classes.header}>
-        <Typography
-          variant="h1"
-          component="h1"
-          data-cy="api-keys-header"
+    <>
+      <div className={classes.root}>
+        <header className={classes.header}>
+          <Typography
+            variant="h1"
+            component="h1"
+            data-cy="api-keys-header"
+          >
+            <Trans>
+            API Keys
+            </Trans>
+          </Typography>
+          <div className={classes.controls}>
+            <Button
+              data-cy="add-storage-api-key-button"
+              onClick={createStorageAccessKey}
+              variant="outline"
+              size="large"
+              disabled={keys.filter(k => k.type === "storage").length > 0}
+            >
+              <PlusIcon />
+              <span>
+                <Trans>Add API Key</Trans>
+              </span>
+            </Button>
+          </div>
+        </header>
+        <Table
+          fullWidth={true}
+          striped={true}
+          hover={true}
+          className=""
         >
-          <Trans>
-              API Keys
-          </Trans>
-        </Typography>
-        <div className={classes.controls}>
+          <TableHead className={classes.tableHead}>
+            <TableRow
+              type="grid"
+              className={classes.tableRow}
+            >
+              <TableHeadCell
+                sortButtons={false}
+                align="center"
+              >
+                <Trans>Id</Trans>
+              </TableHeadCell>
+              <TableHeadCell
+                sortButtons={false}
+                align="center"
+              >
+                <Trans>Type</Trans>
+              </TableHeadCell>
+              <TableHeadCell
+                sortButtons={false}
+                align="center"
+              >
+                <Trans>Status</Trans>
+              </TableHeadCell>
+              <TableHeadCell
+                sortButtons={false}
+                align="center"
+              >
+                <Trans>Created At</Trans>
+              </TableHeadCell>
+              <TableHeadCell>{/* Menu */}</TableHeadCell>
+            </TableRow>
+          </TableHead>
+          <TableBody>
+            {keys.map(k =>
+              <TableRow
+                key={k.id}
+                type='grid'
+                className={classes.tableRow}>
+                <TableCell align='left'>
+                  <Typography>
+                    {k.id}
+                  </Typography>
+                </TableCell>
+                <TableCell>
+                  <Typography>
+                    {k.type}
+                  </Typography>
+                </TableCell>
+                <TableCell>
+                  <Typography>
+                    {k.status}
+                  </Typography>
+                </TableCell>
+                <TableCell>
+                  <Typography>
+                    {dayjs(k.created_at).format("DD MMM YYYY h:mm a")}
+                  </Typography>
+                </TableCell>
+                <TableCell align="right">
+                  <MenuDropdown
+                    animation="none"
+                    anchor={"bottom-right"}
+                    menuItems={[{
+                      contents: (
+                        <>
+                          <DeleteSvg className={classes.menuIcon} />
+                          <span data-cy="menu-share">
+                            <Trans>Delete Key</Trans>
+                          </span>
+                        </>
+                      ),
+                      onClick: () => deleteAccessKey(k.id)
+                    }]}
+                    classNames={{
+                      icon: classes.dropdownIcon,
+                      options: classes.dropdownOptions,
+                      item: classes.dropdownItem
+                    }}
+                    indicator={MoreIcon}
+                  />
+                </TableCell>
+              </TableRow>)}
+          </TableBody>
+        </Table>
+      </div>
+      <Modal
+        className={classes.modalRoot}
+        injectedClass={{
+          inner: classes.modalInner
+        }}
+        active={isNewKeyModalOpen}
+        closePosition="none"
+        maxWidth="sm"
+      >
+        <div className={classes.modalContent}>
+          <Typography
+            variant='h6'
+            className={classes.modalHeading}
+          >
+            <Trans>New Key</Trans>
+          </Typography>
+          <Typography variant='h4'>
+            <Trans>Key ID</Trans>
+          </Typography>
+          <Typography className={classes.field}>{newKey?.id}</Typography>
+          <Typography variant='h4'>
+            <Trans>Secret</Trans>
+          </Typography>
+          <div className={classes.field}>
+            <div className={classes.secretContainer}>
+              <Typography variant='body2'>
+                <Trans>Make sure to save the secret, as it can only be displayed once.</Trans>
+              </Typography>
+              {copiedSecret && (
+                <Typography variant='body2'>
+                  <Trans>Copied!</Trans>
+                </Typography>
+              )}
+            </div>
+            <div
+              className={classes.copyBox}
+              onClick={copySecret}
+            >
+              <Typography
+                variant="body1"
+                component="p"
+                className={classes.secret}
+              >
+                {newKey?.secret}
+              </Typography>
+              <CopyIcon className={classes.copyIcon} />
+            </div>
+          </div>
           <Button
-            data-cy="add-api-key-button"
-            onClick={createAccessKey}
-            variant="outline"
-            size="large"
-            disabled={keys.length > 0}
+            autoFocus
+            onClick={() => {
+              setIsNewKeyModalOpen(false)
+              setNewKey(undefined)
+            }}
           >
-            <PlusIcon />
-            <span>
-              <Trans>Add API Key</Trans>
-            </span>
+            Close
           </Button>
         </div>
-      </header>
-      <Table
-        fullWidth={true}
-        striped={true}
-        hover={true}
-        className=""
-      >
-        <TableHead className={classes.tableHead}>
-          <TableRow
-            type="grid"
-            className={classes.tableRow}
-          >
-            <TableHeadCell
-              sortButtons={false}
-              align="center"
-            >
-              <Trans>Id</Trans>
-            </TableHeadCell>
-            <TableHeadCell
-              sortButtons={false}
-              align="center"
-            >
-              <Trans>Secret</Trans>
-            </TableHeadCell>
-            <TableHeadCell
-              sortButtons={false}
-              align="center"
-            >
-              <Trans>Status</Trans>
-            </TableHeadCell>
-            <TableHeadCell
-              sortButtons={false}
-              align="center"
-            >
-              <Trans>Created At</Trans>
-            </TableHeadCell>
-            <TableHeadCell>{/* Menu */}</TableHeadCell>
-          </TableRow>
-        </TableHead>
-        <TableBody>
-          {keys.map(k =>
-            <TableRow
-              key={k.id}
-              type='grid'
-              className={classes.tableRow}>
-              <TableCell>
-                <Typography>
-                  {k.id}
-                </Typography>
-              </TableCell>
-              <TableCell>
-                <SecretField value={k.secret} />
-              </TableCell>
-              <TableCell>
-                <Typography>
-                  {k.status}
-                </Typography>
-              </TableCell>
-              <TableCell>
-                <Typography>
-                  {dayjs(k.created_at).format("DD MMM YYYY h:mm a")}
-                </Typography>
-              </TableCell>
-              <TableCell align="right">
-                <MenuDropdown
-                  animation="none"
-                  anchor={"bottom-right"}
-                  menuItems={[{
-                    contents: (
-                      <>
-                        <DeleteSvg className={classes.menuIcon} />
-                        <span data-cy="menu-share">
-                          <Trans>Delete Key</Trans>
-                        </span>
-                      </>
-                    ),
-                    onClick: () => deleteAccessKey(k.id)
-                  }]}
-                  classNames={{
-                    icon: classes.dropdownIcon,
-                    options: classes.dropdownOptions,
-                    item: classes.dropdownItem
-                  }}
-                  indicator={MoreIcon}
-                />
-              </TableCell>
-            </TableRow>)}
-        </TableBody>
-      </Table>
-    </div>
+      </Modal>
+    </>
   )
 }
 
diff --git a/packages/gaming-ui/src/Components/Pages/DashboardPage.tsx b/packages/gaming-ui/src/Components/Pages/DashboardPage.tsx
new file mode 100644
index 0000000000..8a3df055c5
--- /dev/null
+++ b/packages/gaming-ui/src/Components/Pages/DashboardPage.tsx
@@ -0,0 +1,28 @@
+import React from "react"
+import { makeStyles, createStyles } from "@chainsafe/common-theme"
+import { Typography } from "@chainsafe/common-components"
+
+const useStyles = makeStyles(() =>
+  createStyles({
+    root: {
+      position: "relative"
+    }
+  })
+)
+
+const DashboardPage = () => {
+  const classes = useStyles()
+
+  return (
+    <div className={classes.root}>
+      <Typography
+        component="h1"
+        variant="h1"
+      >
+        Dashboard
+      </Typography>
+    </div>
+  )
+}
+
+export default DashboardPage
diff --git a/packages/gaming-ui/src/Components/Pages/LoginPage.tsx b/packages/gaming-ui/src/Components/Pages/LoginPage.tsx
index e60758b8c1..551d622c76 100644
--- a/packages/gaming-ui/src/Components/Pages/LoginPage.tsx
+++ b/packages/gaming-ui/src/Components/Pages/LoginPage.tsx
@@ -128,7 +128,7 @@ const LoginPage = () => {
     <div className={classes.root}>
       <Typography className={classes.title}>
         <ChainsafeLogo className={classes.filesLogo} />
-        Gaming
+        Gaming Dashboard
       </Typography>
       <>
       </>
@@ -142,6 +142,7 @@ const LoginPage = () => {
             <BottomLightSVG className={classes.bgBottom} />
             <TopLightSVG className={classes.bgTop} />
           </>
+
       }
       <a
         className={classes.cta}
diff --git a/packages/gaming-ui/src/Components/Pages/SettingsPage.tsx b/packages/gaming-ui/src/Components/Pages/SettingsPage.tsx
index d322884ce8..d7aa60c146 100644
--- a/packages/gaming-ui/src/Components/Pages/SettingsPage.tsx
+++ b/packages/gaming-ui/src/Components/Pages/SettingsPage.tsx
@@ -1,23 +1,22 @@
-import React, { useCallback, useMemo } from "react"
+import React, { useCallback } from "react"
 import { Tabs,
   TabPane as TabPaneOrigin,
   Typography, Divider,
-  Breadcrumb,
-  Crumb,
   useParams,
   useHistory,
   ITabPaneProps,
   CaretRightIcon,
   LockIcon
 } from "@chainsafe/common-components"
-import { makeStyles, ITheme, createStyles, useThemeSwitcher } from "@chainsafe/common-theme"
+import { makeStyles, createStyles, useThemeSwitcher } from "@chainsafe/common-theme"
 import { ROUTE_LINKS, SettingsPath } from "../GamingRoutes"
 import { t, Trans } from "@lingui/macro"
 import clsx from "clsx"
 import ApiKeys from "../Modules/ApiKeys"
+import { CSGTheme } from "../../Themes/types"
 
 const TabPane = (props: ITabPaneProps<SettingsPath>) => TabPaneOrigin(props)
-const useStyles = makeStyles(({ constants, breakpoints, palette }: ITheme) =>
+const useStyles = makeStyles(({ constants, breakpoints, palette }: CSGTheme) =>
   createStyles({
     title: {
       marginTop: constants.generalUnit,
@@ -90,7 +89,7 @@ const useStyles = makeStyles(({ constants, breakpoints, palette }: ITheme) =>
       marginBottom: 0,
       display: "flex",
       flexDirection: "column",
-      width: 226,
+      width: 200,
       borderRightColor: palette.additional["gray"][4],
       borderRightWidth: 1,
       borderRightStyle: "solid",
@@ -137,19 +136,9 @@ const SettingsPage: React.FC = () => {
     (path: string) => redirect(ROUTE_LINKS.Settings(path as SettingsPath))
     , [redirect])
 
-  const crumbs: Crumb[] = useMemo(() => [
-    {
-      text: t`Settings`
-    }
-  ], [])
-
   return (
     <div className={classes.container}>
       <div className={classes.headerContainer}>
-        <Breadcrumb
-          crumbs={crumbs}
-          homeOnClick={() => redirect(ROUTE_LINKS.SettingsRoot)}
-        />
         <Typography
           variant="h1"
           component="p"
diff --git a/packages/gaming-ui/src/Contexts/GamingApiContext.tsx b/packages/gaming-ui/src/Contexts/GamingApiContext.tsx
index 19a6db1ff7..d05ecde538 100644
--- a/packages/gaming-ui/src/Contexts/GamingApiContext.tsx
+++ b/packages/gaming-ui/src/Contexts/GamingApiContext.tsx
@@ -11,6 +11,8 @@ import { capitalize, centerEllipsis } from "../Utils/StringHelpers"
 export type { IdentityProvider as OAuthProvider }
 
 const tokenStorageKey = "csg.refreshToken"
+const isReturningUserStorageKey = "csg.isReturningUser"
+const TORUS_USERINFO_KEY = "csg.userInfo"
 
 const getProviderSpecificParams = (loginType: LOGIN_TYPE):
   {typeOfLogin: LOGIN_TYPE; clientId: string; verifier: string; jwtParams?: any} => {
@@ -19,14 +21,14 @@ const getProviderSpecificParams = (loginType: LOGIN_TYPE):
     return {
       typeOfLogin: loginType,
       clientId: process.env.REACT_APP_GOOGLE_CLIENT_ID || "",
-      verifier: ""
+      verifier: "chainsafe-uuid-testnet"
     }
   }
   case "github":{
     return {
       typeOfLogin: loginType,
       clientId: process.env.REACT_APP_AUTH0_CLIENT_ID || "",
-      verifier: "",
+      verifier: "chainsafe-uuid-testnet",
       jwtParams: {
         domain: process.env.REACT_APP_AUTH0_DOMAIN || ""
       }
@@ -60,6 +62,7 @@ type GamingApiContext = {
   userInfo?: GamingUserInfo
   gamingApiClient: IFilesApiClient
   isLoggedIn: boolean | undefined
+  isReturningUser: boolean
   selectWallet: () => Promise<void>
   resetAndSelectWallet: () => Promise<void>
   login(loginType: IdentityProvider, tokenInfo?: {token: IdentityToken; email: string}): Promise<void>
@@ -75,8 +78,8 @@ const GamingApiProvider = ({ apiUrl, withLocalStorage = true, children }: Gaming
   const maintenanceMode = process.env.REACT_APP_MAINTENANCE_MODE === "true"
 
   const { wallet, onboard, checkIsReady, isReady, provider, address } = useWeb3()
-  const { localStorageRemove, localStorageSet } = useLocalStorage()
-  const { sessionStorageRemove, sessionStorageSet } = useSessionStorage()
+  const { canUseLocalStorage, localStorageRemove, localStorageGet, localStorageSet } = useLocalStorage()
+  const { sessionStorageRemove, sessionStorageGet, sessionStorageSet } = useSessionStorage()
 
   // initializing api
   const initialAxiosInstance = useMemo(() => axios.create({
@@ -102,17 +105,30 @@ const GamingApiProvider = ({ apiUrl, withLocalStorage = true, children }: Gaming
     { exp: number; enckey?: string; mps?: string; uuid: string } | undefined
   >(undefined)
 
+  // returning user
+  const isReturningUserLocal = localStorageGet(isReturningUserStorageKey)
+  const [isReturningUser, setIsReturningUser] = useState(!!isReturningUserLocal)
+
   const setTokensAndSave = useCallback((accessToken: Token, refreshToken: Token) => {
     setAccessToken(accessToken)
     setRefreshToken(refreshToken)
-
-    withLocalStorage
-      ? localStorageSet(tokenStorageKey, refreshToken.token)
-      : sessionStorageSet(tokenStorageKey, refreshToken.token)
-
+    refreshToken.token && withLocalStorage && localStorageSet(tokenStorageKey, refreshToken.token)
+    !withLocalStorage && sessionStorageSet(tokenStorageKey, refreshToken.token)
     accessToken.token && gamingApiClient.setToken(accessToken.token)
   }, [gamingApiClient, localStorageSet, sessionStorageSet, withLocalStorage])
 
+  const setReturningUser = () => {
+    // set returning user
+    localStorageSet(isReturningUserStorageKey, "returning")
+    setIsReturningUser(true)
+  }
+
+  useEffect(() => {
+    if (userInfo) {
+      sessionStorage.setItem(TORUS_USERINFO_KEY, JSON.stringify(userInfo))
+    }
+  }, [userInfo])
+
   useEffect(() => {
     const loginType = userInfo?.typeOfLogin as LOGIN_TYPE
 
@@ -151,8 +167,8 @@ const GamingApiProvider = ({ apiUrl, withLocalStorage = true, children }: Gaming
             error.config._retry = true
             const refreshTokenLocal =
               (withLocalStorage)
-                ? localStorage.getItem(tokenStorageKey)
-                : sessionStorage.getItem(tokenStorageKey)
+                ? localStorageGet(tokenStorageKey)
+                : sessionStorageGet(tokenStorageKey)
             if (refreshTokenLocal) {
               const refreshTokenApiClient = new FilesApiClient(
                 {},
@@ -211,7 +227,7 @@ const GamingApiProvider = ({ apiUrl, withLocalStorage = true, children }: Gaming
 
     initializeApiClient()
   // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
+  }, [canUseLocalStorage])
 
   const selectWallet = async () => {
     if (onboard && !isReady) {
@@ -363,6 +379,7 @@ const GamingApiProvider = ({ apiUrl, withLocalStorage = true, children }: Gaming
         publicAddress: userInfo.address
       })
       setTokensAndSave(access_token, refresh_token)
+      setReturningUser()
     } catch(error) {
       console.error(error)
       throw new Error("Login Error")
@@ -385,6 +402,7 @@ const GamingApiProvider = ({ apiUrl, withLocalStorage = true, children }: Gaming
       value={{
         gamingApiClient: gamingApiClient,
         isLoggedIn: isLoggedIn(),
+        isReturningUser: isReturningUser,
         login,
         resetStatus: () => setStatus("initialized"),
         status,
@@ -403,7 +421,7 @@ const GamingApiProvider = ({ apiUrl, withLocalStorage = true, children }: Gaming
 const useGamingApi = () => {
   const context = React.useContext(GamingApiContext)
   if (context === undefined) {
-    throw new Error("useStorage must be used within a StorageProvider")
+    throw new Error("useGamingApi must be used within a GamingApiProvider")
   }
   return context
 }
diff --git a/packages/gaming-ui/src/Contexts/UserContext.tsx b/packages/gaming-ui/src/Contexts/UserContext.tsx
new file mode 100644
index 0000000000..a91ac10712
--- /dev/null
+++ b/packages/gaming-ui/src/Contexts/UserContext.tsx
@@ -0,0 +1,93 @@
+import * as React from "react"
+import { useCallback, useEffect } from "react"
+import { useGamingApi } from "./GamingApiContext"
+import { useState } from "react"
+
+type UserContextProps = {
+  children: React.ReactNode | React.ReactNode[]
+}
+
+export type Profile = {
+  userId: string
+  firstName?: string
+  lastName?: string
+  publicAddress?: string
+  email?: string
+  createdAt?: Date
+  username?: string
+}
+
+interface IUserContext {
+  profile: Profile | undefined
+  refreshProfile(): Promise<void>
+  getProfileTitle(): string
+}
+
+const UserContext = React.createContext<IUserContext | undefined>(undefined)
+
+const UserProvider = ({ children }: UserContextProps) => {
+  const { gamingApiClient, isLoggedIn } = useGamingApi()
+
+  const [profile, setProfile] = useState<Profile | undefined>(undefined)
+
+  const refreshProfile = useCallback(async () => {
+    try {
+      const profileApiData = await gamingApiClient.getUser()
+
+      const profileState = {
+        userId: profileApiData.uuid,
+        firstName: profileApiData.first_name,
+        lastName: profileApiData.last_name,
+        email: profileApiData.email,
+        publicAddress: profileApiData.public_address?.toLowerCase(),
+        createdAt: profileApiData.created_at,
+        username: profileApiData.username
+      }
+      setProfile(profileState)
+      return Promise.resolve()
+    } catch (error) {
+      return Promise.reject("There was an error getting profile.")
+    }
+  }, [gamingApiClient])
+
+  useEffect(() => {
+    if (isLoggedIn) {
+      refreshProfile()
+        .catch(console.error)
+    }
+  }, [isLoggedIn, refreshProfile])
+
+  const getProfileTitle = () => {
+    if (profile?.publicAddress) {
+      const { publicAddress } = profile
+      return `${publicAddress.substr(0, 6)}...${publicAddress.substr(
+        publicAddress.length - 6,
+        publicAddress.length
+      )}`
+    } else {
+      return profile?.firstName || profile?.email || ""
+    }
+  }
+
+  return (
+    <UserContext.Provider
+      value={{
+        profile,
+        refreshProfile,
+        getProfileTitle
+      }}
+    >
+      {children}
+    </UserContext.Provider>
+  )
+}
+
+const useUser = () => {
+  const context = React.useContext(UserContext)
+  if (context === undefined) {
+    throw new Error("useUser must be used within a UserProvider")
+  }
+  return context
+}
+
+export { UserProvider, useUser }
diff --git a/packages/gaming-ui/src/locales/en/messages.po b/packages/gaming-ui/src/locales/en/messages.po
index 230997d2e7..e46ba11826 100644
--- a/packages/gaming-ui/src/locales/en/messages.po
+++ b/packages/gaming-ui/src/locales/en/messages.po
@@ -64,6 +64,9 @@ msgstr "Continue with Google"
 msgid "Continue with Web3 Wallet"
 msgstr "Continue with Web3 Wallet"
 
+msgid "Copied!"
+msgstr "Copied!"
+
 msgid "Created At"
 msgstr "Created At"
 
@@ -109,9 +112,18 @@ msgstr "Hold on, we are logging you in…"
 msgid "Id"
 msgstr "Id"
 
+msgid "Key ID"
+msgstr "Key ID"
+
 msgid "Learn more about ChainSafe"
 msgstr "Learn more about ChainSafe"
 
+msgid "Make sure to save the secret, as it can only be displayed once."
+msgstr "Make sure to save the secret, as it can only be displayed once."
+
+msgid "New Key"
+msgstr "New Key"
+
 msgid "Please enter a valid email"
 msgstr "Please enter a valid email"
 
@@ -172,14 +184,8 @@ msgstr "There was an error connecting your wallet"
 msgid "Try again"
 msgstr "Try again"
 
-msgid "Try for 7 days"
-msgstr "Try for 7 days"
-
-msgid "Upgrade Plan"
-msgstr "Upgrade Plan"
-
-msgid "Upgrade your plan"
-msgstr "Upgrade your plan"
+msgid "Type"
+msgstr "Type"
 
 msgid "Use a different login method"
 msgstr "Use a different login method"
diff --git a/packages/storage-ui/package.json b/packages/storage-ui/package.json
index 6c89462f61..58da774b9e 100644
--- a/packages/storage-ui/package.json
+++ b/packages/storage-ui/package.json
@@ -6,12 +6,12 @@
     "@babel/core": "^7.12.10",
     "@babel/runtime": "^7.0.0",
     "@chainsafe/browser-storage-hooks": "^1.0.1",
-    "@chainsafe/files-api-client": "^1.18.5",
+    "@chainsafe/files-api-client": "^1.18.10",
     "@chainsafe/web3-context": "1.1.4",
     "@lingui/core": "^3.7.2",
     "@lingui/react": "^3.7.2",
     "@sentry/react": "^5.28.0",
-    "@toruslabs/torus-direct-web-sdk": "4.10.0",
+    "@toruslabs/torus-direct-web-sdk": "4.15.1",
     "axios": "0.21.4",
     "babel-loader": "8.1.0",
     "babel-plugin-macros": "^2.8.0",
diff --git a/packages/storage-ui/src/Components/Modules/CreateFolderModal/CreateFolderModal.tsx b/packages/storage-ui/src/Components/Modules/CreateFolderModal/CreateFolderModal.tsx
index 7eedf160c2..6b245096ec 100644
--- a/packages/storage-ui/src/Components/Modules/CreateFolderModal/CreateFolderModal.tsx
+++ b/packages/storage-ui/src/Components/Modules/CreateFolderModal/CreateFolderModal.tsx
@@ -9,7 +9,7 @@ import {
   makeStyles,
   useMediaQuery
 } from "@chainsafe/common-theme"
-import React, { useRef, useEffect, useState } from "react"
+import React, { useState } from "react"
 import { Formik, Form } from "formik"
 import CustomModal from "../../Elements/CustomModal"
 import CustomButton from "../../Elements/CustomButton"
@@ -77,22 +77,12 @@ interface ICreateFolderModalProps {
   close: () => void
 }
 
-const CreateFolderModal: React.FC<ICreateFolderModalProps> = ({
-  modalOpen,
-  close
-}: ICreateFolderModalProps) => {
+const CreateFolderModal = ({ modalOpen, close }: ICreateFolderModalProps) => {
   const classes = useStyles()
   const { storageApiClient } = useStorageApi()
   const { currentPath, refreshContents, bucket } = useFileBrowser()
   const [creatingFolder, setCreatingFolder] = useState(false)
   const desktop = useMediaQuery("md")
-  const inputRef = useRef<any>(null)
-
-  useEffect(() => {
-    if (modalOpen) {
-      setTimeout(() => inputRef.current?.focus(), 100)
-    }
-  }, [modalOpen])
 
   return (
     <CustomModal
@@ -120,7 +110,7 @@ const CreateFolderModal: React.FC<ICreateFolderModalProps> = ({
             setCreatingFolder(false)
             helpers.resetForm()
             close()
-          } catch (errors) {
+          } catch (errors: any) {
             setCreatingFolder(false)
             if (errors[0].message.includes("Entry with such name can")) {
               helpers.setFieldError("name", t`Folder name is already in use`)
@@ -130,6 +120,7 @@ const CreateFolderModal: React.FC<ICreateFolderModalProps> = ({
           }
           helpers.setSubmitting(false)
         }}
+        enableReinitialize
       >
         <Form>
           <div className={classes.root}>
@@ -160,7 +151,7 @@ const CreateFolderModal: React.FC<ICreateFolderModalProps> = ({
                 placeholder={t`Name`}
                 labelClassName={classes.label}
                 label={t`Folder Name`}
-                ref={inputRef}
+                autoFocus
               />
             </Grid>
             <Grid
diff --git a/packages/storage-ui/src/Components/Modules/FilesList/FilesList.tsx b/packages/storage-ui/src/Components/Modules/FilesList/FilesList.tsx
index bb0f1d9e30..eb3c4b4e04 100644
--- a/packages/storage-ui/src/Components/Modules/FilesList/FilesList.tsx
+++ b/packages/storage-ui/src/Components/Modules/FilesList/FilesList.tsx
@@ -36,7 +36,7 @@ import FileSystemItem from "../FileSystemItem/FileSystemItem"
 import UploadProgressModals from "../UploadProgressModals"
 import DownloadProgressModals from "../DownloadProgressModals"
 import CreateFolderModal from "../CreateFolderModal/CreateFolderModal"
-import UploadFileModule from "../UploadFileModal/UploadFileModal"
+import UploadFileModal from "../UploadFileModal/UploadFileModal"
 import MoveFileModal from "../MoveFileModal/MoveFileModal"
 import { CONTENT_TYPES } from "../../../Utils/Constants"
 import { CSSTheme } from "../../../Themes/types"
@@ -990,7 +990,7 @@ const FilesList = () => {
               modalOpen={createFolderModalOpen}
               close={() => setCreateFolderModalOpen(false)}
             />
-            <UploadFileModule
+            <UploadFileModal
               modalOpen={isUploadModalOpen}
               close={() => setIsUploadModalOpen(false)}
             />
diff --git a/packages/storage-ui/src/Components/Modules/UploadFileModal/UploadFileModal.tsx b/packages/storage-ui/src/Components/Modules/UploadFileModal/UploadFileModal.tsx
index 2538bdd729..0280a90e83 100644
--- a/packages/storage-ui/src/Components/Modules/UploadFileModal/UploadFileModal.tsx
+++ b/packages/storage-ui/src/Components/Modules/UploadFileModal/UploadFileModal.tsx
@@ -74,7 +74,7 @@ interface IUploadFileModuleProps {
   close: () => void
 }
 
-const UploadFileModule = ({ modalOpen, close }: IUploadFileModuleProps) => {
+const UploadFileModal = ({ modalOpen, close }: IUploadFileModuleProps) => {
   const classes = useStyles()
   const [isDoneDisabled, setIsDoneDisabled] = useState(true)
   const { uploadFiles } = useStorage()
@@ -94,7 +94,7 @@ const UploadFileModule = ({ modalOpen, close }: IUploadFileModuleProps) => {
       await uploadFiles(bucket.id, values.files, currentPath)
       refreshContents && refreshContents()
       helpers.resetForm()
-    } catch (errors) {
+    } catch (errors: any) {
       if (errors[0].message.includes("conflict with existing")) {
         helpers.setFieldError("files", t`File/Folder already exists`)
       } else {
@@ -166,4 +166,4 @@ const UploadFileModule = ({ modalOpen, close }: IUploadFileModuleProps) => {
   )
 }
 
-export default UploadFileModule
+export default UploadFileModal
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 1eb4fc2e86..cea79a9528 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1934,16 +1934,13 @@
   resolved "https://registry.yarnpkg.com/@chainsafe/browser-storage-hooks/-/browser-storage-hooks-1.0.1.tgz#26d32cde1999914db755a631e2643823c54959f7"
   integrity sha512-Q4b5gQAZnsRXKeADspd5isqfwwhhXjDk70y++YadufA6EZ3tf340oW0OVszp74KaGEw+CAYFGQR4X7bzpZ3x9Q==
 
-"@chainsafe/files-api-client@1.17.5":
-  version "1.17.5"
-  resolved "https://registry.yarnpkg.com/@chainsafe/files-api-client/-/files-api-client-1.17.5.tgz#35dd9c4baf0833ee9b654495979ed1a66fb02f8d"
-  integrity sha512-5L7bAJr3siPgadDkGwhfo31MCkda01v/rTkLxUta13g6QG+pu0oKDoug+dtm8f9EPoH/rI89L2JHFM7XFrYveQ==
-
-"@chainsafe/files-api-client@^1.18.5":
-  version "1.18.5"
-  resolved "https://registry.yarnpkg.com/@chainsafe/files-api-client/-/files-api-client-1.18.5.tgz#2f4ed5989fa12c0e5823388384f61281a73cf27c"
-  integrity sha512-q/x4+U9NRDLvqIpvloKRPUFMAMsIVlGnt56d3Vv7bw3TISrxyRqGxcTm3pX7XFcqaU3MWeX6Hs01+lrCf+b0GA==
+"@chainsafe/files-api-client@^1.18.10":
+  version "1.18.10"
+  resolved "https://registry.yarnpkg.com/@chainsafe/files-api-client/-/files-api-client-1.18.10.tgz#a359f0d40916afec41ea7ffc8aa4ffc505c25c17"
+  integrity sha512-Rpuk7jDF0cFg53xIrfHsp20aA37QwYd/WDv28JjlhpBI9egbk6oTgVuB9LEiR9mYWb65CIXxfxGvc6WmE3DWTw==
   dependencies:
+    "@redocly/openapi-cli" "^1.0.0-beta.58"
+    "@redocly/openapi-core" "^1.0.0-beta.58"
     redoc-cli "^0.12.3"
 
 "@chainsafe/web3-context@1.1.4":
@@ -2231,7 +2228,7 @@
   resolved "https://registry.yarnpkg.com/@ensdomains/resolver/-/resolver-0.2.4.tgz#c10fe28bf5efbf49bff4666d909aed0265efbc89"
   integrity sha512-bvaTH34PMCbv6anRa9I/0zjLJgY4EuznbEMgbV77JBCQ9KNC46rzi0avuxpOfu+xDjPEtSFGqVEOr5GlUSGudA==
 
-"@ethereumjs/common@^2.0.0", "@ethereumjs/common@^2.4.0":
+"@ethereumjs/common@^2.0.0", "@ethereumjs/common@^2.3.0", "@ethereumjs/common@^2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.4.0.tgz#2d67f6e6ba22246c5c89104e6b9a119fb3039766"
   integrity sha512-UdkhFWzWcJCZVsj1O/H8/oqj/0RVYjLc1OhPjBrQdALAkQHpCp8xXI4WLnuGTADqTdJZww0NtgwG+TRPkXt27w==
@@ -2239,7 +2236,7 @@
     crc-32 "^1.2.0"
     ethereumjs-util "^7.1.0"
 
-"@ethereumjs/tx@^3.0.0":
+"@ethereumjs/tx@^3.0.0", "@ethereumjs/tx@^3.2.1":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.3.0.tgz#14ed1b7fa0f28e1cd61e3ecbdab824205f6a4378"
   integrity sha512-yTwEj2lVzSMgE6Hjw9Oa1DZks/nKTWM8Wn4ykDNapBPua2f4nXO3qKnni86O6lgDj5fVNRqbDsD0yy7/XNGDEA==
@@ -4494,6 +4491,24 @@
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
+"@redocly/openapi-cli@^1.0.0-beta.58":
+  version "1.0.0-beta.61"
+  resolved "https://registry.yarnpkg.com/@redocly/openapi-cli/-/openapi-cli-1.0.0-beta.61.tgz#03dfbf058b2bf85922a0e19adaa2856f111d1b14"
+  integrity sha512-x3s2wdFHTpuO/Wd8y6lrdRzDFVRGxFLdv+0iXR06b1vHWOx/SUzK+7Qslq3Pk6bpge4FFhaJai80pEv/9B05Fw==
+  dependencies:
+    "@redocly/openapi-core" "^1.0.0-beta.61"
+    "@types/node" "^14.11.8"
+    assert-node-version "^1.0.3"
+    chokidar "^3.5.1"
+    colorette "^1.2.0"
+    glob "^7.1.6"
+    glob-promise "^3.4.0"
+    handlebars "^4.7.6"
+    js-yaml "^3.14.1"
+    portfinder "^1.0.26"
+    simple-websocket "^9.0.0"
+    yargs "17.0.1"
+
 "@redocly/openapi-core@^1.0.0-beta.50":
   version "1.0.0-beta.58"
   resolved "https://registry.yarnpkg.com/@redocly/openapi-core/-/openapi-core-1.0.0-beta.58.tgz#d7c9dfe580bd3f115f4e667ba49bc18be3c65ed2"
@@ -4509,6 +4524,21 @@
     node-fetch "^2.6.1"
     yaml-ast-parser "0.0.43"
 
+"@redocly/openapi-core@^1.0.0-beta.58", "@redocly/openapi-core@^1.0.0-beta.61":
+  version "1.0.0-beta.61"
+  resolved "https://registry.yarnpkg.com/@redocly/openapi-core/-/openapi-core-1.0.0-beta.61.tgz#d5fa05a4f625c234d5d83d65986f6d3dba68336a"
+  integrity sha512-/OgtozUxy7SvHVBZ3Iygu6brDTOFTOlkzpDQyykpa0lK2cPBeYjkJP5foBlHKeHl+TvxfPuzh1CSGSShSc+IBg==
+  dependencies:
+    "@redocly/ajv" "^8.6.2"
+    "@types/node" "^14.11.8"
+    colorette "^1.2.0"
+    js-levenshtein "^1.1.6"
+    js-yaml "^3.14.1"
+    lodash.isequal "^4.5.0"
+    minimatch "^3.0.4"
+    node-fetch "^2.6.1"
+    yaml-ast-parser "0.0.43"
+
 "@redocly/react-dropdown-aria@^2.0.11":
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/@redocly/react-dropdown-aria/-/react-dropdown-aria-2.0.12.tgz#2e3af2b1b8e9123487109400d6117f0d4a8445a6"
@@ -4630,6 +4660,11 @@
   resolved "https://registry.yarnpkg.com/@sentry/types/-/types-5.28.0.tgz#242131fef910bded53350a36ffd7df240cfb8dcf"
   integrity sha512-nNhoZEXdqM2xivxJBrLhxtJ2+s6FfKXUw5yBf0Jf/RBrBnH5fggPNImmyfpOoysl72igWcMWk4nnfyP5iDrriQ==
 
+"@sentry/types@^6.11.0":
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/@sentry/types/-/types-6.12.0.tgz#b7395688a79403c6df8d8bb8d81deb8222519853"
+  integrity sha512-urtgLzE4EDMAYQHYdkgC0Ei9QvLajodK1ntg71bGn0Pm84QUpaqpPDfHRU+i6jLeteyC7kWwa5O5W1m/jrjGXA==
+
 "@sentry/utils@5.28.0":
   version "5.28.0"
   resolved "https://registry.yarnpkg.com/@sentry/utils/-/utils-5.28.0.tgz#a30e36afd7094ced8d585c9fde2df2636cca6cf5"
@@ -5504,152 +5539,141 @@
   dependencies:
     "@babel/runtime" "^7.10.2"
 
-"@tkey/common-types@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@tkey/common-types/-/common-types-3.12.0.tgz#aa200b7d9706621e370501cbd92de22408903abb"
-  integrity sha512-5SmZm6T9RU+9SIudFIBStHNWIrw5m7YUsFekpiwioP6UiLtbXKhrSrUmsxH9TjHtJrUUY0azl5wUYDqUYEsn2A==
+"@tkey/common-types@^3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@tkey/common-types/-/common-types-3.14.2.tgz#f7e71b3773e9871d8bf15588c2dfa8b6fbc6bd40"
+  integrity sha512-j5BkBAGKApj7PABfdGXYLpK9PRpz1fRFZXe1qt/RgapCIJ33YC4fudYLvSNVWX9ujUrQsAi929g2q1VxRFVPNg==
   dependencies:
     "@toruslabs/eccrypto" "^1.1.6"
-    "@toruslabs/torus-direct-web-sdk" "^4.8.0"
+    "@toruslabs/torus-direct-web-sdk" "^4.12.0"
     bn.js "^5.2.0"
     elliptic "^6.5.4"
     ts-custom-error "^3.2.0"
-    web3-utils "^1.3.4"
+    web3-utils "^1.3.5"
 
-"@tkey/core@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@tkey/core/-/core-3.12.0.tgz#e59964226ca27c3a0a9212e9322dce7646e406c7"
-  integrity sha512-/HbER9T4zRXzNb2jN+5ApBv1AEaZfedqsZ8+JNQ+wk6d74g/t5D0ejq2H/qddvXfL4w2QZZ29IciTezJWEbyAQ==
+"@tkey/core@^3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@tkey/core/-/core-3.14.2.tgz#45ae48b0363d24de08683680aac3e584ba2d442e"
+  integrity sha512-SPbpPmW/+RhcwBy57/0+FaOespznxLaA+ZKkmDm0M+U72hSzQirGSBwhitjtMFGdbXpIPVi71PVw3vOpn/OHDg==
   dependencies:
-    "@tkey/common-types" "^3.12.0"
+    "@tkey/common-types" "^3.14.2"
     "@toruslabs/eccrypto" "^1.1.6"
     "@toruslabs/http-helpers" "^1.3.7"
     bn.js "^5.2.0"
     elliptic "^6.5.4"
     json-stable-stringify "^1.0.1"
-    web3-utils "^1.3.4"
+    web3-utils "^1.3.5"
 
-"@tkey/default@3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@tkey/default/-/default-3.12.0.tgz#3c74f0ee15d1ed63e1a244f6b8980f60ed6c8622"
-  integrity sha512-xmAr8/dwQB6BUUc2A9hRazJPua7Kezv0oBTLf0XmQjz1e0uigEHJZ7dA53lJO7h8JzTH4gCTTuLI74mB180ANw==
-  dependencies:
-    "@tkey/common-types" "^3.12.0"
-    "@tkey/core" "^3.12.0"
-    "@tkey/private-keys" "^3.12.0"
-    "@tkey/security-questions" "^3.12.0"
-    "@tkey/seed-phrase" "^3.12.0"
-    "@tkey/service-provider-base" "^3.12.0"
-    "@tkey/service-provider-torus" "^3.12.0"
-    "@tkey/share-serialization" "^3.12.0"
-    "@tkey/share-transfer" "^3.12.0"
-    "@tkey/storage-layer-torus" "^3.12.0"
+"@tkey/default@3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@tkey/default/-/default-3.14.2.tgz#837b2f68d408adb38ef68bab672f1e9f8e213e51"
+  integrity sha512-KkkDaRf29ycrW6rGw6xbFuglphYZMxgu1Is4s2LFS44cRGYmdn5kSL9SGKmA8WNra72xYTkPCcuNikyjacCb5A==
+  dependencies:
+    "@tkey/common-types" "^3.14.2"
+    "@tkey/core" "^3.14.2"
+    "@tkey/private-keys" "^3.14.2"
+    "@tkey/security-questions" "^3.14.2"
+    "@tkey/seed-phrase" "^3.14.2"
+    "@tkey/service-provider-base" "^3.14.2"
+    "@tkey/service-provider-torus" "^3.14.2"
+    "@tkey/share-serialization" "^3.14.2"
+    "@tkey/share-transfer" "^3.14.2"
+    "@tkey/storage-layer-torus" "^3.14.2"
     "@toruslabs/eccrypto" "^1.1.6"
     bn.js "^5.2.0"
-    web3-utils "^1.3.4"
+    web3-utils "^1.3.5"
 
-"@tkey/private-keys@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@tkey/private-keys/-/private-keys-3.12.0.tgz#563fe1ed24ddf14de6c619f7204c01c7784315c5"
-  integrity sha512-rtPwxXPNkjMLBOn1q1e4wEaWUipRX2rxlK/Iz/W/r5uEdnzGsJ3SFqIn6OOqYAvXAHkmRfcqB85plLbn3pu3FQ==
+"@tkey/private-keys@^3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@tkey/private-keys/-/private-keys-3.14.2.tgz#7b6f1bbbc54d22a3534647393299d54ec0c0a1f8"
+  integrity sha512-93bBsUrEMyWX/yJQXsH103yM9zOAAKmxvjnqU0cd0v3kT7MC4fMoWSiS0BIW482DrQ6lVPLalV4t/q7nWisnsw==
   dependencies:
-    "@tkey/common-types" "^3.12.0"
+    "@tkey/common-types" "^3.14.2"
     bn.js "^5.2.0"
     randombytes "^2.1.0"
 
-"@tkey/security-questions@3.12.0", "@tkey/security-questions@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@tkey/security-questions/-/security-questions-3.12.0.tgz#769eb916af60a490daff3c95b6d2b143eaf611e9"
-  integrity sha512-EITaEC4IzFaGFgNEjIgStzgWet1h8xuu9eqaMA2fM3Iyi6jjelmigGtZOerim6bfPv+7JcVGLB/2VkQNYHmMag==
+"@tkey/security-questions@3.14.2", "@tkey/security-questions@^3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@tkey/security-questions/-/security-questions-3.14.2.tgz#f1a9fb21b0b0a26424c9e7036d2b42fe73c4fa02"
+  integrity sha512-aTiDAB4AlHFuQHrRTunIQsZcoInocCsV0DlZue3R6eqN22cyhyAC0EDK9Z4iGa6nn4gNDBORZ/jl95Zkn9ueew==
   dependencies:
-    "@tkey/common-types" "^3.12.0"
+    "@tkey/common-types" "^3.14.2"
     bn.js "^5.2.0"
-    web3-utils "^1.3.4"
+    web3-utils "^1.3.5"
 
-"@tkey/seed-phrase@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@tkey/seed-phrase/-/seed-phrase-3.12.0.tgz#fd246e746e278b6e52f4641960051c8627ac7ab4"
-  integrity sha512-9FRSS91qQqD8Hvj69DxR0XC7AyW+tGXJYzqnk9gcr3g4GWagWWDe6GVn0RzY8swn4/FINpeb/OfA0051YxmKSg==
+"@tkey/seed-phrase@^3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@tkey/seed-phrase/-/seed-phrase-3.14.2.tgz#c59f43fcfa3f78b4c51ac6fb2254c598c70eebcb"
+  integrity sha512-4WxJpBjS5wb4K3BXgtlxZ0XyL0Xt1HXKLLoNwW6kP6qbfb/ibPbTxqxR/I+E3h+Z8zZ6Ll7oTa0lo4JC+nUpkA==
   dependencies:
-    "@tkey/common-types" "^3.12.0"
-    bip39 "^3.0.3"
+    "@tkey/common-types" "^3.14.2"
+    bip39 "^3.0.4"
     bn.js "^5.2.0"
     hdkey "^2.0.1"
-    web3-core "^1.3.4"
-    web3-eth "^1.3.4"
-    web3-utils "^1.3.4"
+    web3-core "^1.3.5"
+    web3-eth "^1.3.5"
+    web3-utils "^1.3.5"
 
-"@tkey/service-provider-base@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@tkey/service-provider-base/-/service-provider-base-3.12.0.tgz#57b3c046d7a92b082660d564ae8038632ce2edca"
-  integrity sha512-fTxMZMWtGsOsYbYQdGZoyavD6WgDWabRtNebBVcQTfWKBOglA2/41o4+pSt3rv5jUuhzG//A9XAkeylVM6ntCA==
+"@tkey/service-provider-base@^3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@tkey/service-provider-base/-/service-provider-base-3.14.2.tgz#e1792f98c0bc3d3e498fafcd02db8cf62549cc3a"
+  integrity sha512-Kyt24x6S+4n3+bLxmrIiqBiZgjswjod/QLtl/0ClbMwrkGak4UlrpEz4zugI1s7MrLNb4QP2ZcuuTLIymP2Ipg==
   dependencies:
-    "@tkey/common-types" "^3.12.0"
+    "@tkey/common-types" "^3.14.2"
     bn.js "^5.2.0"
     elliptic "^6.5.4"
 
-"@tkey/service-provider-torus@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@tkey/service-provider-torus/-/service-provider-torus-3.12.0.tgz#b2125ac5108d4c02b8872f1006737d773221085f"
-  integrity sha512-0XPnZD2HkHS/nrggKl0NnJ3w89+WilQogTvjlRNddNyXlFYFtRhGqUKbeVC/+BEkExNi4xiErI75BramZsPy3Q==
+"@tkey/service-provider-torus@^3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@tkey/service-provider-torus/-/service-provider-torus-3.14.2.tgz#5ccb3c091e46eccf577d8d4f63405a10d19ed530"
+  integrity sha512-iHUl9CAZZ7rhZFdIXoAuIe2k8YbF0iBcm6NX5CS5RzYjlZ160Yiq9NUo3ro9JWvc+E/0uumMhk1VGrYGhl4IIg==
   dependencies:
-    "@tkey/common-types" "^3.12.0"
-    "@tkey/service-provider-base" "^3.12.0"
-    "@toruslabs/torus-direct-web-sdk" "^4.8.0"
+    "@tkey/common-types" "^3.14.2"
+    "@tkey/service-provider-base" "^3.14.2"
+    "@toruslabs/torus-direct-web-sdk" "^4.12.0"
     bn.js "^5.2.0"
     elliptic "^6.5.4"
 
-"@tkey/share-serialization@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@tkey/share-serialization/-/share-serialization-3.12.0.tgz#ee548d6bc72127897a9003c07f21ac56f821d18d"
-  integrity sha512-p/ptrCSvG9Dqk37PPUqC1TkYBpfr5KBHcoJS+YWv4LjjwuIvw3tUpt7/ZwtS1j64Vev8ANlFbsyu7JiiD3UirA==
+"@tkey/share-serialization@^3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@tkey/share-serialization/-/share-serialization-3.14.2.tgz#f20b6ee102a65d8113d0d8a884a7e607d1dce337"
+  integrity sha512-W1nkb6hTkzAgnJjqIRDuj1w5AoDIHLCZPl0hrgN6VQnZRgPSfA2iVLhjpe3Uwn+wMUVurjrWi608mwuHQHVU7g==
   dependencies:
-    "@tkey/common-types" "^3.12.0"
+    "@tkey/common-types" "^3.14.2"
     "@types/create-hash" "1.2.2"
     bn.js "^5.2.0"
     create-hash "^1.2.0"
 
-"@tkey/share-transfer@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@tkey/share-transfer/-/share-transfer-3.12.0.tgz#844a046a686be3d50e6ebe21cd22401c4077e32e"
-  integrity sha512-vp+yS0Q6HHMrjNOSx79k5I3KXkckV5qimPVec6L3g8TcBtWwipCack/bRGWwdHWFEP8+JJxC1pTrBaagSyOIJg==
+"@tkey/share-transfer@^3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@tkey/share-transfer/-/share-transfer-3.14.2.tgz#beae019d77f1eaea472bd22e136fe1362be58054"
+  integrity sha512-mzJuq7HHRxGTt6Nrp+fj1MJWDnjttPuJ4SVpdbCIWCV5Lvizj1Z5MmkEQQj0bHeUayFwEMs1eoLquaht3KgtPA==
   dependencies:
-    "@tkey/common-types" "^3.12.0"
+    "@tkey/common-types" "^3.14.2"
     "@toruslabs/eccrypto" "^1.1.6"
+    "@toruslabs/http-helpers" "^1.3.7"
     bn.js "^5.2.0"
 
-"@tkey/storage-layer-torus@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@tkey/storage-layer-torus/-/storage-layer-torus-3.12.0.tgz#6e542faf55a1de0e344b3951a975c4acc8dbf32e"
-  integrity sha512-F10qPh6Rlpx0oUmF7TaJwCVZ8i0fPMB2CbnKrp6N8SevuJu7eB7OVJKzSFkKUW98AJIjH27ESwLrhU7edpl6rg==
+"@tkey/storage-layer-torus@^3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@tkey/storage-layer-torus/-/storage-layer-torus-3.14.2.tgz#36f7291ca6a69f90faec2e0b245f17a85f547215"
+  integrity sha512-t511F8H2dxAgiXrHrgtwBWeETCYdMgCZCn/neAjE1PzMjiCY+hwo0HBd91nC/8/Lw1klKKXHz4ybvoI6ytSjSQ==
   dependencies:
-    "@tkey/common-types" "^3.12.0"
+    "@tkey/common-types" "^3.14.2"
     "@toruslabs/http-helpers" "^1.3.7"
     bn.js "^5.2.0"
     json-stable-stringify "^1.0.1"
-    web3-utils "^1.3.4"
+    web3-utils "^1.3.5"
 
-"@tkey/web-storage@3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@tkey/web-storage/-/web-storage-3.12.0.tgz#970e900ce746338908f046c381e2132cca2f7851"
-  integrity sha512-Zwu9+1zcqsDaxFWsyJLSzGwEjuMCNsFQiXmnbV44yKLRTP4fVNfOwkie5pgEJmCj2BQNagV26YhbH75hqSlL9g==
+"@tkey/web-storage@3.14.2":
+  version "3.14.2"
+  resolved "https://registry.yarnpkg.com/@tkey/web-storage/-/web-storage-3.14.2.tgz#3406a4c0975b8e2f077e67826f0320979c86785f"
+  integrity sha512-0295ZfPV10B/oArehrKu1tYpsnxR+mVJkUNdcIPMGDxV7xBohPj7CHcSkMwXkviIpbyP9ISMFMrC7UIjLhBC4g==
   dependencies:
-    "@tkey/common-types" "^3.12.0"
+    "@tkey/common-types" "^3.14.2"
     "@types/bn.js" "^5.1.0"
     bn.js "^5.2.0"
 
-"@toruslabs/eccrypto@^1.1.5":
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/@toruslabs/eccrypto/-/eccrypto-1.1.5.tgz#c4b9319e02e913fecd90f3f2b98ae2699e7d498e"
-  integrity sha512-7sSAQ9M6b9wzxpIE98yi8zPh3wgdYiVBxvMvCOCb4c65UDOT6lpZyH30qP2fX30PaI+I2Ra+FwjfCCUuJegxfQ==
-  dependencies:
-    acorn "^7.4.0"
-    elliptic "^6.5.3"
-    es6-promise "^4.2.8"
-    nan "^2.14.1"
-  optionalDependencies:
-    secp256k1 "^3.8.0"
-
 "@toruslabs/eccrypto@^1.1.6":
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/@toruslabs/eccrypto/-/eccrypto-1.1.6.tgz#ce877cf00d6f9cf7ab3daa6ac4d6d540110b813b"
@@ -5662,13 +5686,17 @@
   optionalDependencies:
     secp256k1 "^3.8.0"
 
-"@toruslabs/fetch-node-details@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@toruslabs/fetch-node-details/-/fetch-node-details-2.4.0.tgz#4aebc3a4655d60608b2c32393ac570165873bd7e"
-  integrity sha512-aPk3dYdvEe9MuHiqPAdr3QYP3cR2+SB2pU2VFx3F7fjNBfxplfhNYTw+aAkzX54Uwrrr4zSsBjFcst8p9P8vAg==
+"@toruslabs/eccrypto@^1.1.7":
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/@toruslabs/eccrypto/-/eccrypto-1.1.7.tgz#962954d6416f56ca2ba9bb9948cd08bd3b8cd0c4"
+  integrity sha512-zU4GnrH21yDY179fgp5Ovi4YjLdHy3WXM3QHCHAomYNxa03eAw2lxNR2bZ7kb698yk40s4WMrbnauukgabXH4Q==
   dependencies:
-    web3-eth-contract "^1.3.4"
-    web3-utils "^1.3.4"
+    acorn "^8.4.1"
+    elliptic "^6.5.4"
+    es6-promise "^4.2.8"
+    nan "^2.14.2"
+  optionalDependencies:
+    secp256k1 "^3.8.0"
 
 "@toruslabs/fetch-node-details@^2.6.1":
   version "2.6.1"
@@ -5678,12 +5706,13 @@
     web3-eth-contract "^1.3.6"
     web3-utils "^1.3.6"
 
-"@toruslabs/http-helpers@^1.3.5":
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@toruslabs/http-helpers/-/http-helpers-1.3.5.tgz#b278e9e3d5872fc1df4955c864627c8d005c2278"
-  integrity sha512-Bg9AE3lPaPCv9OQAFusQlCE5TxxJCuT3R9ilGMhDiOfWQdtdW0f+cfzoRSQGA1I/lq0V217MNvWeJNLejLdsSA==
+"@toruslabs/fetch-node-details@^2.7.1":
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/@toruslabs/fetch-node-details/-/fetch-node-details-2.7.1.tgz#d234ac8cb232c51f1cc120f3370159ce9bc3d4d2"
+  integrity sha512-6TfTmApe2OoUyST5s1arTH0dGuh6ONvykuEBjT25nO64Qgwu7eJNVMnH+DDH5Kl9PyboEa74ofGqv54l7oHsuA==
   dependencies:
-    deepmerge "^4.2.2"
+    web3-eth-contract "^1.5.2"
+    web3-utils "^1.5.2"
 
 "@toruslabs/http-helpers@^1.3.7":
   version "1.3.7"
@@ -5692,21 +5721,28 @@
   dependencies:
     deepmerge "^4.2.2"
 
-"@toruslabs/torus-direct-web-sdk@4.10.0", "@toruslabs/torus-direct-web-sdk@^4.8.0":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@toruslabs/torus-direct-web-sdk/-/torus-direct-web-sdk-4.10.0.tgz#e15f0bf04acdacee211b736d67370d408eb537ce"
-  integrity sha512-z5LmA0K8uFvXFOl4zmckYnX+6efBfnnalTHNRwvxUHW+fiUamgiesB04IWufWQ4IzWyP7VmbHuNPcINjebrM0A==
+"@toruslabs/http-helpers@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@toruslabs/http-helpers/-/http-helpers-1.4.0.tgz#6d2d4129d1126876b0616b7dffec3f4b339739b5"
+  integrity sha512-lPRhTWeChQunds2CGV70xvaoFMMebZAqZLpTYZjUJfziumQjT12w9HWLIzlRfGFVKoYUsUiZLpGHl0JEwHCcqg==
+  dependencies:
+    deepmerge "^4.2.2"
+
+"@toruslabs/torus-direct-web-sdk@4.15.1", "@toruslabs/torus-direct-web-sdk@^4.12.0":
+  version "4.15.1"
+  resolved "https://registry.yarnpkg.com/@toruslabs/torus-direct-web-sdk/-/torus-direct-web-sdk-4.15.1.tgz#9d1011e8bf93c9d166f1b6d80f86706769159a4d"
+  integrity sha512-InNh2XwQKiFNEId8uEhO3ywDdXT/VMZFz3CZD8DAaUP73cM25kM8bSmS60xWeFsGRFHMULaPnL/4+N02eGzXMg==
   dependencies:
     "@chaitanyapotti/random-id" "^1.0.3"
     "@chaitanyapotti/register-service-worker" "^1.7.3"
-    "@toruslabs/fetch-node-details" "^2.4.0"
-    "@toruslabs/http-helpers" "^1.3.7"
-    "@toruslabs/torus.js" "^2.3.0"
-    broadcast-channel "^3.5.3"
+    "@toruslabs/fetch-node-details" "^2.7.1"
+    "@toruslabs/http-helpers" "^1.4.0"
+    "@toruslabs/torus.js" "^2.5.0"
+    broadcast-channel "^3.7.0"
     deepmerge "^4.2.2"
     jwt-decode "^3.1.2"
     loglevel "^1.7.1"
-    web3-utils "^1.3.4"
+    web3-utils "^1.5.2"
 
 "@toruslabs/torus-embed@^1.10.11":
   version "1.10.19"
@@ -5731,20 +5767,6 @@
     pump "^3.0.0"
     safe-event-emitter "^1.0.1"
 
-"@toruslabs/torus.js@^2.3.0":
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/@toruslabs/torus.js/-/torus.js-2.3.0.tgz#ddad85d1806abe2b30b8103b60e1ecc6e47485d0"
-  integrity sha512-ar/14QE2MST53Cpdtto13L6AlN53IOM0LRS7uuFk7a8TFeI+RbeQquY68lgn3ESEhDPzAxOuLJ3s6M3nBA1arg==
-  dependencies:
-    "@toruslabs/eccrypto" "^1.1.5"
-    "@toruslabs/http-helpers" "^1.3.5"
-    bn.js "^5.1.3"
-    elliptic "^6.5.4"
-    json-stable-stringify "^1.0.1"
-    loglevel "^1.7.1"
-    memory-cache "^0.2.0"
-    web3-utils "^1.3.3"
-
 "@toruslabs/torus.js@^2.3.1":
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/@toruslabs/torus.js/-/torus.js-2.3.1.tgz#e3da24d3bb2cd9613e414275730079db90819b15"
@@ -5759,6 +5781,20 @@
     memory-cache "^0.2.0"
     web3-utils "^1.3.6"
 
+"@toruslabs/torus.js@^2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@toruslabs/torus.js/-/torus.js-2.5.0.tgz#90f7cdfaa6f7b8de88595c97a8a402400d17cd83"
+  integrity sha512-w6gGl6YxJ9w3Kdcavjq5/QFsERe/fcEILsxowkh24NsP9v++ptRGP+Hu7g9ZbTjPyoxZfXbGOj02ToUWtO5x7A==
+  dependencies:
+    "@toruslabs/eccrypto" "^1.1.7"
+    "@toruslabs/http-helpers" "^1.4.0"
+    bn.js "^5.2.0"
+    elliptic "^6.5.4"
+    json-stable-stringify "^1.0.1"
+    loglevel "^1.7.1"
+    memory-cache "^0.2.0"
+    web3-utils "^1.5.2"
+
 "@types/aria-query@^4.2.0":
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.0.tgz#14264692a9d6e2fa4db3df5e56e94b5e25647ac0"
@@ -5838,6 +5874,18 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/filesystem@^0.0.32":
+  version "0.0.32"
+  resolved "https://registry.yarnpkg.com/@types/filesystem/-/filesystem-0.0.32.tgz#307df7cc084a2293c3c1a31151b178063e0a8edf"
+  integrity sha512-Yuf4jR5YYMR2DVgwuCiP11s0xuVRyPKmz8vo6HBY3CGdeMj8af93CFZX+T82+VD1+UqHOxTq31lO7MI7lepBtQ==
+  dependencies:
+    "@types/filewriter" "*"
+
+"@types/filewriter@*":
+  version "0.0.29"
+  resolved "https://registry.yarnpkg.com/@types/filewriter/-/filewriter-0.0.29.tgz#a48795ecadf957f6c0d10e0c34af86c098fa5bee"
+  integrity sha512-BsPXH/irW0ht0Ji6iw/jJaK8Lj3FJemon2gvEqHKpCdDCeemHa+rI3WBGq5z7cDMZgoLjY40oninGxqk+8NzNQ==
+
 "@types/fs-extra@^8.0.1":
   version "8.1.1"
   resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-8.1.1.tgz#1e49f22d09aa46e19b51c0b013cb63d0d923a068"
@@ -5845,6 +5893,14 @@
   dependencies:
     "@types/node" "*"
 
+"@types/glob@*":
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672"
+  integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==
+  dependencies:
+    "@types/minimatch" "*"
+    "@types/node" "*"
+
 "@types/glob@^7.1.1":
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
@@ -6986,6 +7042,11 @@ acorn@^7.1.1, acorn@^7.4.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.0.tgz#e1ad486e6c54501634c6c397c5c121daa383607c"
   integrity sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==
 
+acorn@^8.4.1:
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.5.0.tgz#4512ccb99b3698c752591e9bb4472e38ad43cee2"
+  integrity sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==
+
 address@1.1.2, address@^1.0.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6"
@@ -7393,6 +7454,14 @@ asn1@~0.2.3:
   dependencies:
     safer-buffer "~2.1.0"
 
+assert-node-version@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/assert-node-version/-/assert-node-version-1.0.3.tgz#caea5d1b6a58dbce59661208df1e1b9e4c580f91"
+  integrity sha1-yupdG2pY285ZZhII3x4bnkxYD5E=
+  dependencies:
+    expected-node-version "^1.0.0"
+    semver "^5.0.3"
+
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
@@ -8013,16 +8082,6 @@ babel-plugin-react-docgen@^4.0.0:
     babel-plugin-syntax-jsx "^6.18.0"
     lodash "^4.17.11"
 
-"babel-plugin-styled-components@>= 1.12.0":
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.2.tgz#ebe0e6deff51d7f93fceda1819e9b96aeb88278d"
-  integrity sha512-Vb1R3d4g+MUfPQPVDMCGjm3cDocJEUTR7Xq7QS95JWWeksN1wdFRYpD2kulDgI3Huuaf1CZd+NK4KQmqUFh5dA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.0.0"
-    "@babel/helper-module-imports" "^7.0.0"
-    babel-plugin-syntax-jsx "^6.18.0"
-    lodash "^4.17.11"
-
 babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
@@ -8711,7 +8770,7 @@ bip32@^2.0.5:
     typeforce "^1.11.5"
     wif "^2.0.6"
 
-bip39@^3.0.2:
+bip39@^3.0.2, bip39@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/bip39/-/bip39-3.0.4.tgz#5b11fed966840b5e1b8539f0f54ab6392969b2a0"
   integrity sha512-YZKQlb752TrUWqHWj7XAwCSjYEgGAk+/Aas3V7NyjQeZYsztO8JnQUaCWhcnL4T+jL8nvB8typ2jRPzTlgugNw==
@@ -8721,16 +8780,6 @@ bip39@^3.0.2:
     pbkdf2 "^3.0.9"
     randombytes "^2.0.1"
 
-bip39@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/bip39/-/bip39-3.0.3.tgz#4a8b79067d6ed2e74f9199ac994a2ab61b176760"
-  integrity sha512-P0dKrz4g0V0BjXfx7d9QNkJ/Txcz/k+hM9TnjqjUaXtuOfAvxXSw2rJw8DX0e3ZPwnK/IgDxoRqf0bvoVCqbMg==
-  dependencies:
-    "@types/node" "11.11.6"
-    create-hash "^1.1.0"
-    pbkdf2 "^3.0.9"
-    randombytes "^2.0.1"
-
 bip66@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/bip66/-/bip66-1.1.5.tgz#01fa8748785ca70955d5011217d1b3139969ca22"
@@ -8778,7 +8827,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.0, bn.js@^4.11.1, bn.js@^4.11.6, bn.js@^
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
   integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
 
-bn.js@^5.1.1, bn.js@^5.1.2, bn.js@^5.1.3:
+bn.js@^5.1.1, bn.js@^5.1.2:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
   integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
@@ -8945,16 +8994,17 @@ braces@^3.0.1, braces@~3.0.2:
   dependencies:
     fill-range "^7.0.1"
 
-broadcast-channel@^3.5.3:
-  version "3.5.3"
-  resolved "https://registry.yarnpkg.com/broadcast-channel/-/broadcast-channel-3.5.3.tgz#c75c39d923ae8af6284a893bfdc8bd3996d2dd2d"
-  integrity sha512-OLOXfwReZa2AAAh9yOUyiALB3YxBe0QpThwwuyRHLgpl8bSznSDmV6Mz7LeBJg1VZsMcDcNMy7B53w12qHrIhQ==
+broadcast-channel@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/broadcast-channel/-/broadcast-channel-3.7.0.tgz#2dfa5c7b4289547ac3f6705f9c00af8723889937"
+  integrity sha512-cIAKJXAxGJceNZGTZSBzMxzyOn72cVgPnKx4dc6LRjQgbaJUQqhy5rzL3zbMxkMWsGKkv2hSFkPRMEXfoMZ2Mg==
   dependencies:
     "@babel/runtime" "^7.7.2"
-    detect-node "^2.0.4"
+    detect-node "^2.1.0"
     js-sha3 "0.8.0"
     microseconds "0.2.0"
     nano-time "1.0.0"
+    oblivious-set "1.0.0"
     rimraf "3.0.2"
     unload "2.2.0"
 
@@ -10758,6 +10808,11 @@ data-urls@^1.0.0, data-urls@^1.1.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
+datatransfer-files-promise@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/datatransfer-files-promise/-/datatransfer-files-promise-1.3.1.tgz#8996214c76925b57fe4c03b25a214ceaca76f063"
+  integrity sha512-xwh/RYaCTzUVyZr+rDKO28ew3Nbe4aP1HmEa1rNta9Uq1VNI2+ME0s1JKwsnUKXEpCWL+puGXkpJ6j+3vm/T8g==
+
 date-fns@^2.16.1:
   version "2.16.1"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b"
@@ -11013,6 +11068,11 @@ detect-node@^2.0.4:
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
   integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
 
+detect-node@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
+  integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
+
 detect-port-alt@1.1.6:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275"
@@ -11831,9 +11891,9 @@ eslint-module-utils@^2.4.1:
     pkg-dir "^2.0.0"
 
 eslint-plugin-cypress@^2.11.3:
-  version "2.11.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.11.3.tgz#54ee4067aa8192aa62810cd35080eb577e191ab7"
-  integrity sha512-hOoAid+XNFtpvOzZSNWP5LDrQBEJwbZwjib4XJ1KcRYKjeVj0mAmPmucG4Egli4j/aruv+Ow/acacoloWWCl9Q==
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-cypress/-/eslint-plugin-cypress-2.12.1.tgz#9aeee700708ca8c058e00cdafe215199918c2632"
+  integrity sha512-c2W/uPADl5kospNDihgiLc7n87t5XhUbFDoTl6CfVkmG+kDAb5Ux10V9PoLPu9N+r7znpc+iQlcmAqT1A/89HA==
   dependencies:
     globals "^11.12.0"
 
@@ -11877,6 +11937,11 @@ eslint-plugin-jsx-a11y@6.2.3:
     has "^1.0.3"
     jsx-ast-utils "^2.2.1"
 
+eslint-plugin-no-only-tests@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-no-only-tests/-/eslint-plugin-no-only-tests-2.6.0.tgz#19f6c9620bda02b9b9221b436c5f070e42628d76"
+  integrity sha512-T9SmE/g6UV1uZo1oHAqOvL86XWl7Pl2EpRpnLI8g/bkJu+h7XBCB+1LnubRZ2CUQXj805vh4/CYZdnqtVaEo2Q==
+
 eslint-plugin-react-hooks@^1.6.1:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-1.7.0.tgz#6210b6d5a37205f0b92858f895a4e827020a7d04"
@@ -12420,7 +12485,7 @@ ethereumjs-block@~2.2.0:
     ethereumjs-util "^5.0.0"
     merkle-patricia-tree "^2.1.2"
 
-ethereumjs-common@^1.1.0, ethereumjs-common@^1.3.2, ethereumjs-common@^1.5.0:
+ethereumjs-common@^1.1.0, ethereumjs-common@^1.5.0:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/ethereumjs-common/-/ethereumjs-common-1.5.2.tgz#2065dbe9214e850f2e955a80e650cb6999066979"
   integrity sha512-hTfZjwGX52GS2jcVO6E2sx4YuFnf0Fhp5ylo4pEPhEffNln7vS59Hr5sLnp3/QCazFLluuBZ+FZ6J5HTp0EqCA==
@@ -12499,10 +12564,10 @@ ethereumjs-util@^5.0.0, ethereumjs-util@^5.1.1, ethereumjs-util@^5.1.2, ethereum
     rlp "^2.0.0"
     safe-buffer "^5.1.1"
 
-ethereumjs-util@^7.0.8:
-  version "7.0.10"
-  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.0.10.tgz#5fb7b69fa1fda0acc59634cf39d6b0291180fc1f"
-  integrity sha512-c/xThw6A+EAnej5Xk5kOzFzyoSnw0WX0tSlZ6pAsfGVvQj3TItaDg9b1+Fz1RJXA+y2YksKwQnuzgt1eY6LKzw==
+ethereumjs-util@^7.0.10, ethereumjs-util@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.0.tgz#e2b43a30bfcdbcb432a4eb42bd5f2393209b3fd5"
+  integrity sha512-kR+vhu++mUDARrsMMhsjjzPduRVAeundLGXucGRHF3B4oEltOUspfgCVco4kckucj3FMlLaZHUl9n7/kdmr6Tw==
   dependencies:
     "@types/bn.js" "^5.1.0"
     bn.js "^5.1.2"
@@ -12511,10 +12576,10 @@ ethereumjs-util@^7.0.8:
     ethjs-util "0.1.6"
     rlp "^2.2.4"
 
-ethereumjs-util@^7.1.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.0.tgz#e2b43a30bfcdbcb432a4eb42bd5f2393209b3fd5"
-  integrity sha512-kR+vhu++mUDARrsMMhsjjzPduRVAeundLGXucGRHF3B4oEltOUspfgCVco4kckucj3FMlLaZHUl9n7/kdmr6Tw==
+ethereumjs-util@^7.0.8:
+  version "7.0.10"
+  resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.0.10.tgz#5fb7b69fa1fda0acc59634cf39d6b0291180fc1f"
+  integrity sha512-c/xThw6A+EAnej5Xk5kOzFzyoSnw0WX0tSlZ6pAsfGVvQj3TItaDg9b1+Fz1RJXA+y2YksKwQnuzgt1eY6LKzw==
   dependencies:
     "@types/bn.js" "^5.1.0"
     bn.js "^5.1.2"
@@ -12871,6 +12936,11 @@ expect@^24.9.0:
     jest-message-util "^24.9.0"
     jest-regex-util "^24.9.0"
 
+expected-node-version@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/expected-node-version/-/expected-node-version-1.0.2.tgz#b8d225b9bf676a9e87e06dbd615b52fc9d1e386b"
+  integrity sha1-uNIlub9nap6H4G29YVtS/J0eOGs=
+
 express@^4.17.0, express@^4.17.1:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
@@ -13105,6 +13175,11 @@ fetch-ponyfill@^4.0.0:
   dependencies:
     node-fetch "~1.7.1"
 
+fflate@^0.4.1:
+  version "0.4.8"
+  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.4.8.tgz#f90b82aefbd8ac174213abb338bd7ef848f0f5ae"
+  integrity sha512-FJqqoDBR00Mdj9ppamLa/Y7vxm+PRmNWA67N846RvsoYVMKB4q3y/de5PA7gUmRMYK/8CMz2GDZQmCRN1wBcWA==
+
 fflate@^0.7.1:
   version "0.7.1"
   resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.7.1.tgz#56e87e87c3f2fe01b025fbb1c4ea835990c02fa2"
@@ -13805,6 +13880,13 @@ glob-parent@~5.1.2:
   dependencies:
     is-glob "^4.0.1"
 
+glob-promise@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-3.4.0.tgz#b6b8f084504216f702dc2ce8c9bc9ac8866fdb20"
+  integrity sha512-q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw==
+  dependencies:
+    "@types/glob" "*"
+
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
@@ -14011,7 +14093,7 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
-handlebars@^4.7.7:
+handlebars@^4.7.6, handlebars@^4.7.7:
   version "4.7.7"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
   integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
@@ -17733,6 +17815,11 @@ nan@^2.13.2:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
   integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
 
+nan@^2.14.2:
+  version "2.15.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
+  integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
+
 nano-base32@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/nano-base32/-/nano-base32-1.0.1.tgz#ba548c879efcfb90da1c4d9e097db4a46c9255ef"
@@ -18281,6 +18368,11 @@ object.values@^1.1.0, object.values@^1.1.1:
     function-bind "^1.1.1"
     has "^1.0.3"
 
+oblivious-set@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/oblivious-set/-/oblivious-set-1.0.0.tgz#c8316f2c2fb6ff7b11b6158db3234c49f733c566"
+  integrity sha512-z+pI07qxo4c2CulUHCDf9lcqDlMSo72N/4rLUpRXf6fu+q8vjt8y0xS+Tlf8NTJDdTXHbdeO1n3MlbctwEoXZw==
+
 oboe@2.1.5:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/oboe/-/oboe-2.1.5.tgz#5554284c543a2266d7a38f17e073821fbde393cd"
@@ -19780,6 +19872,15 @@ postcss@^7.0.26:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+posthog-js@^1.13.10:
+  version "1.13.10"
+  resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.13.10.tgz#cba84e1c0ccd4df6a2d793eb8f8550ed271ae859"
+  integrity sha512-XbsmDb3w3sPA7DABBDJfbHiXN5wwgUSyiVjz89EzThcX6NEHwJxWq5WThEWUELNUvciBk4JikmCUigCnutZB1Q==
+  dependencies:
+    "@sentry/types" "^6.11.0"
+    fflate "^0.4.1"
+    rrweb-snapshot "^1.1.7"
+
 preact@10.4.1:
   version "10.4.1"
   resolved "https://registry.yarnpkg.com/preact/-/preact-10.4.1.tgz#9b3ba020547673a231c6cf16f0fbaef0e8863431"
@@ -20186,6 +20287,11 @@ querystringify@^2.1.1:
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
   integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
+queue-microtask@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
+
 quick-lru@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8"
@@ -21683,6 +21789,11 @@ rollup@2.34.2:
   optionalDependencies:
     fsevents "~2.1.2"
 
+rrweb-snapshot@^1.1.7:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/rrweb-snapshot/-/rrweb-snapshot-1.1.8.tgz#57c3a8003a6ebbe4a2e2f5be29e30a47a8b1eb03"
+  integrity sha512-wi8T9IVobEwlns7U2m8cbPfoihsNAMpTI+UBe4KUjclU2N+vtowD2U1Rq8PleiFTDvcseHvkQDmEIZoZLXFzwg==
+
 rsvp@^4.8.4:
   version "4.8.5"
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734"
@@ -21951,7 +22062,7 @@ semaphore@>=1.0.1, semaphore@^1.0.3:
   resolved "https://registry.yarnpkg.com/semaphore/-/semaphore-1.1.0.tgz#aaad8b86b20fe8e9b32b16dc2ee682a8cd26a8aa"
   integrity sha512-O4OZEaNtkMd/K0i6js9SL+gqy0ZCBMgUvlSqHKi4IBdjhe7wB8pwztUk1BbZ1fmrvpwFrPbHzqd2w5pTcJH6LA==
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.3, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -22262,6 +22373,17 @@ simple-swizzle@^0.2.2:
   dependencies:
     is-arrayish "^0.3.1"
 
+simple-websocket@^9.0.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/simple-websocket/-/simple-websocket-9.1.0.tgz#91cbb39eafefbe7e66979da6c639109352786a7f"
+  integrity sha512-8MJPnjRN6A8UCp1I+H/dSFyjwJhp6wta4hsVRhjf8w9qBHRzxYt14RaOcjvQnhD1N4yKOddEjflwMnQM4VtXjQ==
+  dependencies:
+    debug "^4.3.1"
+    queue-microtask "^1.2.2"
+    randombytes "^2.1.0"
+    readable-stream "^3.6.0"
+    ws "^7.4.2"
+
 simplebar-react@^1.0.0-alpha.6:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/simplebar-react/-/simplebar-react-1.2.3.tgz#bd81fa9827628470e9470d06caef6ece15e1c882"
@@ -22985,22 +23107,6 @@ styled-components@^5.3.0:
     shallowequal "^1.1.0"
     supports-color "^5.5.0"
 
-styled-components@^5.3.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/styled-components/-/styled-components-5.3.1.tgz#8a86dcd31bff7049c2ed408bae36fa23f03f071a"
-  integrity sha512-JThv2JRzyH0NOIURrk9iskdxMSAAtCfj/b2Sf1WJaCUsloQkblepy1jaCLX/bYE+mhYo3unmwVSI9I5d9ncSiQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-    "@babel/traverse" "^7.4.5"
-    "@emotion/is-prop-valid" "^0.8.8"
-    "@emotion/stylis" "^0.8.4"
-    "@emotion/unitless" "^0.7.4"
-    babel-plugin-styled-components ">= 1.12.0"
-    css-to-react-native "^3.0.0"
-    hoist-non-react-statics "^3.0.0"
-    shallowequal "^1.1.0"
-    supports-color "^5.5.0"
-
 stylehacks@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
@@ -24254,24 +24360,6 @@ wcwidth@^1.0.1:
   dependencies:
     defaults "^1.0.3"
 
-web3-core-helpers@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.4.tgz#b8549740bf24d5c71688d89c3cdd802d8d36b4e4"
-  integrity sha512-n7BqDalcTa1stncHMmrnFtyTgDhX5Fy+avNaHCf6qcOP2lwTQC8+mdHVBONWRJ6Yddvln+c8oY/TAaB6PzWK0A==
-  dependencies:
-    underscore "1.9.1"
-    web3-eth-iban "1.3.4"
-    web3-utils "1.3.4"
-
-web3-core-helpers@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.5.tgz#9f0ff7ed40befb9f691986e66fd94c828c7b1b13"
-  integrity sha512-HYh3ix5FjysgT0jyzD8s/X5ym0b4BGU7I2QtuBiydMnE0mQEWy7GcT9XKpTySA8FTOHHIAQYvQS07DN/ky3UzA==
-  dependencies:
-    underscore "1.9.1"
-    web3-eth-iban "1.3.5"
-    web3-utils "1.3.5"
-
 web3-core-helpers@1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.3.6.tgz#c478246a9abe4e5456acf42657dac2f7c330be74"
@@ -24281,29 +24369,13 @@ web3-core-helpers@1.3.6:
     web3-eth-iban "1.3.6"
     web3-utils "1.3.6"
 
-web3-core-method@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.4.tgz#6c2812d96dd6c811b9e6c8a5d25050d2c22b9527"
-  integrity sha512-JxmQrujsAWYRRN77P/RY7XuZDCzxSiiQJrgX/60Lfyf7FF1Y0le4L/UMCi7vUJnuYkbU1Kfl9E0udnqwyPqlvQ==
-  dependencies:
-    "@ethersproject/transactions" "^5.0.0-beta.135"
-    underscore "1.9.1"
-    web3-core-helpers "1.3.4"
-    web3-core-promievent "1.3.4"
-    web3-core-subscriptions "1.3.4"
-    web3-utils "1.3.4"
-
-web3-core-method@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.3.5.tgz#995fe12f3b364469e5208a88d72736327b231faa"
-  integrity sha512-hCbmgQ+At6OTuaNGAdjXMsCr4eUCmp9yGKSuaB5HdkNVDpqFso4HHjVxcjNrTyJp3OZnyjKBzQzK1ZWLpLl84Q==
+web3-core-helpers@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-core-helpers/-/web3-core-helpers-1.5.2.tgz#b6bd5071ca099ba3f92dfafb552eed2b70af2795"
+  integrity sha512-U7LJoeUdQ3aY9t5gU7t/1XpcApsWm+4AcW5qKl/44ZxD44w0Dmsq1c5zJm3GuLr/a9MwQfXK4lpmvxVQWHHQRg==
   dependencies:
-    "@ethersproject/transactions" "^5.0.0-beta.135"
-    underscore "1.9.1"
-    web3-core-helpers "1.3.5"
-    web3-core-promievent "1.3.5"
-    web3-core-subscriptions "1.3.5"
-    web3-utils "1.3.5"
+    web3-eth-iban "1.5.2"
+    web3-utils "1.5.2"
 
 web3-core-method@1.3.6:
   version "1.3.6"
@@ -24317,19 +24389,17 @@ web3-core-method@1.3.6:
     web3-core-subscriptions "1.3.6"
     web3-utils "1.3.6"
 
-web3-core-promievent@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.4.tgz#d166239012d91496cdcbe91d5d54071ea818bc73"
-  integrity sha512-V61dZIeBwogg6hhZZUt0qL9hTp1WDhnsdjP++9fhTDr4vy/Gz8T5vibqT2LLg6lQC8i+Py33yOpMeMNjztaUaw==
-  dependencies:
-    eventemitter3 "4.0.4"
-
-web3-core-promievent@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.3.5.tgz#33c34811cc4e2987c56e5192f9a014368c42ca39"
-  integrity sha512-K0j8x3ZJr0eAyNvyUCxOUsSTd4hco0/9nxxlyOuijcsa6YV8l9NL6eqhniWbSyxCJT8ka5Mb7yAiUZe69EDLBQ==
+web3-core-method@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-core-method/-/web3-core-method-1.5.2.tgz#d1d602657be1000a29d11e3ca3bf7bc778dea9a5"
+  integrity sha512-/mC5t9UjjJoQmJJqO5nWK41YHo+tMzFaT7Tp7jDCQsBkinE68KsUJkt0jzygpheW84Zra0DVp6q19gf96+cugg==
   dependencies:
-    eventemitter3 "4.0.4"
+    "@ethereumjs/common" "^2.4.0"
+    "@ethersproject/transactions" "^5.0.0-beta.135"
+    web3-core-helpers "1.5.2"
+    web3-core-promievent "1.5.2"
+    web3-core-subscriptions "1.5.2"
+    web3-utils "1.5.2"
 
 web3-core-promievent@1.3.6:
   version "1.3.6"
@@ -24338,29 +24408,12 @@ web3-core-promievent@1.3.6:
   dependencies:
     eventemitter3 "4.0.4"
 
-web3-core-requestmanager@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.4.tgz#e105ced735c2b5fcedd5771e0ecf9879ae9c373f"
-  integrity sha512-xriouCrhVnVDYQ04TZXdEREZm0OOJzkSEsoN5bu4JYsA6e/HzROeU+RjDpMUxFMzN4wxmFZ+HWbpPndS3QwMag==
-  dependencies:
-    underscore "1.9.1"
-    util "^0.12.0"
-    web3-core-helpers "1.3.4"
-    web3-providers-http "1.3.4"
-    web3-providers-ipc "1.3.4"
-    web3-providers-ws "1.3.4"
-
-web3-core-requestmanager@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.3.5.tgz#c452ea85fcffdf5b82b84c250707b638790d0e75"
-  integrity sha512-9l294U3Ga8qmvv8E37BqjQREfMs+kFnkU3PY28g9DZGYzKvl3V1dgDYqxyrOBdCFhc7rNSpHdgC4PrVHjouspg==
+web3-core-promievent@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-core-promievent/-/web3-core-promievent-1.5.2.tgz#2dc9fe0e5bbeb7c360fc1aac5f12b32d9949a59b"
+  integrity sha512-5DacbJXe98ozSor7JlkTNCy6G8945VunRRkPxMk98rUrg60ECVEM/vuefk1atACzjQsKx6tmLZuHxbJQ64TQeQ==
   dependencies:
-    underscore "1.9.1"
-    util "^0.12.0"
-    web3-core-helpers "1.3.5"
-    web3-providers-http "1.3.5"
-    web3-providers-ipc "1.3.5"
-    web3-providers-ws "1.3.5"
+    eventemitter3 "4.0.4"
 
 web3-core-requestmanager@1.3.6:
   version "1.3.6"
@@ -24374,23 +24427,16 @@ web3-core-requestmanager@1.3.6:
     web3-providers-ipc "1.3.6"
     web3-providers-ws "1.3.6"
 
-web3-core-subscriptions@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.4.tgz#7b00e92bde21f792620cd02e6e508fcf4f4c31d3"
-  integrity sha512-drVHVDxh54hv7xmjIm44g4IXjfGj022fGw4/meB5R2D8UATFI40F73CdiBlyqk3DysP9njDOLTJFSQvEkLFUOg==
-  dependencies:
-    eventemitter3 "4.0.4"
-    underscore "1.9.1"
-    web3-core-helpers "1.3.4"
-
-web3-core-subscriptions@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.3.5.tgz#7c4dc9d559e344d852de2cf01bd0cc13c94023cb"
-  integrity sha512-6mtXdaEB1V1zKLqYBq7RF2W75AK5ZJNGpW6QYC7Zvbku7zq1ZlgaUkJo88JKMWJ7etfaHaYqQ/7VveHk5sQynA==
+web3-core-requestmanager@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-core-requestmanager/-/web3-core-requestmanager-1.5.2.tgz#43ccc00779394c941b28e6e07e217350fd1ded71"
+  integrity sha512-oRVW9OrAsXN2JIZt68OEg1Mb1A9a/L3JAGMv15zLEFEnJEGw0KQsGK1ET2kvZBzvpFd5G0EVkYCnx7WDe4HSNw==
   dependencies:
-    eventemitter3 "4.0.4"
-    underscore "1.9.1"
-    web3-core-helpers "1.3.5"
+    util "^0.12.0"
+    web3-core-helpers "1.5.2"
+    web3-providers-http "1.5.2"
+    web3-providers-ipc "1.5.2"
+    web3-providers-ws "1.5.2"
 
 web3-core-subscriptions@1.3.6:
   version "1.3.6"
@@ -24401,31 +24447,13 @@ web3-core-subscriptions@1.3.6:
     underscore "1.12.1"
     web3-core-helpers "1.3.6"
 
-web3-core@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.4.tgz#2cc7ba7f35cc167f7a0a46fd5855f86e51d34ce8"
-  integrity sha512-7OJu46RpCEfTerl+gPvHXANR2RkLqAfW7l2DAvQ7wN0pnCzl9nEfdgW6tMhr31k3TR2fWucwKzCyyxMGzMHeSA==
-  dependencies:
-    "@types/bn.js" "^4.11.5"
-    "@types/node" "^12.12.6"
-    bignumber.js "^9.0.0"
-    web3-core-helpers "1.3.4"
-    web3-core-method "1.3.4"
-    web3-core-requestmanager "1.3.4"
-    web3-utils "1.3.4"
-
-web3-core@1.3.5, web3-core@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.3.5.tgz#1e9335e6c4549dac09aaa07157242ebd6d097226"
-  integrity sha512-VQjTvnGTqJwDwjKEHSApea3RmgtFGLDSJ6bqrOyHROYNyTyKYjFQ/drG9zs3rjDkND9mgh8foI1ty37Qua3QCQ==
+web3-core-subscriptions@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-core-subscriptions/-/web3-core-subscriptions-1.5.2.tgz#8eaebde44f81fc13c45b555c4422fe79393da9cf"
+  integrity sha512-hapI4rKFk22yurtIv0BYvkraHsM7epA4iI8Np+HuH6P9DD0zj/llaps6TXLM9HyacLBRwmOLZmr+pHBsPopUnQ==
   dependencies:
-    "@types/bn.js" "^4.11.5"
-    "@types/node" "^12.12.6"
-    bignumber.js "^9.0.0"
-    web3-core-helpers "1.3.5"
-    web3-core-method "1.3.5"
-    web3-core-requestmanager "1.3.5"
-    web3-utils "1.3.5"
+    eventemitter3 "4.0.4"
+    web3-core-helpers "1.5.2"
 
 web3-core@1.3.6:
   version "1.3.6"
@@ -24440,23 +24468,18 @@ web3-core@1.3.6:
     web3-core-requestmanager "1.3.6"
     web3-utils "1.3.6"
 
-web3-eth-abi@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.4.tgz#10f5d8b6080dbb6cbaa1bcef7e0c70573da6566f"
-  integrity sha512-PVSLXJ2dzdXsC+R24llIIEOS6S1KhG5qwNznJjJvXZFe3sqgdSe47eNvwUamZtCBjcrdR/HQr+L/FTxqJSf80Q==
-  dependencies:
-    "@ethersproject/abi" "5.0.7"
-    underscore "1.9.1"
-    web3-utils "1.3.4"
-
-web3-eth-abi@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.3.5.tgz#eeffab0a4b318c47b8777de90983ca45614f8173"
-  integrity sha512-bkbG2v/mOW5DH6rF/SEgqunusjYoEi2IBw+fkmD3rzWDaEY7+/i1xY94AeO257d06QMgld75GtV/N+aEs7A6vQ==
+web3-core@1.5.2, web3-core@^1.3.5:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-core/-/web3-core-1.5.2.tgz#ca2b9b1ed3cf84d48b31c9bb91f7628f97cfdcd5"
+  integrity sha512-sebMpQbg3kbh3vHUbHrlKGKOxDWqjgt8KatmTBsTAWj/HwWYVDzeX+2Q84+swNYsm2DrTBVFlqTErFUwPBvyaA==
   dependencies:
-    "@ethersproject/abi" "5.0.7"
-    underscore "1.9.1"
-    web3-utils "1.3.5"
+    "@types/bn.js" "^4.11.5"
+    "@types/node" "^12.12.6"
+    bignumber.js "^9.0.0"
+    web3-core-helpers "1.5.2"
+    web3-core-method "1.5.2"
+    web3-core-requestmanager "1.5.2"
+    web3-utils "1.5.2"
 
 web3-eth-abi@1.3.6:
   version "1.3.6"
@@ -24467,52 +24490,44 @@ web3-eth-abi@1.3.6:
     underscore "1.12.1"
     web3-utils "1.3.6"
 
-web3-eth-accounts@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.3.5.tgz#c23ee748759a6a06d6485a9322b106baa944dcdd"
-  integrity sha512-r3WOR21rgm6Cd6OFnifr3Tizdm5K+g2TsSOPySwX4FrgLrYDL6ck4zr5VXUPz+llpSExb/JztpE8pqEHr3U2NA==
+web3-eth-abi@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-eth-abi/-/web3-eth-abi-1.5.2.tgz#b627eada967f39ae4657ddd61b693cb00d55cb29"
+  integrity sha512-P3bJbDR5wib4kWGfVeBKBVi27T+AiHy4EJxYM6SMNbpm3DboLDdisu9YBd6INMs8rzxgnprBbGmmyn4jKIDKAA==
   dependencies:
+    "@ethersproject/abi" "5.0.7"
+    web3-utils "1.5.2"
+
+web3-eth-accounts@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-eth-accounts/-/web3-eth-accounts-1.5.2.tgz#cf506c21037fa497fe42f1f055980ce4acf83731"
+  integrity sha512-F8mtzxgEhxfLc66vPi0Gqd6mpscvvk7Ua575bsJ1p9J2X/VtuKgDgpWcU4e4LKeROQ+ouCpAG9//0j9jQuij3A==
+  dependencies:
+    "@ethereumjs/common" "^2.3.0"
+    "@ethereumjs/tx" "^3.2.1"
     crypto-browserify "3.12.0"
     eth-lib "0.2.8"
-    ethereumjs-common "^1.3.2"
-    ethereumjs-tx "^2.1.1"
+    ethereumjs-util "^7.0.10"
     scrypt-js "^3.0.1"
-    underscore "1.9.1"
     uuid "3.3.2"
-    web3-core "1.3.5"
-    web3-core-helpers "1.3.5"
-    web3-core-method "1.3.5"
-    web3-utils "1.3.5"
+    web3-core "1.5.2"
+    web3-core-helpers "1.5.2"
+    web3-core-method "1.5.2"
+    web3-utils "1.5.2"
 
-web3-eth-contract@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.5.tgz#b41ecf8612b379c4fb1c614e950135717aa8f919"
-  integrity sha512-WfGVeQquN3D7Qm+KEIN9EI7yrm/fL2V9Y4+YhDWiKA/ns1pX1LYcEWojTOnBXCnPF3tcvoKKL+KBxXg1iKm38A==
-  dependencies:
-    "@types/bn.js" "^4.11.5"
-    underscore "1.9.1"
-    web3-core "1.3.5"
-    web3-core-helpers "1.3.5"
-    web3-core-method "1.3.5"
-    web3-core-promievent "1.3.5"
-    web3-core-subscriptions "1.3.5"
-    web3-eth-abi "1.3.5"
-    web3-utils "1.3.5"
-
-web3-eth-contract@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.3.4.tgz#1ea2dd71be0c4a9cf4772d4f75dbb2fa99751472"
-  integrity sha512-Fvy8ZxUksQY2ePt+XynFfOiSqxgQtMn4m2NJs6VXRl2Inl17qyRi/nIJJVKTcENLocm+GmZ/mxq2eOE5u02nPg==
+web3-eth-contract@1.5.2, web3-eth-contract@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-eth-contract/-/web3-eth-contract-1.5.2.tgz#ffbd799fd01e36596aaadefba323e24a98a23c2f"
+  integrity sha512-4B8X/IPFxZCTmtENpdWXtyw5fskf2muyc3Jm5brBQRb4H3lVh1/ZyQy7vOIkdphyaXu4m8hBLHzeyKkd37mOUg==
   dependencies:
     "@types/bn.js" "^4.11.5"
-    underscore "1.9.1"
-    web3-core "1.3.4"
-    web3-core-helpers "1.3.4"
-    web3-core-method "1.3.4"
-    web3-core-promievent "1.3.4"
-    web3-core-subscriptions "1.3.4"
-    web3-eth-abi "1.3.4"
-    web3-utils "1.3.4"
+    web3-core "1.5.2"
+    web3-core-helpers "1.5.2"
+    web3-core-method "1.5.2"
+    web3-core-promievent "1.5.2"
+    web3-core-subscriptions "1.5.2"
+    web3-eth-abi "1.5.2"
+    web3-utils "1.5.2"
 
 web3-eth-contract@^1.3.6:
   version "1.3.6"
@@ -24529,36 +24544,19 @@ web3-eth-contract@^1.3.6:
     web3-eth-abi "1.3.6"
     web3-utils "1.3.6"
 
-web3-eth-ens@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.3.5.tgz#5a28d23eb402fb1f6964da60ea60641e4d24d366"
-  integrity sha512-5bkpFTXV18CvaVP8kCbLZZm2r1TWUv9AsXH+80yz8bTZulUGvXsBMRfK6e5nfEr2Yv59xlIXCFoalmmySI9EJw==
+web3-eth-ens@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-eth-ens/-/web3-eth-ens-1.5.2.tgz#ecb3708f0e8e2e847e9d89e8428da12c30bba6a4"
+  integrity sha512-/UrLL42ZOCYge+BpFBdzG8ICugaRS4f6X7PxJKO+zAt+TwNgBpjuWfW/ZYNcuqJun/ZyfcTuj03TXqA1RlNhZQ==
   dependencies:
     content-hash "^2.5.2"
     eth-ens-namehash "2.0.8"
-    underscore "1.9.1"
-    web3-core "1.3.5"
-    web3-core-helpers "1.3.5"
-    web3-core-promievent "1.3.5"
-    web3-eth-abi "1.3.5"
-    web3-eth-contract "1.3.5"
-    web3-utils "1.3.5"
-
-web3-eth-iban@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.4.tgz#5eb7a564e0dcf68730d68f48f95dd207cd173d81"
-  integrity sha512-Y7/hLjVvIN/OhaAyZ8L/hxbTqVX6AFTl2RwUXR6EEU9oaLydPcMjAx/Fr8mghUvQS3QJSr+UGubP3W4SkyNiYw==
-  dependencies:
-    bn.js "^4.11.9"
-    web3-utils "1.3.4"
-
-web3-eth-iban@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.3.5.tgz#dff1e37864e23a3387016ec4db96cdc290a6fbd6"
-  integrity sha512-x+BI/d2Vt0J1cKK8eFd4W0f1TDjgEOYCwiViTb28lLE+tqrgyPqWDA+l6UlKYLF/yMFX3Dym4ofcCOtgcn4q4g==
-  dependencies:
-    bn.js "^4.11.9"
-    web3-utils "1.3.5"
+    web3-core "1.5.2"
+    web3-core-helpers "1.5.2"
+    web3-core-promievent "1.5.2"
+    web3-eth-abi "1.5.2"
+    web3-eth-contract "1.5.2"
+    web3-utils "1.5.2"
 
 web3-eth-iban@1.3.6:
   version "1.3.6"
@@ -24568,45 +24566,52 @@ web3-eth-iban@1.3.6:
     bn.js "^4.11.9"
     web3-utils "1.3.6"
 
-web3-eth-personal@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.3.5.tgz#bc5d5b900bc4824139af2ef01eaf8e9855c644ba"
-  integrity sha512-xELQHNZ8p3VoO1582ghCaq+Bx7pSkOOalc6/ACOCGtHDMelqgVejrmSIZGScYl+k0HzngmQAzURZWQocaoGM1g==
+web3-eth-iban@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-eth-iban/-/web3-eth-iban-1.5.2.tgz#f390ad244ef8a6c94de7c58736b0b80a484abc8e"
+  integrity sha512-C04YDXuSG/aDwOHSX+HySBGb0KraiAVt+/l1Mw7y/fCUrKC/K0yYzMYqY/uYOcvLtepBPsC4ZfUYWUBZ2PO8Vg==
   dependencies:
-    "@types/node" "^12.12.6"
-    web3-core "1.3.5"
-    web3-core-helpers "1.3.5"
-    web3-core-method "1.3.5"
-    web3-net "1.3.5"
-    web3-utils "1.3.5"
+    bn.js "^4.11.9"
+    web3-utils "1.5.2"
 
-web3-eth@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.3.5.tgz#2a3d0db870ef7921942a5d798ba0569175cc4de1"
-  integrity sha512-5qqDPMMD+D0xRqOV2ePU2G7/uQmhn0FgCEhFzKDMHrssDQJyQLW/VgfA0NLn64lWnuUrGnQStGvNxrWf7MgsfA==
+web3-eth-personal@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-eth-personal/-/web3-eth-personal-1.5.2.tgz#043335a19ab59e119ba61e3bd6c3b8cde8120490"
+  integrity sha512-nH5N2GiVC0C5XeMEKU16PeFP3Hb3hkPvlR6Tf9WQ+pE+jw1c8eaXBO1CJQLr15ikhUF3s94ICyHcfjzkDsmRbA==
   dependencies:
-    underscore "1.9.1"
-    web3-core "1.3.5"
-    web3-core-helpers "1.3.5"
-    web3-core-method "1.3.5"
-    web3-core-subscriptions "1.3.5"
-    web3-eth-abi "1.3.5"
-    web3-eth-accounts "1.3.5"
-    web3-eth-contract "1.3.5"
-    web3-eth-ens "1.3.5"
-    web3-eth-iban "1.3.5"
-    web3-eth-personal "1.3.5"
-    web3-net "1.3.5"
-    web3-utils "1.3.5"
-
-web3-net@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.3.5.tgz#06e3465a9fbbeec1240160e2fd66ddb07b6af944"
-  integrity sha512-usbFbuUpKK8s7jPLGoUzi/WpNnefGFPTj948aJv8BZ04UQA4L/XS5NNkkhk358zNMmhGfEFW8wrWy+0Oy0njtA==
+    "@types/node" "^12.12.6"
+    web3-core "1.5.2"
+    web3-core-helpers "1.5.2"
+    web3-core-method "1.5.2"
+    web3-net "1.5.2"
+    web3-utils "1.5.2"
+
+web3-eth@^1.3.5:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-eth/-/web3-eth-1.5.2.tgz#0f6470df60a2a7d04df4423ca7721db8ed5ad72b"
+  integrity sha512-DwWQ6TCOUqvYyo7T20S7HpQDPveNHNqOn2Q2F3E8ZFyEjmqT4XsGiwvm08kB/VgQ4e/ANyq/i8PPFSYMT8JKHg==
+  dependencies:
+    web3-core "1.5.2"
+    web3-core-helpers "1.5.2"
+    web3-core-method "1.5.2"
+    web3-core-subscriptions "1.5.2"
+    web3-eth-abi "1.5.2"
+    web3-eth-accounts "1.5.2"
+    web3-eth-contract "1.5.2"
+    web3-eth-ens "1.5.2"
+    web3-eth-iban "1.5.2"
+    web3-eth-personal "1.5.2"
+    web3-net "1.5.2"
+    web3-utils "1.5.2"
+
+web3-net@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-net/-/web3-net-1.5.2.tgz#58915d7e2dad025d2a08f02c865f3abe61c48eff"
+  integrity sha512-VEc9c+jfoERhbJIxnx0VPlQDot8Lm4JW/tOWFU+ekHgIiu2zFKj5YxhURIth7RAbsaRsqCb79aE+M0eI8maxVQ==
   dependencies:
-    web3-core "1.3.5"
-    web3-core-method "1.3.5"
-    web3-utils "1.3.5"
+    web3-core "1.5.2"
+    web3-core-method "1.5.2"
+    web3-utils "1.5.2"
 
 web3-provider-engine@15.0.4:
   version "15.0.4"
@@ -24692,22 +24697,6 @@ web3-provider-engine@^15.0.4:
     xhr "^2.2.0"
     xtend "^4.0.1"
 
-web3-providers-http@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.4.tgz#89389e18e27148faa2fef58842740ffadbdda8cc"
-  integrity sha512-aIg/xHXvxpqpFU70sqfp+JC3sGkLfAimRKTUhG4oJZ7U+tTcYTHoxBJj+4A3Id4JAoKiiv0k1/qeyQ8f3rMC3g==
-  dependencies:
-    web3-core-helpers "1.3.4"
-    xhr2-cookies "1.1.0"
-
-web3-providers-http@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.5.tgz#cdada6fb342e08fd75aea249fceb6eee467beffc"
-  integrity sha512-ZQOmceFjcajEZdiuqciXjijwIYWNmEJ1oxMtbrwB2eGxHRCMXEH2xGRUZuhOFNF88yQC/VXVi14yvYg5ZlFJlA==
-  dependencies:
-    web3-core-helpers "1.3.5"
-    xhr2-cookies "1.1.0"
-
 web3-providers-http@1.3.6:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.3.6.tgz#36e8724a7424d52827819d53fd75dbf31f5422c2"
@@ -24716,23 +24705,13 @@ web3-providers-http@1.3.6:
     web3-core-helpers "1.3.6"
     xhr2-cookies "1.1.0"
 
-web3-providers-ipc@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.4.tgz#b963518989b1b7847063cdd461ff73b83855834a"
-  integrity sha512-E0CvXEJElr/TIlG1YfJeO3Le5NI/4JZM+1SsEdiPIfBUAJN18oOoum138EBGKv5+YaLKZUtUuJSXWjIIOR/0Ig==
-  dependencies:
-    oboe "2.1.5"
-    underscore "1.9.1"
-    web3-core-helpers "1.3.4"
-
-web3-providers-ipc@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.3.5.tgz#2f5536abfe03f3824e00dedc614d8f46db72b57f"
-  integrity sha512-cbZOeb/sALiHjzMolJjIyHla/J5wdL2JKUtRO66Nh/uLALBCpU8JUgzNvpAdJ1ae3+A33+EdFStdzuDYHKtQew==
+web3-providers-http@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-providers-http/-/web3-providers-http-1.5.2.tgz#94f95fe5572ca54aa2c2ffd42c63956436c9eb0a"
+  integrity sha512-dUNFJc9IMYDLZnkoQX3H4ZjvHjGO6VRVCqrBrdh84wPX/0da9dOA7DwIWnG0Gv3n9ybWwu5JHQxK4MNQ444lyA==
   dependencies:
-    oboe "2.1.5"
-    underscore "1.9.1"
-    web3-core-helpers "1.3.5"
+    web3-core-helpers "1.5.2"
+    xhr2-cookies "1.1.0"
 
 web3-providers-ipc@1.3.6:
   version "1.3.6"
@@ -24743,25 +24722,13 @@ web3-providers-ipc@1.3.6:
     underscore "1.12.1"
     web3-core-helpers "1.3.6"
 
-web3-providers-ws@1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.4.tgz#b94c2e0ec51a0c472abdec53a472b5bf8176bec1"
-  integrity sha512-WBd9hk2fUAdrbA3kUyUk94ZeILtE6txLeoVVvIKAw2bPegx+RjkLyxC1Du0oceKgQ/qQWod8CCzl1E/GgTP+MQ==
-  dependencies:
-    eventemitter3 "4.0.4"
-    underscore "1.9.1"
-    web3-core-helpers "1.3.4"
-    websocket "^1.0.32"
-
-web3-providers-ws@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.3.5.tgz#7f841ec79358d90c4a803d1291157b5ffb15aeb7"
-  integrity sha512-zeZ4LMvKhYaJBDCqA//Bzgp4r/T0tNq5U/xvN0axA4YflzF7yqlsbzGwCkcZYDbrUaK3Ltl2uOmvwjbWALOZ1A==
+web3-providers-ipc@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-providers-ipc/-/web3-providers-ipc-1.5.2.tgz#68a516883c998eeddf60df4cead77baca4fb4aaa"
+  integrity sha512-SJC4Sivt4g9LHKlRy7cs1jkJgp7bjrQeUndE6BKs0zNALKguxu6QYnzbmuHCTFW85GfMDjhvi24jyyZHMnBNXQ==
   dependencies:
-    eventemitter3 "4.0.4"
-    underscore "1.9.1"
-    web3-core-helpers "1.3.5"
-    websocket "^1.0.32"
+    oboe "2.1.5"
+    web3-core-helpers "1.5.2"
 
 web3-providers-ws@1.3.6:
   version "1.3.6"
@@ -24773,6 +24740,15 @@ web3-providers-ws@1.3.6:
     web3-core-helpers "1.3.6"
     websocket "^1.0.32"
 
+web3-providers-ws@1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-providers-ws/-/web3-providers-ws-1.5.2.tgz#d336a93ed608b40cdcadfadd1f1bc8d32ea046e0"
+  integrity sha512-xy9RGlyO8MbJDuKv2vAMDkg+en+OvXG0CGTCM2BTl6l1vIdHpCa+6A/9KV2rK8aU9OBZ7/Pf+Y19517kHVl9RA==
+  dependencies:
+    eventemitter3 "4.0.4"
+    web3-core-helpers "1.5.2"
+    websocket "^1.0.32"
+
 web3-utils@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.2.1.tgz#21466e38291551de0ab34558de21512ac4274534"
@@ -24786,24 +24762,10 @@ web3-utils@1.2.1:
     underscore "1.9.1"
     utf8 "3.0.0"
 
-web3-utils@1.3.4, web3-utils@^1.3.3, web3-utils@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.4.tgz#9b1aa30d7549f860b573e7bb7e690999e7192198"
-  integrity sha512-/vC2v0MaZNpWooJfpRw63u0Y3ag2gNjAWiLtMSL6QQLmCqCy4SQIndMt/vRyx0uMoeGt1YTwSXEcHjUzOhLg0A==
-  dependencies:
-    bn.js "^4.11.9"
-    eth-lib "0.2.8"
-    ethereum-bloom-filters "^1.0.6"
-    ethjs-unit "0.1.6"
-    number-to-bn "1.7.0"
-    randombytes "^2.1.0"
-    underscore "1.9.1"
-    utf8 "3.0.0"
-
-web3-utils@1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.5.tgz#14ee2ff1a7a226867698d6eaffd21aa97aed422e"
-  integrity sha512-5apMRm8ElYjI/92GHqijmaLC+s+d5lgjpjHft+rJSs/dsnX8I8tQreqev0dmU+wzU+2EEe4Sx9a/OwGWHhQv3A==
+web3-utils@1.3.6, web3-utils@^1.3.6:
+  version "1.3.6"
+  resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.6.tgz#390bc9fa3a7179746963cfaca55bb80ac4d8dc10"
+  integrity sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg==
   dependencies:
     bn.js "^4.11.9"
     eth-lib "0.2.8"
@@ -24811,13 +24773,13 @@ web3-utils@1.3.5:
     ethjs-unit "0.1.6"
     number-to-bn "1.7.0"
     randombytes "^2.1.0"
-    underscore "1.9.1"
+    underscore "1.12.1"
     utf8 "3.0.0"
 
-web3-utils@1.3.6, web3-utils@^1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.3.6.tgz#390bc9fa3a7179746963cfaca55bb80ac4d8dc10"
-  integrity sha512-hHatFaQpkQgjGVER17gNx8u1qMyaXFZtM0y0XLGH1bzsjMPlkMPLRcYOrZ00rOPfTEuYFOdrpGOqZXVmGrMZRg==
+web3-utils@1.5.2, web3-utils@^1.3.5, web3-utils@^1.5.2:
+  version "1.5.2"
+  resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.5.2.tgz#150982dcb1918ffc54eba87528e28f009ebc03aa"
+  integrity sha512-quTtTeQJHYSxAwIBOCGEcQtqdVcFWX6mCFNoqnp+mRbq+Hxbs8CGgO/6oqfBx4OvxIOfCpgJWYVHswRXnbEu9Q==
   dependencies:
     bn.js "^4.11.9"
     eth-lib "0.2.8"
@@ -24825,7 +24787,6 @@ web3-utils@1.3.6, web3-utils@^1.3.6:
     ethjs-unit "0.1.6"
     number-to-bn "1.7.0"
     randombytes "^2.1.0"
-    underscore "1.12.1"
     utf8 "3.0.0"
 
 web3-utils@^1.0.0-beta.31:
@@ -25483,6 +25444,11 @@ ws@^6.1.2, ws@^6.2.1:
   dependencies:
     async-limiter "~1.0.0"
 
+ws@^7.4.2:
+  version "7.5.5"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.5.tgz#8b4bc4af518cfabd0473ae4f99144287b33eb881"
+  integrity sha512-BAkMFcAzl8as1G/hArkxOxq3G7pjUqQ3gzYbLL0/5zNkph70e+lCoxBGnm6AW1+/aiNeV4fnKqZ8m4GZewmH2w==
+
 wsrun@^5.2.4:
   version "5.2.4"
   resolved "https://registry.yarnpkg.com/wsrun/-/wsrun-5.2.4.tgz#6eb6c3ccd3327721a8df073a5e3578fb0dea494e"
@@ -25666,6 +25632,19 @@ yargs@13.2.4:
     y18n "^4.0.0"
     yargs-parser "^13.1.0"
 
+yargs@17.0.1:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"
+  integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yargs@^13.0.0, yargs@^13.2.4, yargs@^13.3.0, yargs@^13.3.2:
   version "13.3.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"