Release - 2022-03-04 (#2006)

* span and svg fix (#1980) * Link to form instead of Discord (#1977) * Release to PROD - 1.1.1 (#1594) * [Files] - Show current bucket decryption key (#1534) * show current bucket decryption key * lingui extract Co-authored-by: GitHub Actions <actions@github.com> * [Files] - Get admin public key from the api (#1485) * bump * use api client * merge dev * lingui extract * support several keys * wih scroll because pub/decryption key are long Co-authored-by: GitHub Actions <actions@github.com> * Add lint rules for test debug commands (#1535) * prevent double opening (#1538) * Add test coverage for storage summary adjustments (#1536) * Translated using Weblate (French) (#1540) Currently translated at 100.0% (278 of 278 strings) Translation: ChainSafe Files/Chainsafe Files user interface Translate-URL: https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/fr/ Co-authored-by: J. Lavoie <j.lavoie@net-c.ca> * Better colors for dark mode select and tagsinput components (#1550) * better colors for dark mode * lingui extract * fix typo Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com> Co-authored-by: GitHub Actions <actions@github.com> * Filter out current bucket (#1548) * filter out current bucket * Update packages/files-ui/src/Components/Modules/FileBrowsers/ShareModal.tsx * fix color (#1555) * Fix user lookup spamming the api, and throwing (#1553) * oh yeaah * lingui extract * lingui extract * Apply suggestions from code review * lingui extract Co-authored-by: GitHub Actions <actions@github.com> Co-authored-by: Tanmoy Basak Anjan <tanmoy3399@gmail.com> * Upgrade Torus dependencies (#1549) * [wip] update dependencies * Revert "[wip] update dependencies" This reverts commit 04b593b. * update torus dependencies * fix storage test Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com> * reset fields for shared folders (#1577) * reset forms and fix a couple error types (#1578) * Translations update from Weblate (#1557) * Translated using Weblate (French) Currently translated at 100.0% (281 of 281 strings) Translation: ChainSafe Files/Chainsafe Files user interface Translate-URL: https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/fr/ * Translated using Weblate (German) Currently translated at 69.7% (196 of 281 strings) Translation: ChainSafe Files/Chainsafe Files user interface Translate-URL: https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/de/ Co-authored-by: J. Lavoie <j.lavoie@net-c.ca> * hide when ther's no menu item (#1576) * Add "maintenance" label to weblate PRs automatically (#1581) * Upgrade api client and fix issue with shared folder renaming (#1582) * upgrade api client and fix issue * Update packages/files-ui/src/Contexts/FilesContext.tsx * lingui extract Co-authored-by: GitHub Actions <actions@github.com> * run lint --fix (#1585) * Gaming dashboard - API keys as cards (#1575) * Dashboard cards done * lingui extract * extra padding * Apply suggestions from code review Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com> * lingui extract * Feedback * Removed link * Apply suggestions from code review * Made warning bigger * lingui extract Co-authored-by: GitHub Actions <actions@github.com> Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com> Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com> * New navigations buttons (#1574) * wip * lingui extract * center and add posthog * Update .eslintrc.json * Add team feature fake door (#1587) * wip * modal and tracking * use data-posthog instead Co-authored-by: GitHub Actions <actions@github.com> * fix tertiary buttons (#1592) * Posthog identify user on login (#1590) * identify user on login * fix effect deps Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com> Co-authored-by: GitHub Actions <actions@github.com> Co-authored-by: Andrew Snaith <asnaith@users.noreply.github.com> Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: J. Lavoie <j.lavoie@net-c.ca> Co-authored-by: Tanmoy Basak Anjan <tanmoy3399@gmail.com> Co-authored-by: Ryan Noble <ryanjnoble@gmail.com> * link to form Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com> Co-authored-by: GitHub Actions <actions@github.com> Co-authored-by: Andrew Snaith <asnaith@users.noreply.github.com> Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: J. Lavoie <j.lavoie@net-c.ca> Co-authored-by: Tanmoy Basak Anjan <tanmoy3399@gmail.com> Co-authored-by: Ryan Noble <ryanjnoble@gmail.com> Co-authored-by: Michael Yankelev <myankelev@gmail.com> * Make Storage tests pass (#1965) * make tests pass * mute logs * cid pass with a hack * skip the unpinning * Focus colors on buttons (#1978) * removed conditional buttons * removed conditional buttons * added text focus colors * sorted out buttons * preview buttons * lingui extract * colors fixed * button colors update * theme preview colors Co-authored-by: GitHub Actions <actions@github.com> Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com> * Fix sorting for shared folders (#1990) * fix sort * fix lgtm * Translations update from Hosted Weblate (#1989) * Translated using Weblate (French) Currently translated at 100.0% (399 of 399 strings) Translation: ChainSafe Files/Chainsafe Files user interface Translate-URL: https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/fr/ * Translated using Weblate (French) Currently translated at 100.0% (399 of 399 strings) Translation: ChainSafe Files/Chainsafe Files user interface Translate-URL: https://hosted.weblate.org/projects/chainsafe-files/chainsafe-files-user-interface/fr/ Co-authored-by: J. Lavoie <j.lavoie@net-c.ca> Co-authored-by: Thibaut <weblate@thib.top> * Billing storage (#1983) * without notif for now * with storage plans * fix routing * lingui extract * proper blue * update card modal full width * bring back restriction Co-authored-by: GitHub Actions <actions@github.com> Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com> * [Files] Set icon color in mobile sorting menu (#1993) * set icon color * lingui extract Co-authored-by: GitHub Actions <actions@github.com> * Pdf viewer fixes (#1995) * pdf viewer responsive * lingui extract Co-authored-by: GitHub Actions <actions@github.com> * Refactor shared folder cretation and edition (#1996) * fell down the rapid hole * lingui extract Co-authored-by: GitHub Actions <actions@github.com> * one liner (#2000) * Handle successful local Crypto Payment (#1976) * close dialog once payment tx has been mined * remove console logs * add success screen * add success modal * lingui extract * Apply suggestions from code review Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com> * lingui extract * missing brace * whitespace * make ConfirmPlan methods nullable * update success text for crypto * lingui extract * disable payment confirmation if no card is available Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com> Co-authored-by: GitHub Actions <actions@github.com> Co-authored-by: Tanmoy Basak Anjan <tanmoy3399@gmail.com> * Handle overflow on grid names (#2003) * ellipsis on grid nnames * widths ready * z index changed (#2002) Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com> * Use toggle for account visibility (#2001) * toggle * spacing * lingui extract Co-authored-by: GitHub Actions <actions@github.com> Co-authored-by: Michael Yankelev <12774278+FSM1@users.noreply.github.com> * Update product names (#1991) * update product translations * add in production Ids * lingui extract * update tests * fix typo * more test updates * more test updates * fix more tests * remove description from lookup * lingui extract * remove description from map * remove description from downgrade details Co-authored-by: GitHub Actions <actions@github.com> Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com> * fix dialog closing instead of going to success (#2007) * Resolve yarn.lock issue in gh actions test jobs (#2008) * update tkey (#2009) * update tkey and wire up - wip * fix some of the glitches Co-authored-by: Tanmoy Basak Anjan <tanmoy3399@gmail.com> Co-authored-by: Thibaut Sardan <33178835+Tbaut@users.noreply.github.com> Co-authored-by: GitHub Actions <actions@github.com> Co-authored-by: Andrew Snaith <asnaith@users.noreply.github.com> Co-authored-by: Weblate (bot) <hosted@weblate.org> Co-authored-by: J. Lavoie <j.lavoie@net-c.ca> Co-authored-by: Ryan Noble <ryanjnoble@gmail.com> Co-authored-by: Weblate (bot) <noreply@weblate.org> Co-authored-by: Thibaut <weblate@thib.top>
ChainSafe · Mar 9, 2022 · 66cd456 · 66cd456
1 parent dbe1ade
commit 66cd456
Show file tree

Hide file tree

Showing 94 changed files with 5,341 additions and 753 deletions.
diff --git a/.github/workflows/test-files-on-demand.yml b/.github/workflows/test-files-on-demand.yml
@@ -15,7 +15,7 @@ jobs:
             **/node_modules
             ~/.cache/Cypress
             **/build
-          key: ${{ runner.os }}-node_modules-files-build-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-node_modules-files-build-${{ hashFiles('./yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-node_modules-build-
 

diff --git a/.github/workflows/test-files.yml b/.github/workflows/test-files.yml
@@ -24,7 +24,7 @@ jobs:
             **/node_modules
             ~/.cache/Cypress
             **/build
-          key: ${{ runner.os }}-node_modules-files-build-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-node_modules-files-build-${{ hashFiles('./yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-node_modules-build-
 

diff --git a/.github/workflows/test-storage.yml b/.github/workflows/test-storage.yml
@@ -24,7 +24,7 @@ jobs:
             **/node_modules
             ~/.cache/Cypress
             **/build
-          key: ${{ runner.os }}-node_modules-build-storage-${{ hashFiles('**/yarn.lock') }}
+          key: ${{ runner.os }}-node_modules-build-storage-${{ hashFiles('./yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-node_modules-build-
 

diff --git a/packages/common-components/src/Button/Button.tsx b/packages/common-components/src/Button/Button.tsx
@@ -19,7 +19,6 @@ const useStyles = makeStyles(
         border: "none",
         outline: "none",
         "& svg": {
-          transitionDuration: `${animation.transform}ms`,
           margin: `${0}px ${constants.generalUnit / 2}px 0`
         },
         "&.large": {
@@ -49,12 +48,10 @@ const useStyles = makeStyles(
         color: "inherit",
         textDecoration: "underline",
         cursor: "pointer",
-        transitionDuration: `${animation.transform}ms`,
         border: "none",
         background: "none",
         outline: "none",
         "& svg": {
-          transitionDuration: `${animation.transform}ms`,
           margin: `${0}px ${constants.generalUnit / 2}px 0`
         }
       },
@@ -94,7 +91,7 @@ const useStyles = makeStyles(
           fill: palette.common.white.main
         },
         "&:hover": {
-          backgroundColor: palette.primary.hover,
+          backgroundColor: palette.primary.main,
           color: palette.common.white.main,
           ...overrides?.Button?.variants?.secondary?.hover
         },
@@ -114,12 +111,15 @@ const useStyles = makeStyles(
         backgroundColor: "transparent",
         color: palette.additional["gray"][9],
         "&:hover": {
+          color: palette.primary.main,
           ...overrides?.Button?.variants?.text?.hover
         },
         "&:focus": {
+          color: palette.primary.main,
           ...overrides?.Button?.variants?.text?.focus
         },
         "&:active": {
+          color: palette.primary.main,
           ...overrides?.Button?.variants?.text?.active
         },
         ...overrides?.Button?.variants?.text?.root

diff --git a/packages/common-components/src/Icons/SvgIcon.tsx b/packages/common-components/src/Icons/SvgIcon.tsx
@@ -4,15 +4,14 @@ import { capitalize } from "../utils/stringUtils"
 import { ITheme, makeStyles, createStyles } from "@chainsafe/common-theme"
 
 const useStyles = makeStyles(
-  ({ animation, palette, constants, overrides }: ITheme) =>
+  ({  palette, constants, overrides }: ITheme) =>
     createStyles({
       root: {
         userSelect: "none",
         width: "1em",
         height: "1em",
         display: "inline-block",
         fontSize: "1.5em",
-        transition: `all ${animation.transform}ms`,
         ...overrides?.Icons?.root
       },
       colorPrimary: {

diff --git a/packages/common-components/src/ToggleSwitch/ToggleSwitch.tsx b/packages/common-components/src/ToggleSwitch/ToggleSwitch.tsx
@@ -1,6 +1,6 @@
 import { createStyles, ITheme, makeStyles } from "@chainsafe/common-theme"
 import clsx from "clsx"
-import React, { ReactNode, useCallback, useMemo, useState } from "react"
+import React, { ReactNode, useCallback, useEffect, useMemo, useState } from "react"
 import { Typography } from "../Typography"
 
 interface IStyleProps {
@@ -120,6 +120,10 @@ const ToggleSwitch = ({ injectedClasses, disabled, left, right, onChange, value,
   const classes = useStyles({ size: resolvedSize })
   const [side, setSide] = useState<"left" | "right">(value && right.value === value ? "right" : "left")
 
+  useEffect(() => {
+    setSide(value && right.value === value ?  "right" : "left")
+  }, [right.value, value])
+
   const onToggle = useCallback(() => {
     if (disabled) return
     if (side === "left") {

diff --git a/packages/files-ui/cypress/support/page-objects/modals/billing/planChangeSuccessModal.ts b/packages/files-ui/cypress/support/page-objects/modals/billing/planChangeSuccessModal.ts
@@ -4,7 +4,6 @@ export const planChangeSuccessModal = {
   planChangeSuccessSubheader: () => cy.get("[data-cy=label-plan-changed-successfully]"),
   featuresSummaryLabel: () => cy.get("[data-cy=label-features-summary-title]"),
   newStorageCapacityLabel: () => cy.get("[data-cy=label-new-plan-capacity]"),
-  newPlanNameLabel: () => cy.get("[data-cy=label-new-plan-name]"),
   billingHistoryLabel: () => cy.get("[data-cy=label-billing-history-notice]"),
   invoicesLink: () => cy.get("[data-cy=link-view-invoices]"),
   closeButton: () => cy.get("[data-testid=button-close-success-modal]")

diff --git a/packages/files-ui/cypress/support/page-objects/modals/billing/selectPlanModal.ts b/packages/files-ui/cypress/support/page-objects/modals/billing/selectPlanModal.ts
@@ -15,14 +15,14 @@ export const selectPlanModal = {
   // creates a cypress alias for each individual plan.
   createPlanCypressAliases() {
     this.planBoxContainer().should("have.length.greaterThan", 0)
-    this.planBoxContainer().contains("Free plan")
+    this.planBoxContainer().contains("Files Free")
       .should("be.visible")
-      .as("freePlanBox")
-    this.planBoxContainer().contains("Standard plan")
+      .as("filesFreeBox")
+    this.planBoxContainer().contains("Files Pro")
       .should("be.visible")
-      .as("standardPlanBox")
-    this.planBoxContainer().contains("Premium plan")
+      .as("filesProBox")
+    this.planBoxContainer().contains("Files Max")
       .should("be.visible")
-      .as("premiumPlanBox")
+      .as("filesMaxBox")
   }
 }
diff --git a/packages/files-ui/cypress/support/page-objects/settingsPage.ts b/packages/files-ui/cypress/support/page-objects/settingsPage.ts
@@ -40,8 +40,8 @@ export const settingsPage = {
   payNowButton: () => cy.get("[data-testid=button-pay-invoice]"),
 
   // use this convenience function when an upgraded account is required as a test requisite
-  upgradeSubscription(plan: "standard" | "premium") {
-    const planContainer = plan === "standard" ? "@standardPlanBox" : "@premiumPlanBox"
+  upgradeSubscription(plan: "pro" | "max") {
+    const planContainer = plan === "pro" ? "@filesProBox" : "@filesMaxBox"
 
     this.subscriptionTabButton().click()
     this.changePlanButton().click()

diff --git a/packages/files-ui/cypress/support/utils/apiTestHelper.ts b/packages/files-ui/cypress/support/utils/apiTestHelper.ts
@@ -4,15 +4,15 @@ import { BucketType } from "@chainsafe/files-api-client"
 import { navigationMenu } from "../page-objects/navigationMenu"
 import { homePage } from "../page-objects/homePage"
 
-const API_BASE_USE = "https://stage.imploy.site/api/v1"
+const API_BASE_URL = "https://stage.imploy.site/api/v1"
 const REFRESH_TOKEN_KEY = "csf.refreshToken"
 const FREE_PLAN_ID = "prod_JwRu6Ph25b1f2O"
 
 export type ClearBucketType = Exclude<BucketType, "share" | "pinning" | "fps">
 const getApiClient = () => {
   // Disable the internal Axios JSON deserialization as this is handled by the client
   const axiosInstance = axios.create({ transformResponse: [] })
-  const apiClient = new FilesApiClient({}, API_BASE_USE, axiosInstance)
+  const apiClient = new FilesApiClient({}, API_BASE_URL, axiosInstance)
 
   return apiClient
 }

diff --git a/packages/files-ui/cypress/tests/subscription-plan-spec.ts b/packages/files-ui/cypress/tests/subscription-plan-spec.ts
@@ -162,7 +162,7 @@ describe("Subscription Plan", () => {
       selectPlanModal.createPlanCypressAliases()
 
       // ensure all plan boxes contain expected elements and element state
-      cy.get("@freePlanBox").parent().within(() => {
+      cy.get("@filesFreeBox").parent().within(() => {
         selectPlanModal.planTitleLabel().should("be.visible")
         selectPlanModal.FreePriceLabel().should("be.visible")
         selectPlanModal.storageDescriptionLabel().should("be.visible")
@@ -172,7 +172,7 @@ describe("Subscription Plan", () => {
           .should("be.disabled")
       })
 
-      cy.get("@standardPlanBox").parent().within(() => {
+      cy.get("@filesProBox").parent().within(() => {
         selectPlanModal.planTitleLabel().should("be.visible")
         selectPlanModal.monthlyPriceLabel().should("be.visible")
         selectPlanModal.storageDescriptionLabel().should("be.visible")
@@ -181,7 +181,7 @@ describe("Subscription Plan", () => {
           .should("be.enabled")
       })
 
-      cy.get("@premiumPlanBox").parent().within(() => {
+      cy.get("@filesMaxBox").parent().within(() => {
         selectPlanModal.planTitleLabel().should("be.visible")
         selectPlanModal.monthlyPriceLabel().should("be.visible")
         selectPlanModal.storageDescriptionLabel().should("be.visible")
@@ -190,8 +190,8 @@ describe("Subscription Plan", () => {
           .should("be.enabled")
       })
 
-      // select the standard plan 
-      cy.get("@standardPlanBox").parent().within(() => {
+      // select the Files Pro 
+      cy.get("@filesProBox").parent().within(() => {
         selectPlanModal.selectPlanButton().click()
       })
 
@@ -217,9 +217,9 @@ describe("Subscription Plan", () => {
     it("cannot downgrade if used storage exceeds plan allowance", () => {
       cy.web3Login({ deleteCreditCard: true, resetToFreePlan: true })
 
-      // upgrade to a premium plan first
+      // upgrade to a Max plan first
       navigationMenu.settingsNavButton().click()
-      settingsPage.upgradeSubscription("premium")
+      settingsPage.upgradeSubscription("max")
 
       // setup intercepter, stub the used products response to disallow update
       cy.intercept("GET", "**/billing/products", (req) => {
@@ -233,7 +233,7 @@ describe("Subscription Plan", () => {
       selectPlanModal.planBoxContainer().should("have.length.greaterThan", 0)
 
       // ensure warning is shown and the free plan is not selectable
-      cy.get("@freePlanBox").parent().within(() => {
+      cy.get("@filesFreeBox").parent().within(() => {
         selectPlanModal.storageCapacityWarningLabel().should("be.visible")
         selectPlanModal.selectPlanButton()
           .should("be.visible")
@@ -250,7 +250,7 @@ describe("Subscription Plan", () => {
       // create cypress aliases for the plans
       selectPlanModal.createPlanCypressAliases()
 
-      cy.get("@standardPlanBox").parent().within(() => {
+      cy.get("@filesProBox").parent().within(() => {
         selectPlanModal.selectPlanButton().click()
       })
 
@@ -273,11 +273,11 @@ describe("Subscription Plan", () => {
       settingsPage.subscriptionTabButton().click()
       settingsPage.changePlanButton().click()
 
-      selectPlanModal.planBoxContainer().contains("Standard plan")
+      selectPlanModal.planBoxContainer().contains("Files Pro")
         .should("be.visible")
-        .as("standardPlanBox")
+        .as("filesProBox")
 
-      cy.get("@standardPlanBox").parent().within(() => {
+      cy.get("@filesProBox").parent().within(() => {
         selectPlanModal.selectPlanButton().click()
       })
 
@@ -313,13 +313,13 @@ describe("Subscription Plan", () => {
       selectPlanModal.body().should("be.visible")
       selectPlanModal.planBoxContainer().should("have.length.greaterThan", 0)
 
-      // create a cypress alias for the premium plan
-      selectPlanModal.planBoxContainer().contains("Premium plan")
+      // create a cypress alias for the Max plan
+      selectPlanModal.planBoxContainer().contains("Files Max")
         .should("be.visible")
-        .as("premiumPlanBox")
+        .as("filesMaxBox")
 
-      // select the premium plan 
-      cy.get("@premiumPlanBox").parent().within(() => {
+      // select the Max plan 
+      cy.get("@filesMaxBox").parent().within(() => {
         selectPlanModal.selectPlanButton().click()
       })
 
@@ -371,7 +371,6 @@ describe("Subscription Plan", () => {
       planChangeSuccessModal.planChangeSuccessSubheader().should("be.visible")
       planChangeSuccessModal.featuresSummaryLabel().should("be.visible")
       planChangeSuccessModal.newStorageCapacityLabel().should("be.visible")
-      planChangeSuccessModal.newPlanNameLabel().should("be.visible")
       planChangeSuccessModal.billingHistoryLabel().should("be.visible")
       planChangeSuccessModal.invoicesLink().should("be.visible")
       planChangeSuccessModal.closeButton().should("be.visible")
@@ -397,12 +396,12 @@ describe("Subscription Plan", () => {
       })
     })
 
-    it("can downgrade from premium plan to standard plan", () => {
+    it("can downgrade from Max plan to Pro plan", () => {
       cy.web3Login({ deleteCreditCard: true, resetToFreePlan: true })
 
-      // upgrade to a premium plan first using convenience function
+      // upgrade to a max plan first using convenience function
       navigationMenu.settingsNavButton().click()
-      settingsPage.upgradeSubscription("premium")
+      settingsPage.upgradeSubscription("max")
 
       // store the upgraded plan name for later comparison
       settingsPage.planNameLabel()
@@ -412,7 +411,7 @@ describe("Subscription Plan", () => {
       // initiate the downgrade process
       settingsPage.changePlanButton().click()
       selectPlanModal.planBoxContainer().should("have.length.greaterThan", 0)
-      cy.get("@standardPlanBox").parent().within(() => {
+      cy.get("@filesProBox").parent().within(() => {
         selectPlanModal.selectPlanButton().click()
       })
 
@@ -440,30 +439,30 @@ describe("Subscription Plan", () => {
       // store the downgraded plan name for later comparison
       settingsPage.planNameLabel()
         .should("be.visible")
-        .invoke("text").as("standardPlanName")
+        .invoke("text").as("proPlanName")
 
       // ensure the downgraded plan name is not the same as the previously upgraded plan
       cy.get("@premiumPlanName").then(($premiumPlanName) => {
-        cy.get("@standardPlanName").should("not.equal", $premiumPlanName)
+        cy.get("@proPlanName").should("not.equal", $premiumPlanName)
       })
     })
 
-    it("can downgrade from standard plan to free plan", () => {
+    it("can downgrade from Pro plan to free plan", () => {
       cy.web3Login({ deleteCreditCard: true, resetToFreePlan: true })
 
-      // upgrade to a standard plan first
+      // upgrade to a Pro plan first
       navigationMenu.settingsNavButton().click()
-      settingsPage.upgradeSubscription("standard")
+      settingsPage.upgradeSubscription("pro")
 
-      // store the standard plan name for later comparison
+      // store the Pro plan name for later comparison
       settingsPage.planNameLabel()
         .should("be.visible")
-        .invoke("text").as("standardPlanName")
+        .invoke("text").as("proPlanName")
 
       // initiate the downgrade process
       settingsPage.changePlanButton().click()
       selectPlanModal.planBoxContainer().should("have.length.greaterThan", 0)
-      cy.get("@freePlanBox").parent().within(() => {
+      cy.get("@filesFreeBox").parent().within(() => {
         selectPlanModal.selectPlanButton().click()
       })
 
@@ -487,7 +486,7 @@ describe("Subscription Plan", () => {
         .invoke("text").as("freePlanName")
 
       // ensure the downgraded plan name is not the same as the previously upgraded plan
-      cy.get("@standardPlanName").then(($standardPlanName) => {
+      cy.get("@proPlanName").then(($standardPlanName) => {
         cy.get("@freePlanName").should("not.equal", $standardPlanName)
       })
     })
@@ -498,7 +497,7 @@ describe("Subscription Plan", () => {
       settingsPage.subscriptionTabButton().click()
       settingsPage.changePlanButton().click()
       selectPlanModal.createPlanCypressAliases()
-      cy.get("@standardPlanBox").parent().within(() => {
+      cy.get("@filesProBox").parent().within(() => {
         selectPlanModal.selectPlanButton().click()
       })
 

diff --git a/packages/files-ui/package.json b/packages/files-ui/package.json
@@ -15,10 +15,10 @@
     "@sentry/react": "^5.28.0",
     "@stripe/react-stripe-js": "^1.4.1",
     "@stripe/stripe-js": "^1.18.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",
+    "@tkey/default": "5.1.0",
+    "@tkey/security-questions": "5.1.0",
+    "@tkey/web-storage": "5.1.0",
+    "@toruslabs/customauth":"7.0.2",
     "@types/filesystem": "^0.0.32",
     "@types/uuid": "^8.3.0",
     "axios": "0.21.4",

diff --git a/packages/files-ui/src/Components/Elements/BetaModal.tsx b/packages/files-ui/src/Components/Elements/BetaModal.tsx
@@ -39,7 +39,7 @@ const BetaModal = ({ onHide }: Props) => {
   const classes = useStyles()
 
   const onFormdButtonClick = useCallback(() => {
-    window.open(ROUTE_LINKS.DiscordInvite, "_blank")
+    window.open(ROUTE_LINKS.SubscriptionWhitelistForm, "_blank")
     onHide()
   }, [onHide])
 

diff --git a/packages/files-ui/src/Components/Elements/Notifications/NotificationsDropdown.tsx b/packages/files-ui/src/Components/Elements/Notifications/NotificationsDropdown.tsx
@@ -14,7 +14,7 @@ const useStyles = makeStyles(({ animation, palette, constants, breakpoints, over
       height: constants.generalUnit * 4,
       padding: `0 ${constants.generalUnit}px !important`,
       backgroundColor: palette.additional["gray"][3],
-      color: palette.common.black.main,
+      color: palette.additional["gray"][10],
       borderRadius: `${constants.generalUnit / 4}px`,
       display: "flex",
       justifyContent: "center",