chore: remove account type selection buttons from some account creati…

…on screens
TalismanSociety · Dec 30, 2024 · b629b54 · b629b54
1 parent 1f03050
commit b629b54
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 22 deletions.
diff --git a/apps/extension/src/ui/apps/dashboard/routes/AccountAdd/AccountAddDerivedPage.tsx b/apps/extension/src/ui/apps/dashboard/routes/AccountAdd/AccountAddDerivedPage.tsx
@@ -15,10 +15,21 @@ const Content = () => {
   const urlParamType = (params.get("type") ?? undefined) as AccountAddressType | undefined
   const { setAddress } = useSelectAccountAndNavigate("/portfolio")
 
+  const accountTypeString = () => {
+    switch (urlParamType) {
+      case "ethereum":
+        return " Ethereum"
+      case "sr25519":
+        return " Polkadot"
+      default:
+        return ""
+    }
+  }
+
   return (
     <>
       <HeaderBlock
-        title={t("Create a new account")}
+        title={t(`Create a new${accountTypeString()} account`)}
         text={!urlParamType && t("What type of account would you like to create?")}
       />
       <Spacer small />

diff --git a/apps/extension/src/ui/apps/dashboard/routes/AccountAdd/AccountAddWatchedPage.tsx b/apps/extension/src/ui/apps/dashboard/routes/AccountAdd/AccountAddWatchedPage.tsx
@@ -15,10 +15,21 @@ export const Content = () => {
   const urlParamType = (params.get("type") ?? undefined) as AccountAddressType | undefined
   const { setAddress } = useSelectAccountAndNavigate("/portfolio")
 
+  const accountTypeString = () => {
+    switch (urlParamType) {
+      case "ethereum":
+        return " Ethereum"
+      case "sr25519":
+        return " Polkadot"
+      default:
+        return ""
+    }
+  }
+
   return (
     <>
       <HeaderBlock
-        title={t("Add a watched account")}
+        title={t(`Add a watched${accountTypeString()} account`)}
         text={!urlParamType && t("What type of account would you like to create?")}
       />
       <Spacer small />

diff --git a/apps/extension/src/ui/domains/Account/AccountAdd/AccountAddDerived/AccountAddDerivedForm.tsx b/apps/extension/src/ui/domains/Account/AccountAdd/AccountAddDerived/AccountAddDerivedForm.tsx
@@ -102,7 +102,6 @@ const AccountAddDerivedFormInner: FC<AccountAddPageProps> = ({ onSuccess }) => {
   // get type paramter from url
   const [params] = useSearchParams()
   const urlParamType = (params.get("type") ?? undefined) as UiAccountAddressType | undefined
-  const disableOtherTypes = params.has("disableOtherTypes")
   const mnemonics = useMnemonics()
   const allAccounts = useAccounts()
   const accountNames = useMemo(() => allAccounts.map((a) => a.name), [allAccounts])
@@ -255,11 +254,9 @@ const AccountAddDerivedFormInner: FC<AccountAddPageProps> = ({ onSuccess }) => {
 
   return (
     <form onSubmit={handleSubmit(submit)}>
-      <AccountTypeSelector
-        defaultType={urlParamType}
-        disableOtherTypes={disableOtherTypes}
-        onChange={handleTypeChange}
-      />
+      {!urlParamType && (
+        <AccountTypeSelector defaultType={urlParamType} onChange={handleTypeChange} />
+      )}
       <Spacer small />
       <div className={classNames("transition-opacity", type ? "opacity-100" : "opacity-0")}>
         {!!mnemonics.length && (

diff --git a/apps/extension/src/ui/domains/Account/AccountAdd/AccountAddWatchedForm.tsx b/apps/extension/src/ui/domains/Account/AccountAdd/AccountAddWatchedForm.tsx
@@ -25,7 +25,6 @@ export const AccountAddWatchedForm = ({ onSuccess }: AccountAddPageProps) => {
   // get type paramter from url
   const [params] = useSearchParams()
   const urlParamType = (params.get("type") ?? undefined) as UiAccountAddressType | undefined
-  const disableOtherTypes = params.has("disableOtherTypes")
   const allAccounts = useAccounts()
   const accountNames = useMemo(() => allAccounts.map((a) => a.name), [allAccounts])
 
@@ -152,11 +151,9 @@ export const AccountAddWatchedForm = ({ onSuccess }: AccountAddPageProps) => {
   return (
     <form onSubmit={handleSubmit(submit)}>
       <div className="flex flex-col gap-16">
-        <AccountTypeSelector
-          defaultType={urlParamType}
-          disableOtherTypes={disableOtherTypes}
-          onChange={handleTypeChange}
-        />
+        {!urlParamType && (
+          <AccountTypeSelector defaultType={urlParamType} onChange={handleTypeChange} />
+        )}
         <div className={classNames("transition-opacity", type ? "opacity-100" : "opacity-0")}>
           <div>
             <p className="text-body-secondary">

diff --git a/apps/extension/src/ui/domains/Account/AccountAdd/Container.tsx b/apps/extension/src/ui/domains/Account/AccountAdd/Container.tsx
@@ -121,7 +121,7 @@ function NewAccountMethodButtons() {
           />
         }
         type="ethereum"
-        to={`/accounts/add/derived?type=ethereum${accountType ? "&disableOtherTypes" : ""}`}
+        to={`/accounts/add/derived?type=ethereum`}
       />
       <AccountTypeMethodButton
         disabled={accountType === "ethereum"}
@@ -134,7 +134,7 @@ function NewAccountMethodButtons() {
           />
         }
         type="polkadot"
-        to={`/accounts/add/derived?type=sr25519${accountType ? "&disableOtherTypes" : ""}`}
+        to={`/accounts/add/derived?type=sr25519`}
       />
     </>
   )
@@ -218,7 +218,7 @@ function WatchedAccountMethodButtons() {
           />
         }
         type="ethereum"
-        to={`/accounts/add/watched?type=ethereum${accountType ? "&disableOtherTypes" : ""}`}
+        to={`/accounts/add/watched?type=ethereum`}
       />
       <AccountTypeMethodButton
         disabled={accountType === "ethereum"}
@@ -231,7 +231,7 @@ function WatchedAccountMethodButtons() {
           />
         }
         type="polkadot"
-        to={`/accounts/add/watched?type=sr25519${accountType ? "&disableOtherTypes" : ""}`}
+        to={`/accounts/add/watched?type=sr25519`}
       />
     </>
   )

diff --git a/apps/extension/src/ui/domains/Account/AccountTypeSelector.tsx b/apps/extension/src/ui/domains/Account/AccountTypeSelector.tsx
@@ -34,14 +34,12 @@ const AccountTypeButton: FC<{
 
 type AccountTypeSelectorProps = {
   defaultType?: UiAccountAddressType
-  disableOtherTypes?: boolean
   onChange: (type: UiAccountAddressType) => void
   className?: string
 }
 
 export const AccountTypeSelector = ({
   defaultType,
-  disableOtherTypes,
   onChange,
   className,
 }: AccountTypeSelectorProps) => {
@@ -70,7 +68,6 @@ export const AccountTypeSelector = ({
             {t("Ethereum, Base, zkSync, Arbitrum, BSC, and all EVM chains")}
           </div>
         }
-        disabled={disableOtherTypes && defaultType !== "ethereum"}
         onClick={handleClick("ethereum")}
       />
       <AccountTypeButton
@@ -85,7 +82,6 @@ export const AccountTypeSelector = ({
             {t("Relay Chain, Asset Hub, Bittensor, and most Polkadot chains")}
           </div>
         }
-        disabled={disableOtherTypes && defaultType !== "sr25519"}
         onClick={handleClick("sr25519")}
       />
     </div>