Skip to content
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

Jump to bottom

fix: set profile to default on removing the last member of a profile #1534

Merged
merged 2 commits into from
Sep 9, 2024
Merged

fix: set profile to default on removing the last member of a profile #1534

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f7679d
fix: set profile to default on removing the last member of a profile
Nick-1979 Sep 8, 2024
4447b66
refactor: using AccountContext
Nick-1979 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
46 changes: 34 additions & 12 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 @@ -183,16 +185,24 @@ enum STATUS {
function ProfileMenu ({ address, closeParentMenu }: Props): React.ReactElement<Props> {
const theme = useTheme();
const { t } = useTranslation();
const isExtensionMode = useIsExtensionPopup();

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);
}, []);
Nick-1979 marked this conversation as resolved.
Show resolved Hide resolved

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

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

const accountProfiles = account.profile.split(',');
const indexToBeRemoved = accountProfiles.findIndex((item) => item === profileToBeRemoved);
const accountsWithTheSameProfile = accounts.filter(({ profile }) =>
profile?.split(',').includes(profileToBeRemoved)
);

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

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

updateMeta(String(address), metaData)
updateMeta(address, metaData)
.then(() => {
handleClose();
}).catch(console.error);
}, [account?.profile, address, handleClose]);
const isLastAccountWithTheProfile = accountsWithTheSameProfile.length === 1;

if (isLastAccountWithTheProfile && currentProfile === profileToBeRemoved) {
setStorage('profile', PROFILE_TAGS.ALL)
.then(handleClose)
.catch(console.error);
} else {
handleClose();
}
})
.catch(console.error);
}, [profileNames, accounts, address, currentProfile, handleClose]);

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