Skip to content

fix: set profile to default on removing the last member of a profile [2] #1541

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix: set profile to default on removing the last member of a profile [2] #1541

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99b217e
fix: set profile to default on removing the last member of a profile
AMIRKHANEF Sep 8, 2024
75b3048
fix: wrong search condiion
AMIRKHANEF Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions packages/extension-polkagate/src/fullscreen/homeFullScreen/partials/ProfileMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@

import DoneIcon from '@mui/icons-material/Done';
import { Divider, Grid, IconButton, Popover, useTheme } from '@mui/material';
import React, { useCallback, useState } from 'react';
import React, { useCallback, useContext, useEffect, useState } from 'react';

import { InputWithLabel, MenuItem, VaadinIcon } from '../../../components';
import { AccountContext, InputWithLabel, MenuItem, VaadinIcon } from '../../../components';
import { getStorage, setStorage } from '../../../components/Loading';
import { useInfo, useIsExtensionPopup, useProfiles, useTranslation } from '../../../hooks';
import { PROFILE_TAGS } from '../../../hooks/useProfileAccounts';
import { updateMeta } from '../../../messaging';

interface Props {
Expand Down Expand Up @@ -186,13 +188,21 @@ function ProfileMenu ({ address, closeParentMenu }: Props): React.ReactElement<P
const isExtensionMode = useIsExtensionPopup();

const { account } = useInfo(address);
const { accounts } = useContext(AccountContext);

const [anchorEl, setAnchorEl] = useState<HTMLButtonElement | HTMLDivElement | null>();
const [status, setStatus] = useState<STATUS>();
const [showName, setShowName] = useState<boolean>();
const [currentProfile, setCurrentProfile] = useState<string>();

const profileNames = account?.profile ? account.profile.split(',') : undefined;

useEffect(() => {
getStorage('profile').then((res) => {
setCurrentProfile(res as string);
}).catch(console.error);
}, []);

const handleClose = useCallback(() => {
setAnchorEl(null);
setShowName(false);
Expand All @@ -210,22 +220,26 @@ function ProfileMenu ({ address, closeParentMenu }: Props): React.ReactElement<P
}, []);

const onRemove = useCallback((profileToBeRemoved: string) => {
if (!account?.profile) {
if (!profileNames || !accounts) {
return;
}

const accountProfiles = account.profile.split(',');
const indexToBeRemoved = accountProfiles.findIndex((item) => item === profileToBeRemoved);
const accountsInAProfileTag = accounts.filter(({ profile }) => profile?.split(',').find((accountProfile) => accountProfile === currentProfile));

accountProfiles.splice(indexToBeRemoved, 1);
const newProfiles = profileNames.filter((item) => item !== profileToBeRemoved);

const metaData = JSON.stringify({ profile: accountProfiles?.length ? accountProfiles.join(',') : null });
const metaData = JSON.stringify({ profile: newProfiles?.length ? newProfiles.join(',') : null });

updateMeta(String(address), metaData)
.then(() => {
handleClose();
if (accountsInAProfileTag.length === 1 && currentProfile === profileToBeRemoved) {
// set profile tab to ALL, since this account was the last account with such a tag and the current profile is the same as account's profile
setStorage('profile', PROFILE_TAGS.ALL).then(handleClose).catch(console.error);
} else {
handleClose();
}
}).catch(console.error);
}, [account?.profile, address, handleClose]);
}, [accounts, address, currentProfile, handleClose, profileNames]);

const open = Boolean(anchorEl);
const id = open ? 'simple-popover 2' : undefined;
Expand Down
Loading