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

enable menu item for setting primary for private key imports #3326

Merged
merged 1 commit into from
Mar 13, 2023
Merged

enable menu item for setting primary for private key imports #3326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
95 changes: 42 additions & 53 deletions ...s/app-extension/src/components/Unlocked/Settings/YourAccount/EditWallets/WalletDetail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,6 @@ export const WalletDetail: React.FC<{
navigator.clipboard.writeText(publicKey);
};

// Account recovery is not possible for private key imports, so prevent
// removal of wallets if they are the last one in the wallet that can be used
// for recovery
const isLastRecoverable =
Object.values(publicKeyData)
.map((keyring) => [...keyring.hdPublicKeys, ...keyring.ledgerPublicKeys])
.flat()
.filter((n) => n.publicKey !== publicKey).length === 0;

const isPrimary = primaryWallets.find((x) => x.publicKey === publicKey)
? true
: false;
Expand Down Expand Up @@ -205,51 +196,49 @@ export const WalletDetail: React.FC<{
{type !== "hardware" && type !== "dehydrated" ? (
<SettingsList menuItems={secrets} />
) : null}
{!isLastRecoverable ? <SettingsList menuItems={removeWallet} /> : null}
{type !== "imported" ? (
<div
style={{
padding: "16px",
}}
>
<PrimaryButton
fullWidth
label={isPrimary ? "This is your primary wallet" : "Set as primary"}
disabled={isPrimary || type === "dehydrated"}
onClick={async () => {
await fetch(`${BACKEND_API_URL}/users/activePubkey`, {
method: "POST",
body: JSON.stringify({
publicKey: publicKey,
}),
headers: {
"Content-Type": "application/json",
},
});
setServerPublicKeys((current) =>
current.map((c) => {
if (c.blockchain !== blockchain) {
return c;
}
if (c.primary && c.publicKey !== publicKey) {
return {
...c,
primary: false,
};
}
if (c.publicKey === publicKey) {
return {
...c,
primary: true,
};
}
<SettingsList menuItems={removeWallet} />
<div
style={{
padding: "16px",
}}
>
<PrimaryButton
fullWidth
label={isPrimary ? "This is your primary wallet" : "Set as primary"}
disabled={isPrimary || type === "dehydrated"}
onClick={async () => {
await fetch(`${BACKEND_API_URL}/users/activePubkey`, {
method: "POST",
body: JSON.stringify({
publicKey: publicKey,
}),
headers: {
"Content-Type": "application/json",
},
});
setServerPublicKeys((current) =>
current.map((c) => {
if (c.blockchain !== blockchain) {
return c;
})
);
}}
/>
</div>
) : null}
}
if (c.primary && c.publicKey !== publicKey) {
return {
...c,
primary: false,
};
}
if (c.publicKey === publicKey) {
return {
...c,
primary: true,
};
}
return c;
})
);
}}
/>
</div>
</div>
);
};