Skip to content

Merge main into v3 - #716

Merged
qroll merged 26 commits into
pre-release/v3from
merge-main-into-v3
Aug 20, 2026
Merged

Merge main into v3#716
qroll merged 26 commits into
pre-release/v3from
merge-main-into-v3

Conversation

@qroll

@qroll qroll commented Aug 17, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Type of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing apis or functionality to change)
  • Documentation (change to documentation, comments or API descriptions)
  • Tests (improvements to unit tests or E2E tests)
  • Other (technical improvements, refactoring, or changes that don't fall into the above categories)

Description of changes

  • Key merge conflicts:
    • Add await renderComponent to new location-field unit tests
    • Allow labelTestSuite to handle promise for render fn (used by location-field)
    • Update renderNonSGLocationErrorPrompt to Linaria
  • Update radio-button e2e test to reflect fixed stretch behaviour
  • Attempt to stablise of existing location-field modal e2e tests
    • workaround inconsistent timing of getCurrentLocation helper
    • onemap attribution icon and text keep shifting - force vertical centering
    • default white background of location search input element keeps shifting by 1px - removed the background as it's not needed anyway, also used a font token to ensure the font renders consistently

Checklist

  • Changes follow the project guidelines in CONTRIBUTING.md
  • Looks good on mobile and tablet
  • Updated documentation
  • Added/updated unit tests

Screenshots

Screenshot 2026-08-17 at 12 12 20 PM Screenshot 2026-08-17 at 12 12 34 PM

Weidong2291423 and others added 23 commits July 22, 2026 17:35
@Weidong2291423
[MOL-21191][WEIDONG] add restrictNonSGLocation to block out-of-Singap…
0375cbf 
…ore selections using SLA National Map Polygon boundary
@weidong-gws
[MOL-21191][WEIDONG] extract non-SG location prompt render and early-…
b6f6e84 
…return confirm guard per review
@weidong-gws
[MOL-21191][WEIDONG] address review comments: guard confirm-location …
9023bc7 
…trigger, treat 0 as valid coordinate, fix stale restrictNonSGLocation on runtime toggle
@ghazwanmuhammad
[MISC][GZ] shared dirty state test suite and render helper
b7f5b07
@ghazwanmuhammad
[MISC][GZ] update label test suite typing
15bfeff
@ghazwanmuhammad
[MISC][GZ] include warnings test suite in barrel export
052c077
@ghazwanmuhammad
[MISC][GZ] extract schema out of render component fn
c344314
jonathan tran
fix: [DCUBESDQLR-2862][JON] Prevent scroll wheel from changing numeri…
a2df44f 
…c field value
@weili-govtech
Merge pull request #710 from LifeSG/DCUBESDQLR-2862
c04260f 
fix: [DCUBESDQLR-2862][JON] Prevent scroll wheel from changing numeric field value
@ghazwanmuhammad
[MISC][GZ] reduce the rest of dirty state test boilerplate
906719e
@nvhieu9
[MISC][HN] set undefined for deselected item
00530f6
@nvhieu9
[MISC][HN] fix stretch style
c9f2110
@weili-govtech
Merge pull request #713 from LifeSG/fix-toggle-radio
8e96b72 
Fix toggle radio
@ngweili
[MISC][WL] v2.2.7
7ff75e9
@weili-govtech
Merge pull request #714 from LifeSG/release/v2.2.7
72e427a 
[MISC][WL] v2.2.7
@qroll
Merge pull request #633 from LifeSG/misc/unit-test
cf83a51 
[MISC][GZ] shared dirty state test suite and render helper
@weidong-gws @claude
Merge branch 'main' into MOL-21191
172ff00 
Resolve conflict in location-field.spec.tsx: keep restrictNonSGLocation test suite
alongside upstream's dirtyStateTestSuite refactor.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@weidong-gws
[MOL-21191][WEIDONG] add restrictNonSGLocation and mustHavePostalCode…
c6a2cb1 
… to prefill effect deps per review
@weili-govtech
Merge pull request #676 from LifeSG/MOL-21191
8336a1a 
[MOL-21191][WEIDONG] add restrictNonSGLocation to block out-of-Singapore selections using SLA National Map Polygon boundary
@ngweili
[MISC][WL] v2.2.8
85f2b6c
@weili-govtech
Merge pull request #715 from LifeSG/release/v2.2.8
bfc5a5d 
[MISC][WL] v2.2.8
Quek Ruo Ling
Merge remote-tracking branch 'origin/main' into merge-v3
5e56aac
Quek Ruo Ling
[MISC][RL] Resolve location-modal test failures
bda790f
@qroll
qroll changed the base branch from main to pre-release/v3 August 17, 2026 02:20
@qroll qroll closed this Aug 17, 2026
@qroll qroll reopened this Aug 17, 2026
@qroll qroll added this to the v3.0.0-alpha.1 milestone Aug 17, 2026
@qroll qroll added the type: chore For technical improvements or refactoring. label Aug 17, 2026
@qroll
qroll force-pushed the merge-main-into-v3 branch 3 times, most recently from 7452c15 to 9ecb4b5 Compare August 18, 2026 04:56
@qroll
qroll force-pushed the merge-main-into-v3 branch from 9ecb4b5 to a35453b Compare August 18, 2026 05:23
@qroll
qroll marked this pull request as ready for review August 18, 2026 05:49
@qroll
qroll requested review from ghazwan-gt and ziggyzet August 19, 2026 00:20
@qroll
qroll merged commit 50a1271 into pre-release/v3 Aug 20, 2026
2 checks passed
@qroll
qroll deleted the merge-main-into-v3 branch August 20, 2026 06:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ghazwan-gt ghazwan-gt ghazwan-gt approved these changes
@ziggyzet ziggyzet Awaiting requested review from ziggyzet

Assignees

No one assigned

Labels

type: chore For technical improvements or refactoring.

Projects

None yet

Milestone

v3.0.0-alpha.1

Development

Successfully merging this pull request may close these issues.

8 participants

@qroll @ghazwan-gt @Weidong2291423 @weidong-gws @ghazwanmuhammad @weili-govtech @nvhieu9 @ngweili