-
Notifications
You must be signed in to change notification settings - Fork 2.8k
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
Allow redirect to MagicLink after Invalid Validation Code #5150
Merged
chiragsalian
merged 25 commits into
Expensify:main
from
akshayasalvi:validation-code-expiry
Jan 3, 2022
Merged
Changes from all commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
b10f53f
Allow redirect to MagicLink after Invalid Validation Code
akshayasalvi 0a6362e
Merge branch 'main' of github-personal:akshayasalvi/App into validati…
akshayasalvi a1ce081
Added login handling along with navigation
akshayasalvi 0ecd7f7
Updated default value to null
akshayasalvi 3f1ad9e
Changed translation key to flag and move translation to parent component
akshayasalvi 745efbb
Added truthy check
akshayasalvi 103bbc5
Change the condition for translation message
akshayasalvi 1e77d15
Merge branch 'main' of github-personal:akshayasalvi/App into validati…
akshayasalvi f278059
Moved the validation message to Link form component
akshayasalvi 8e4f703
Corrected import
akshayasalvi a1af035
Changed the validation key
akshayasalvi f25e31f
Merge branch 'main' of github-personal:akshayasalvi/App into validati…
akshayasalvi 418c8f6
Added `validateCodeExpired` handling for expired links
akshayasalvi f42b310
Merge branch 'main' of github-personal:akshayasalvi/App into validati…
akshayasalvi 46cd66d
Merge branch 'main' of github-personal:akshayasalvi/App into validati…
akshayasalvi 4b4f0ce
Changed unvalidated account flag to validation expired
akshayasalvi e486081
Merge branch 'main' of github-personal:akshayasalvi/App into validati…
akshayasalvi cf0fe90
Rolledback unvalidated account changed and fixed validation link message
akshayasalvi 587948f
Changed keys for welcomeText and resend formflag
akshayasalvi 0bfaf85
Added comment for login var
akshayasalvi 361f097
Merge branch 'main' of github-personal:akshayasalvi/App into validati…
akshayasalvi b1ba7fa
Updated comment and setting error null
akshayasalvi c51f126
Merge branch 'main' of github-personal:akshayasalvi/App into validati…
akshayasalvi c11c337
Removed the `validate: true` in setpassword
akshayasalvi 6180d9e
Reordered conditions for correct validateExpiry message
akshayasalvi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not a fan of these names, especially when i read it in code like so,
Since its confusing to me why if showPasswordForm is true do we want welcomeBack versus welcome. Plus variables should be named after their intention of like what they store and not their parent/class names.
So in this case
welcome
, wants the phone or email so i would suggest -enterPhoneOrEmail
. This becomes welcomeText.enterPhoneOrEmail which is a lot cleaner as welcomeText.welcome is redundant.As for
welcomeBack
, it wants the password so i would suggest -enterPassword
.So now the logic becomes,
which is a lot more verbose and cleaner imo.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a NAB - not a blocker.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a good point. In general, feels like the names for these translation keys is a bit all over the place. Wondering if we can maybe come up with some standard guidance for how to name them and then get everyone to apply it in a consistent way?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, love it.