[Web][UMA-1191]Disable removal of default account and add Lock button. #2429

ajinkyaraj-23 · 2025-02-27T17:17:52Z

Proposed changes

Types of changes

Steps to reproduce

Add two accounts, and remove the default one. Then close the tab and open a new tab, it asks for password and after entering the password it says mnemonic could not be found.
Also no provision for Lock Umami.

Screenshots

Add the screenshots of how the app used to look like and how it looks now

Before	Now

|

| |

Checklist

Tests that prove my fix is effective or that my feature works have been added
Documentation has been added (if appropriate)
Screenshots are added (if any UI changes have been made)
All TODOs have a corresponding task created (and the link is attached to it)

vercel · 2025-02-27T17:17:57Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
umami-embed-iframe	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Feb 28, 2025 10:58am
umami-embed-iframe-ghostnet	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Feb 28, 2025 10:58am
umami-v2-web	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Feb 28, 2025 10:58am
umami-v2-web-storybook	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Feb 28, 2025 10:58am

OKendigelyan · 2025-02-27T17:19:28Z

packages/state/src/slices/accounts/accounts.ts

@@ -144,6 +144,9 @@ export const accountsSlice = createSlice({
      if (!state.defaultAccount) {
        state.defaultAccount = hideConfidentialData(state.items[0]);
      }
+      if (state.items.length === 0) {


state.items.length === 0 => !state.items.length

What's the point of this code?

To handle to scenario when user deletes all accounts.

OKendigelyan · 2025-02-28T10:47:42Z

apps/web/src/components/AccountSelectorModal/AccountSelectorModal.tsx

@@ -99,13 +105,14 @@ export const AccountSelectorModal = () => {

  const onRemove = (type: string, accounts: Account[]) => {
    const account = accounts[0];
-    const isLast = accounts.length === implicitAccounts.length;
+
+    const isDefaultAccount = accounts.some(a => a.address.pkh === defaultAccount.address.pkh);


Suggested change

const isDefaultAccount = accounts.some(a => a.address.pkh === defaultAccount.address.pkh);

const isDefaultAccount = account.address.pkh === defaultAccount.address.pkh

OKendigelyan · 2025-02-28T11:05:47Z

apps/web/src/components/AccountSelectorModal/AccountSelectorModal.tsx

+    if (isDefaultAccount) {
+      return (
+        removeDefaultAccountDescription +
+        "\n\n<b>Make sure your mnemonic phrase is securely saved. Losing this phrase could result in permanent loss of access to your data.</b>"


Make sure your mnemonic phrase is securely saved. Losing this phrase could result in permanent loss of access to your data. may not be related to the social default account

OKendigelyan · 2025-02-28T11:08:38Z

apps/web/src/components/AccountSelectorModal/AccountSelectorModal.tsx

@@ -50,6 +52,10 @@ export const AccountSelectorModal = () => {
  const removeMnemonic = useRemoveMnemonic();
  const removeNonMnemonic = useRemoveNonMnemonic();
  const { openWith, goBack, onClose } = useDynamicModalContext();
+  const defaultAccount = useAppSelector(state => state.accounts.defaultAccount);


Please create a reusable useGetDefaultAccount hook in packages/state/src/hooks/getAccountData.ts and handle the edge case logic inside the hook

OKendigelyan · 2025-02-28T11:11:59Z

apps/web/src/components/Menu/LogoutModal.tsx

-    description="Before you log out, ensure your mnemonic phrase is securely saved. Without it, you may permanently lose access to your account and data."
+    description={
+      "Before you log out, ensure your mnemonic phrase is securely saved. Without it, you may permanently lose access to your account and data. \n" +
+      "Loging out will remove all personal data (including saved contacts, password and accounts) from your device." +


Why not use removeDefaultAccountDescription?

OKendigelyan · 2025-02-28T11:19:21Z

apps/web/src/components/Menu/GenericMenu.tsx

@@ -7,23 +7,45 @@ import { type MenuItems } from "./types";
 type GenericMenuProps = {
  title?: string;
  menuItems: MenuItems;
+  bottomMenuItems?: MenuItems;


No need to pass additional props

OKendigelyan · 2025-02-28T11:21:27Z

apps/web/src/components/Menu/Menu.tsx

      icon: <LogoutIcon />,
      onClick: () => openModal(<LogoutModal />),
    },
  ];

-  return <GenericMenu menuItems={[coreMenuItems, themeMenuItems, logoutMenuItems]} />;
+  return (
+    <GenericMenu bottomMenuItems={[logoutMenuItems]} menuItems={[coreMenuItems, themeMenuItems]} />


Suggested change

<GenericMenu bottomMenuItems={[logoutMenuItems]} menuItems={[coreMenuItems, themeMenuItems]} />

return <GenericMenu menuItems={[coreMenuItems, themeMenuItems, logoutMenuItems]} />;

OKendigelyan · 2025-02-28T11:29:30Z

apps/web/src/components/Menu/Menu.tsx

@@ -74,15 +83,18 @@ export const Menu = () => {
      onClick: toggleColorMode,
      rightElement: <Switch isChecked={colorMode === "dark"} onChange={toggleColorMode} />,
    },
+    lockUmami,


Please move this under the logoutMenuItems as a first item

OKendigelyan · 2025-02-28T11:30:06Z

apps/web/src/components/Menu/GenericMenu.tsx

 };

-export const GenericMenu = ({ title, menuItems }: GenericMenuProps) => (
+export const GenericMenu = ({ title, menuItems, bottomMenuItems }: GenericMenuProps) => (


Suggested change

export const GenericMenu = ({ title, menuItems, bottomMenuItems }: GenericMenuProps) => (

export const GenericMenu = ({ title, menuItems }: GenericMenuProps) => (

<DrawerContentWrapper title={title}>

<VStack

gap={{ base: "18px", md: "24px" }}

height="100%"

marginTop={title ? { base: "36px", md: "40px" } : 0}

divider={<Divider />}

spacing="0"

>

{menuItems.map((items, index) => (

<Box

key={index}

width="full"

_last={{

display: "flex",

flexDirection: "column",

justifyContent: "space-between",

height: "100%",

}}

>

{items.map(item => (

<MenuItem key={item.label} {...item} />

))}

</Box>

))}

</VStack>

</DrawerContentWrapper>

);

OKendigelyan · 2025-02-28T11:31:09Z

apps/web/src/components/Menu/LogoutModal.tsx

-    description="Before you log out, ensure your mnemonic phrase is securely saved. Without it, you may permanently lose access to your account and data."
+    description={
+      "Before you log out, ensure your mnemonic phrase is securely saved. Without it, you may permanently lose access to your account and data. \n" +
+      "Loging out will remove all personal data (including saved contacts, password and accounts) from your device." +


Why not use removeDefaultAccountDescription?

Reset default account when all accounts are deleted.

ab3e477

ajinkyaraj-23 requested a review from OKendigelyan February 27, 2025 17:17

ajinkyaraj-23 self-assigned this Feb 27, 2025

vercel bot deployed to Preview – umami-embed-iframe-ghostnet February 27, 2025 17:18 View deployment

vercel bot deployed to Preview – umami-v2-web February 27, 2025 17:20 View deployment

vercel bot deployed to Preview – umami-v2-web-storybook February 27, 2025 17:21 View deployment

ajinkyaraj-23 changed the title ~~Disable removal of default account and add Lock button.~~ [Web][UMA-1129]Disable removal of default account and add Lock button. Feb 28, 2025

ajinkyaraj-23 changed the title ~~[Web][UMA-1129]Disable removal of default account and add Lock button.~~ [Web][UMA-1191]Disable removal of default account and add Lock button. Feb 28, 2025

ajinkyaraj-23 added 2 commits February 28, 2025 10:50

Warn about deleting default account instead of last.

d13bf67

Add lock Umami button to menu.

55f9e90

ajinkyaraj-23 force-pushed the ajinkyaraj-23@disable-removal-of-default-account branch from 8b51dd9 to 55f9e90 Compare February 28, 2025 10:53

vercel bot deployed to Preview – umami-v2-web-storybook February 28, 2025 10:56 View deployment

vercel bot deployed to Preview – umami-embed-iframe-ghostnet February 28, 2025 10:57 View deployment

vercel bot deployed to Preview – umami-v2-web February 28, 2025 10:57 View deployment

vercel bot deployed to Preview – umami-embed-iframe February 28, 2025 10:58 View deployment

OKendigelyan requested changes Feb 28, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Web][UMA-1191]Disable removal of default account and add Lock button. #2429

[Web][UMA-1191]Disable removal of default account and add Lock button. #2429

ajinkyaraj-23 commented Feb 27, 2025 •

edited

Loading

vercel bot commented Feb 27, 2025 •

edited

Loading

OKendigelyan Feb 27, 2025

OKendigelyan Feb 27, 2025

ajinkyaraj-23 Feb 28, 2025

OKendigelyan Feb 28, 2025

OKendigelyan Feb 28, 2025

OKendigelyan Feb 28, 2025

OKendigelyan Feb 28, 2025

OKendigelyan Feb 28, 2025

OKendigelyan Feb 28, 2025

OKendigelyan Feb 28, 2025

OKendigelyan Feb 28, 2025

OKendigelyan Feb 28, 2025

	const isDefaultAccount = accounts.some(a => a.address.pkh === defaultAccount.address.pkh);
	const isDefaultAccount = account.address.pkh === defaultAccount.address.pkh

	<GenericMenu bottomMenuItems={[logoutMenuItems]} menuItems={[coreMenuItems, themeMenuItems]} />
	return <GenericMenu menuItems={[coreMenuItems, themeMenuItems, logoutMenuItems]} />;

-export const GenericMenu = ({ title, menuItems, bottomMenuItems }: GenericMenuProps) => (
+export const GenericMenu = ({ title, menuItems }: GenericMenuProps) => (
+  <DrawerContentWrapper title={title}>
+    <VStack
+      gap={{ base: "18px", md: "24px" }}
+      height="100%"
+      marginTop={title ? { base: "36px", md: "40px" } : 0}
+      divider={<Divider />}
+      spacing="0"
+    >
+      {menuItems.map((items, index) => (
+        <Box
+          key={index}
+          width="full"
+          _last={{
+            display: "flex",
+            flexDirection: "column",
+            justifyContent: "space-between",
+            height: "100%",
+          }}
+        >
+          {items.map(item => (
+            <MenuItem key={item.label} {...item} />
+          ))}
+        </Box>
+      ))}
+    </VStack>
+  </DrawerContentWrapper>
+);

[Web][UMA-1191]Disable removal of default account and add Lock button. #2429

Are you sure you want to change the base?

[Web][UMA-1191]Disable removal of default account and add Lock button. #2429

Conversation

ajinkyaraj-23 commented Feb 27, 2025 • edited Loading

Proposed changes

Types of changes

Steps to reproduce

Screenshots

Checklist

vercel bot commented Feb 27, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ajinkyaraj-23 commented Feb 27, 2025 •

edited

Loading

vercel bot commented Feb 27, 2025 •

edited

Loading