[#20500] Fix derived accounts #20536
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ulisesmac
commented
Jun 21, 2024
Comment on lines
+10
to
+17
| :padding-bottom 8 | ||
| :border-color (cond | ||
| (and selected? blur?) colors/white | ||
| selected? (colors/resolve-color customization-color theme) | ||
| blur? colors/white-opa-5 | ||
| :else (colors/theme-colors colors/neutral-10 | ||
| colors/neutral-80 | ||
| theme))} |
There was a problem hiding this comment.
Just a refactor from 2 ifs -> cond
ulisesmac
commented
Jun 21, 2024
Comment on lines
+99
to
+103
| {:style (style/container (assoc props | ||
| :selected? selected? | ||
| :container-style container-style | ||
| :theme theme)) |
There was a problem hiding this comment.
Just a refactor from merge -> assoc
ulisesmac
commented
Jun 21, 2024
| @@ -231,7 +231,7 @@ | |||
| {:account-color @account-color | |||
| :slide-button-props {:on-auth-success on-auth-success | |||
| :disabled? (or (empty? @account-name) | |||
| (= "" @derivation-path) | |||
| (string/blank? @derivation-path) | |||
There was a problem hiding this comment.
Just making the code more robust
Jenkins BuildsClick to see older builds (5)
|
ulisesmac
force-pushed
the
20500-fix-derived-accounts
branch
from
3cadd7d to
8b46c4c
Compare
ulisesmac
commented
Jun 21, 2024
smohamedjavid
approved these changes
Jun 25, 2024
| @@ -105,8 +105,7 @@ | |||
| [quo/bottom-actions | |||
| {:actions :one-action | |||
| :button-one-label (i18n/label :t/confirm-account-origin) | |||
| :button-one-props {:disabled? (= selected-keypair selected-key-uid) | |||
| @@ -217,6 +216,7 @@ | |||
| [:wallet/derive-address-and-add-account | |||
| {:password password | |||
| :derived-from-address derived-from | |||
| :key-uid key-uid | |||
| :derivation-path @derivation-path | |||
| :account-preferences preferences}]))) | |||
| [derived-from])] | |||
There was a problem hiding this comment.
Should we add key-uid to the deps?
There was a problem hiding this comment.
Yeah, I'll add it 👍
| set-sliding-complete | ||
| on-complete | ||
| reset-fn)) | ||
| [sliding-complete? disabled? on-complete])] |
There was a problem hiding this comment.
This is actually interesting 🤔
qoqobolo
force-pushed
the
20500-fix-derived-accounts
branch
from
8b46c4c to
1cfe2b8
Compare
84% of end-end tests have passedFailed tests (4)Click to expandClass TestOneToOneChatMultipleSharedDevicesNewUi:
Class TestWalletMultipleDevice:
Class TestCommunityOneDeviceMerged:
Expected to fail tests (4)Click to expandClass TestGroupChatMultipleDeviceMergedNewUI:
Class TestCommunityMultipleDeviceMergedTwo:
Class TestWalletOneDevice:
Passed tests (43)Click to expandClass TestCommunityOneDeviceMerged:
Class TestDeepLinksOneDevice:
Class TestOneToOneChatMultipleSharedDevicesNewUiTwo:
Class TestActivityMultipleDevicePRTwo:
Class TestActivityMultipleDevicePR:
Class TestActivityCenterContactRequestMultipleDevicePR:
Class TestCommunityMultipleDeviceMerged:
Class TestGroupChatMultipleDeviceMergedNewUI:
Class TestOneToOneChatMultipleSharedDevicesNewUi:
Class TestCommunityMultipleDeviceMergedTwo:
Class TestWalletOneDevice:
|
|
Great job @ulisesmac! * please don't forget to rebase PRs before moving them to e2e, thanks! 😉🙏 |
ulisesmac
force-pushed
the
20500-fix-derived-accounts
branch
from
1cfe2b8 to
4c226b3
Compare
73% of end-end tests have passedFailed tests (11)Click to expandClass TestActivityCenterContactRequestMultipleDevicePR:
Class TestCommunityMultipleDeviceMergedTwo:
Class TestWalletMultipleDevice:
Class TestCommunityMultipleDeviceMerged:
Class TestGroupChatMultipleDeviceMergedNewUI:
Expected to fail tests (3)Click to expandClass TestCommunityMultipleDeviceMergedTwo:
Class TestWalletOneDevice:
Passed tests (37)Click to expandClass TestDeepLinksOneDevice:
Class TestWalletOneDevice:
Class TestActivityCenterContactRequestMultipleDevicePR:
Class TestOneToOneChatMultipleSharedDevicesNewUi:
Class TestCommunityMultipleDeviceMergedTwo:
Class TestActivityMultipleDevicePR:
Class TestCommunityMultipleDeviceMerged:
Class TestCommunityOneDeviceMerged:
Class TestOneToOneChatMultipleSharedDevicesNewUiTwo:
Class TestActivityMultipleDevicePRTwo:
|
seanstrom
reviewed
Jul 1, 2024
Comment on lines
+105
to
+106
| :pointer-events :box-only} | ||
| [rn/view {:style style/header-container} |
There was a problem hiding this comment.
Hey @ulisesmac 👋
Do we need pointer-events :box-only here? I think this piece of code is causing an issue when we have a button embedded inside the key-pair component. For example, the pointer events won't reach the button and the on-press callback won't be called.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #20500
fixes #20437
Summary
This PR fixes this error:
01-failure.webm
Fixed in this PR:
00-success-attempt.webm
Review notes
Explanation of the issue that happened:
Platforms
Steps to test
Please check the video above
status: ready