fix: handle disabled button styles #1061
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
acezard
force-pushed
the
fix--handle-disabled-button-styles
branch
from
709e226
to
c8e8301
Compare
zatteo
reviewed
Dec 12, 2023
src/app/view/Secure/SetPinView.tsx
Outdated
| disabled={secondInput.length !== 4} | ||
| > | ||
| <Typography | ||
| color={secondInput.length !== 4 ? 'disabled' : 'primary'} |
There was a problem hiding this comment.
nit: const isPasswordComplete = (password) => password.length === 4 to factorize and make it very clear
zatteo
approved these changes
Dec 12, 2023
zatteo
reviewed
Dec 12, 2023
src/ui/Button/index.tsx
Outdated
| @@ -18,7 +18,7 @@ export const Button = ({ | |||
| style={[ | |||
| styles.button, | |||
| styles[variant], | |||
| disabled ? styles.disabled : {}, | |||
| disabled && styles[`${variant}Disabled`], | |||
There was a problem hiding this comment.
bit hard to update, @Ldoppea I think the best way to handle that is you just overwrite my styles during conflict. I update to follow same naming convention in styles though
They weren't well adjusted. We have to rationalize quickly these themes issues. This commit is more a quick fix. Some buttons in the app don't use the disabled style some do. Also we need 1 disabled style per variant per theme (that we use in the app though).
acezard
force-pushed
the
fix--handle-disabled-button-styles
branch
from
c8e8301
to
129984d
Compare
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.
They weren't well adjusted. We have to rationalize quickly
these themes issues.
This commit is more a quick fix.
Some buttons in the app don't use the disabled style some do.
Also we need 1 disabled style per variant per theme (that we use in the
app though).