+
+ );
+ }
+
+ if (HdKeyringDeletedType === 'addr') {
+ return (
+
+ {t('page.addressDetail.deleteSeedPhrase.keepSeedPhrase')}
+
+
+ - {
+ setHdKeyringDeletedType('addr');
+ }}
+ >
+ {t('page.addressDetail.deleteSeedPhrase.option1')}
+
+ - {
+ closeDeleteHDKeyringPopup();
+ await AuthenticationModalPromise({
+ confirmText: t('global.Confirm'),
+ cancelText: t('global.Cancel'),
+ title: t('page.addressDetail.deleteSeedPhrase.title'),
+ description: t(
+ 'page.addressDetail.deleteSeedPhrase.sub-title'
+ ),
+ checklist: [
+ t('page.addressDetail.deleteSeedPhrase.check1'),
+ t('page.addressDetail.deleteSeedPhrase.check2'),
+ ],
+ onFinished() {
+ handleDeleteAddress(true);
+ },
+ onCancel() {
+ // do nothing
+ },
+ getContainer,
+ wallet,
+ });
+ }}
+ >
+ {t('page.addressDetail.deleteSeedPhrase.option2')}
+
+
+
+
+ );
+ }
+ return null;
+ }
+ return (
+
+ {t('page.addressDetail.deleteSeedPhrase.remainSeedPhrase')}
+
+
+
+
+
+
+
+ );
+ }
+ return null;
+ };
+
+ const title = 'Delete Address?';
+
+ return (
+
+ {t('page.addressDetail.deleteSeedPhrase.onlyDeleteAddr')}
+
+
+
+
+
+ (null);
const dispatch = useRabbyDispatch();
+ const {
+ deleteAccount: deletePrivateKeyOrHD,
+ renderDelete,
+ } = useHandleDeleteHdKeyringAndSimpleKeyringAccount();
+
const canFastDeleteAccount = useMemo(
// not privacy secret
- () =>
- onDelete
- ? true
- : isCurrentAccount
- ? false
- : ![KEYRING_CLASS.PRIVATE_KEY].includes(type as any),
+ () => (onDelete ? true : isCurrentAccount ? false : true),
[type, onDelete]
);
const deleteAccount = async (e: React.MouseEvent) => {
@@ -106,7 +107,21 @@ const AddressItem = memo(
await onDelete();
return;
}
+
if (canFastDeleteAccount) {
+ if (
+ type === KEYRING_CLASS.MNEMONIC ||
+ type === KEYRING_CLASS.PRIVATE_KEY
+ ) {
+ await deletePrivateKeyOrHD({
+ address,
+ type,
+ brandName,
+ });
+ await dispatch.accountToDisplay.getAllAccountsToDisplay();
+ return;
+ }
+
await dispatch.addressManagement.removeAddress([
address,
type,
@@ -336,6 +351,10 @@ const AddressItem = memo(
{children}
+
+ {renderDelete(() => {
+ dispatch.accountToDisplay.getAllAccountsToDisplay();
+ })}
);
}
diff --git a/src/ui/views/HDManager/AccountList.tsx b/src/ui/views/HDManager/AccountList.tsx
index 587af9f85da..bf5430f6b2f 100644
--- a/src/ui/views/HDManager/AccountList.tsx
+++ b/src/ui/views/HDManager/AccountList.tsx
@@ -22,7 +22,7 @@ import { InViewport } from './InViewport';
import { useMemoizedFn } from 'ahooks';
import { generateAliasName } from '@/utils/account';
import { uniqBy, values } from 'lodash';
-
+import { ReactComponent as IconInfoCC } from '@/ui/assets/address/info-cc.svg';
const isWin32 = detectClientOS() === 'win32';
export interface Account {
@@ -206,6 +206,8 @@ export const AccountList: React.FC
+
+
+ )}
+
+
- {t('page.newAddress.hd.basicInformation')}
+ {t('page.newAddress.hd.nonAddr')}
+
- {value.toLowerCase()}
- copy(value.toLowerCase())}
- className="copy-icon"
+ title={t('page.newAddress.hd.addToRabby')}
+ key="add"
+ render={(val, record) =>
+ record.address ? (
+ isLazyImport && tab === 'hd' ? (
+
+ isSameAddress(item.address, record.address)
+ )}
+ onChange={(val) => handleSelectAccount(val, record)}
/>
-
+ ) : (
+
+ {value.toLowerCase()}
+ copy(value.toLowerCase())}
+ className="copy-icon"
+ />
+
+ ) : (
+
+ {t('page.manageAddress.noSeedPhraseAddress')}
}
/>
}
onClick={handleAddSeedPhraseAddress}
>
{t('page.manageAddress.add-address')}
-
{t('page.manageAddress.delete-seed-phrase')}
-
+