scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feat/SW-3549-pass-scandic-token (pull request #2989)

Browse Source 
Feat/SW-3549 pass scandic token

* WIP pass scandic token

* pass scandic token when booking

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token

* pass user token when doing availability search

* undo changes

* merge

* Merged in fix/sw-3551-rsc-bookingflowconfig (pull request #2988)

fix(SW-3551): Fix issue with BookingConfigProvider in RSC

* wip move config to pages

* Move config providing to pages

* Merged in fix/update-promo-error-modal-text (pull request #2990)

fix: update promo error modal text

* fix: update promo error modal text


Approved-by: Emma Zettervall

* Merged in fix/sw-3514-missing-membership-input-for-multiroom (pull request #2991)

fix(SW-3514): Show join Scandic Friends card for SAS multiroom

* Show join card for room 2+


Approved-by: Hrishikesh Vaipurkar

* Merged in feat/lokalise-rebuild (pull request #2993)

Feat/lokalise rebuild

* chore(lokalise): update translation ids

* chore(lokalise): easier to switch between projects

* chore(lokalise): update translation ids

* .

* .

* .

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* .

* .

* chore(lokalise): update translation ids

* chore(lokalise): update translation ids

* chore(lokalise): new translations

* merge

* switch to errors for missing id's

* merge

* sync translations


Approved-by: Linus Flood

* Merged in feat/SW-3552-logout-from-social-session-when- (pull request #2994)

feat(SW-3552): Removed scandic session on logout

Approved-by: Joakim Jäderberg

* merge

* replace getRedemptionTokenSafely() with context based instead

* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls

* Refactor user verification and error handling across multiple components; implement safeTry utility for safer async calls

* merge

* Merge branch 'master' of bitbucket.org:scandic-swap/web into feat/SW-3549-pass-scandic-token

* add booking scope

remove unused getMembershipNumber()


Approved-by: Anton Gunnarsson
Approved-by: Hrishikesh Vaipurkar
This commit is contained in:
Joakim Jäderberg
2025-10-24 13:17:02 +00:00
parent c473bbc8b0
commit 3b3e7308cc
36 changed files with 558 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/scandic-web/actions/editProfile.ts
View File

@@ -105,17 +105,17 @@ export const editProfile = protectedServerActionProcedure
if (typedKey === "address") {
if (
(payload.data.address.city === profile.address.city ||
(!payload.data.address.city && !profile.address.city)) &&
(payload.data.address.countryCode === profile.address.countryCode ||
(payload.data.address.city === profile.address?.city ||
(!payload.data.address.city && !profile.address?.city)) &&
(payload.data.address.countryCode === profile.address?.countryCode ||
(!payload.data.address.countryCode &&
!profile.address.countryCode)) &&
!profile.address?.countryCode)) &&
(payload.data.address.streetAddress ===
profile.address.streetAddress ||
profile.address?.streetAddress ||
(!payload.data.address.streetAddress &&
!profile.address.streetAddress)) &&
(payload.data.address.zipCode === profile.address.zipCode ||
(!payload.data.address.zipCode && !profile.address.zipCode))
!profile.address?.streetAddress)) &&
(payload.data.address.zipCode === profile.address?.zipCode ||
(!payload.data.address.zipCode && !profile.address?.zipCode))
) {
// untouched - noop
} else {