refactor(ramps-controller): store full region objects in userRegion #7646
+922
−81
Conversation
This file contains hidden or 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
AxelGes
approved these changes
Jan 16, 2026
| // This ensures that once a region is set (either via geolocation or manual selection), | ||
| // it will not be overwritten by subsequent geolocation fetches. | ||
| if (this.state.userRegion && !options?.forceRefresh) { | ||
| return this.state.userRegion; |
There was a problem hiding this comment.
Missing migration for persisted string userRegion causes silent failures
High Severity
Since userRegion has persist: true, users upgrading from a previous version where userRegion was a string will have that string loaded into state. The truthiness check at line 521 passes for a string like "us", causing updateUserRegion() to return the string directly instead of a UserRegion object. Subsequently, all userRegion?.regionCode accesses return undefined (strings lack this property), causing the userRegionCode === undefined checks in updateEligibility and getTokens to always pass, leading to incorrect state updates regardless of the actual region.
Additional Locations (1)
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.
Explanation
Refactors
userRegionstate inRampsControllerto store fullCountryandStateobjects instead of just the region code string.Changes
userRegionfromstring | nulltoUserRegion | nullUserRegiontype contains:country: Country- Full country objectstate: State | null- State object if applicable, null otherwiseregionCode: string- Normalized region code (e.g., "us-ut", "fr")setUserRegion()andupdateUserRegion()to fetch countries and find matching Country/State objectsuserRegion.regionCodefor API callsUserRegiontype for consumersregionCodeis normalized at creationBenefits
country.phone.template) without re-parsing region codesBreaking Changes
The
userRegionvariable name remains the same but the type changed fromstringtoUserRegion.References
Checklist
Note
Introduces structured region handling in RampsController.
userRegionnow stores aUserRegionobject (country,state|null,regionCode); access code viauserRegion.regionCode. ExportsUserRegion.updateUserRegion()/setUserRegion()to fetchgetCountries(), map codes toCountry/State, avoid overwriting existing region unlessforceRefresh, and cleartokenson region change. Adds robust handling for missing/failed geolocation/countries/eligibility.findRegionFromCode()helper; updatesinit()to skip geolocation when region already set and to fetch tokens usingregionCode.updateEligibility()/getTokens()to useuserRegion.regionCodeand guard state updates by current region; expands tests for caching, race conditions, and error cases.Written by Cursor Bugbot for commit eda30d6. This will update automatically on new commits. Configure here.