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.

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

Merge keychains #1435

Merged
merged 5 commits into from
Aug 16, 2024
Merged

Merge keychains #1435

merged 5 commits into from
Aug 16, 2024

Conversation

greg-schrammel
Copy link
Contributor

@greg-schrammel greg-schrammel commented Mar 27, 2024

Fixes BX-1602
Figma link (if any):

What changed (plus any additional context for devs)

merge pks to it's hd group when possible
in the clip I added by pk the index 2 of a seed phrase, later when I add this seed phrase and click to create a wallet in the second index, it merges both into a single group (removes the pk keychain and merges all into the hd)

Screen.Recording.2024-02-20.at.14.15.04.mov
Screen.Recording.2024-02-20.at.14.16.07.mov

importing a duplicate pk, will just select the account

Screen.Recording.2024-02-20.at.14.20.16.mov

trying to import the same seed twice with prompt an error with "This seed is imported already" (maybe we need a better message here)

Screen recordings / screenshots

What to test

@greg-schrammel greg-schrammel changed the base branch from master to keychain-types March 27, 2024 03:27
Copy link

Here's the packed extension for this build:
rainbowbx-a087a03f6326e59c6059fcca26b33225dafea06d.zip

Copy link
Contributor

@estebanmino estebanmino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@greg-schrammel could you explain what you did here?

Copy link
Contributor

@estebanmino estebanmino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we need some qa for this

Base automatically changed from keychain-types to master March 28, 2024 20:11
Copy link
Contributor

@estebanmino estebanmino left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems like i mentally approved this pr last week but didn't press the ✅ button

Copy link

Here's the packed extension for this build:
rainbowbx-e0086f35f162c1c9e9d7bdacb3044595e3f6fc1f

Copy link

github-actions bot commented Aug 1, 2024

Here's the packed extension for this build:
rainbowbx-55c55f71ee9a4275cc1b54583b823c8262aa3aef

@DanielSinclair
Copy link
Collaborator

@greg-schrammel After you wrap up Degen Mode, if you could have a look at this and merge

Copy link

linear bot commented Aug 14, 2024

@greg-schrammel greg-schrammel added this pull request to the merge queue Aug 16, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 16, 2024
@DanielSinclair DanielSinclair added this pull request to the merge queue Aug 16, 2024
Merged via the queue into master with commit 7d72e35 Aug 16, 2024
17 checks passed
@DanielSinclair DanielSinclair deleted the merge-keychains branch August 16, 2024 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants