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

Error modal when signin from expired magic link #15505

Merged
merged 41 commits into from
Mar 22, 2023
Merged

Error modal when signin from expired magic link #15505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
9de436b
Split ValidateCodeModal different usages in multiple components.
cristipaval Feb 27, 2023
4571bc2
Separate Abracadabra component.
cristipaval Feb 27, 2023
4dfdcf0
Cleanup abracadabra related code from ValidateCodeModal component
cristipaval Feb 27, 2023
7911733
Separate component for when magic link fails.
cristipaval Feb 27, 2023
abcf1f9
Correct Spanish translations after feedback from native speakers.
cristipaval Feb 27, 2023
42dbf4b
Update illustration in the modal shown when magic link fails.
cristipaval Feb 27, 2023
7483f9a
Show expired code modal when sign in fails.
cristipaval Feb 27, 2023
ffb52ea
Expired magic link modal when trying to sign in the current tab with …
cristipaval Feb 28, 2023
61a15e8
Cleanup unused action in Session.
cristipaval Feb 28, 2023
b601db1
Add comments for a complex condition check.
cristipaval Feb 28, 2023
fdca7c1
Fix lint errors
cristipaval Feb 28, 2023
9af3f8a
Add "request new code" link in the error modal.
cristipaval Mar 1, 2023
2ec71ac
Fix lint and style errors.
cristipaval Mar 1, 2023
3497d94
Merge remote-tracking branch 'origin/main' into cristi_error-when-sig…
cristipaval Mar 1, 2023
ab1911a
Merge remote-tracking branch 'origin/main' into cristi_error-when-sig…
cristipaval Mar 3, 2023
7c4cd9a
Make it work for accounts with 2FA
cristipaval Mar 3, 2023
61e702e
Try fixing the intermediary screen on iOS.
cristipaval Mar 6, 2023
c63438a
Work in progress.
cristipaval Mar 7, 2023
177b9d2
Merge remote-tracking branch 'origin/main' into cristi_error-when-sig…
cristipaval Mar 10, 2023
a8ceaca
Revert undesired changes in Permissions.js
cristipaval Mar 10, 2023
7632b8e
Fix authentication when sign in with link and 2fa
cristipaval Mar 10, 2023
b8f6cb4
Merge remote-tracking branch 'origin/main' into cristi_error-when-sig…
cristipaval Mar 13, 2023
939d507
Cleanup ValidateLoginPage
cristipaval Mar 13, 2023
3b66d81
Code style consistency.
cristipaval Mar 13, 2023
6900b03
Finally found a way to handle the unmount-remount of the page due to …
cristipaval Mar 14, 2023
73aa412
Add js doc to explain how autoAuthState initialization works
cristipaval Mar 14, 2023
02c753d
Add "sign in here" option.
cristipaval Mar 14, 2023
c84620d
Add expired validate code modal.
cristipaval Mar 14, 2023
e191d90
Better comment.
cristipaval Mar 14, 2023
a6fee31
Add Tfa required modal.
cristipaval Mar 14, 2023
4393c6f
Fix lint errors.
cristipaval Mar 14, 2023
c2ac666
Remove unnecessary change in BaseValidationCodeForm.js
cristipaval Mar 14, 2023
7266f07
Linter prefers early return :shrug:
cristipaval Mar 14, 2023
8e95a5f
Add correct Spanish translations for tfa required modal.
cristipaval Mar 15, 2023
2ff6376
Final shape for TfaRequiredModal
cristipaval Mar 15, 2023
6a80fe5
Show abracadabra after inserting tfa code.
cristipaval Mar 15, 2023
5354ea4
Merge remote-tracking branch 'origin/main' into cristi_error-when-sig…
cristipaval Mar 20, 2023
c3ec252
Remove unnecessary line breaks.
cristipaval Mar 20, 2023
ae59b49
Remove unnecesary line break in TfaRequiredModal.js
cristipaval Mar 20, 2023
76abf00
Remove unnecesary line break in AbracadabraModal.js
cristipaval Mar 20, 2023
13460c8
Remove unnecesary line break in ExpiredValidateCodeModal.js
cristipaval Mar 20, 2023
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
39 changes: 18 additions & 21 deletions assets/images/expensify-wordmark.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
119 changes: 119 additions & 0 deletions assets/images/product-illustrations/safe.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 58 additions & 0 deletions assets/images/product-illustrations/todd-behind-cloud.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions src/CONST.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@ const CONST = {
MIN_SIZE: 240,
},

AUTO_AUTH_STATE: {
NOT_STARTED: 'not-started',
SIGNING_IN: 'signing-in',
JUST_SIGNED_IN: 'just-signed-in',
FAILED: 'failed',
},

AVATAR_MAX_ATTACHMENT_SIZE: 6291456,

AVATAR_ALLOWED_EXTENSIONS: ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'svg'],
Expand Down
4 changes: 4 additions & 0 deletions src/components/Icon/Illustrations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ import ReceiptsSearchYellow from '../../../assets/images/product-illustrations/r
import ReceiptYellow from '../../../assets/images/product-illustrations/receipt--yellow.svg';
import RocketBlue from '../../../assets/images/product-illustrations/rocket--blue.svg';
import RocketOrange from '../../../assets/images/product-illustrations/rocket--orange.svg';
import SafeBlue from '../../../assets/images/product-illustrations/safe.svg';
import TadaYellow from '../../../assets/images/product-illustrations/tada--yellow.svg';
import TadaBlue from '../../../assets/images/product-illustrations/tada--blue.svg';
import ToddBehindCloud from '../../../assets/images/product-illustrations/todd-behind-cloud.svg';
import GpsTrackOrange from '../../../assets/images/product-illustrations/gps-track--orange.svg';
import ShieldYellow from '../../../assets/images/simple-illustrations/simple-illustration__shield.svg';
import MoneyReceipts from '../../../assets/images/simple-illustrations/simple-illustration__money-receipts.svg';
Expand Down Expand Up @@ -58,8 +60,10 @@ export {
ReceiptYellow,
RocketBlue,
RocketOrange,
SafeBlue,
TadaYellow,
TadaBlue,
ToddBehindCloud,
GpsTrackOrange,
ShieldYellow,
MoneyReceipts,
Expand Down
Loading
Loading