Skip to content

Commit 939690e

Browse files
authored
fix: google cancel login in android cp-7.53.0 (MetaMask#18596)
<!-- Please submit this PR as a draft initially. Do not mark it as "Ready for review" until the template has been completely filled out, and PR status checks have passed at least once. --> ## **Description** Sentry Error capture screen appear when user cancel google login ( when user only have one google account). This is due to google throw different error message when user cancel when user have one account and multiple account. fixed by lower cases the error message and regex keyword to determine the error is due to user cancel Error throwed by google - when only one account login in device `Cancelled by user` - when have multiple account in device `User cancelled the selector` <!-- Write a short description of the changes included in this pull request, also include relevant motivation and context. Have in mind the following questions: 1. What is the reason for the change? 2. What is the improvement/solution? --> ## **Changelog** <!-- If this PR is not End-User-Facing and should not show up in the CHANGELOG, you can choose to either: 1. Write `CHANGELOG entry: null` 2. Label with `no-changelog` If this PR is End-User-Facing, please write a short User-Facing description in the past tense like: `CHANGELOG entry: Added a new tab for users to see their NFTs` `CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker` (This helps the Release Engineer do their job more quickly and accurately) --> CHANGELOG entry: ## **Related issues** Fixes: MetaMask#18597 ## **Manual testing steps** ```gherkin Feature: Cancel google login in android Scenario: user try google login flow in android Given user have only 1 google account sign in device When user cancel the google login flow Then there will be no sentry capture screen ``` ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** <!-- [screenshots/recordings] --> https://github.com/user-attachments/assets/10015924-265c-4ca7-947a-fcec9f868501 ## **Pre-merge author checklist** - [x] I’ve followed [MetaMask Contributor Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile Coding Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md). - [x] I've completed the PR template to the best of my ability - [x] I’ve included tests if applicable - [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format if applicable - [x] I’ve applied the right labels on the PR (see [labeling guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)). Not required for external contributors. ## **Pre-merge reviewer checklist** - [ ] I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed). - [ ] I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.
1 parent 9ce26d8 commit 939690e

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

  • app/core/OAuthService/OAuthLoginHandlers/androidHandlers

app/core/OAuthService/OAuthLoginHandlers/androidHandlers/google.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export class AndroidGoogleLoginHandler extends BaseLoginHandler {
7171
if (error instanceof OAuthError) {
7272
throw error;
7373
} else if (error instanceof Error) {
74-
if (error.message.includes('cancelled')) {
74+
if (error.message.toLowerCase().includes('cancel')) {
7575
throw new OAuthError(
7676
'handleGoogleLogin: User cancelled the login process',
7777
OAuthErrorType.UserCancelled,

0 commit comments

Comments
 (0)