Commit Graph

133 Commits

Author SHA1 Message Date
Joakim Jäderberg
e4c5363fe9 Merged in fix/BOOK-399-default-language (pull request #2877)
fix(BOOK-399): Default language to 'en' when we've ended up in a invalid state

* fix(BOOK-399): Default language to 'en' when we've ended up in a invalid state

* PR fixes: reuse types and include local dev error message


Approved-by: Anton Gunnarsson
Approved-by: Linus Flood
2025-09-29 14:18:27 +00:00
Matilda Landström
e8968a9eaf Merged in fix/Lokalise (pull request #2851)
fix label typo

* fix label typo


Approved-by: Bianca Widstam
2025-09-23 11:25:53 +00:00
Bianca Widstam
56764f8720 Merged in sync/Localize (pull request #2850)
sync to localize

* sync to localize


Approved-by: Anton Gunnarsson
2025-09-23 09:37:15 +00:00
Matilda Landström
e6d5c45ca7 Merged in fix/Lokalise-update (pull request #2807)
Fix/Lokalise update

* chore: update English keys

* fix: update from Lokalise


Approved-by: Linus Flood
2025-09-16 11:46:31 +00:00
Matilda Landström
70f3b8f016 Merged in feat/Lokalise-update-080925 (pull request #2771)
feat: Update from Lokalise 080925

* feat: Update from Lokalise 080925


Approved-by: Anton Gunnarsson
2025-09-09 06:41:29 +00:00
Anton Gunnarsson
ca408bbbb5 Merged in chore/update-readmes (pull request #2751)
chore: Update README

* Update readme


Approved-by: Chuma Mcphoy (We Ahead)
Approved-by: Joakim Jäderberg
2025-09-03 08:54:50 +00:00
Bianca Widstam
5af320eb92 Merged in localize/sync (pull request #2722)
Localize/sync

* sync/localize

* localize


Approved-by: Anton Gunnarsson
2025-08-28 09:15:04 +00:00
Linus Flood
d16c6b8082 Merged in feat/lokalise-sync-220825 (pull request #2690)
Lokalise sync

* Lokalise sync


Approved-by: Joakim Jäderberg
2025-08-22 13:10:47 +00:00
Linus Flood
985d47d7b3 Merged in feat/lokalise-sync-140825 (pull request #2652)
Lokalise sync 14-08-25

* Lokalise sync 14-08-25


Approved-by: Joakim Jäderberg
2025-08-14 06:27:35 +00:00
Linus Flood
011f191c65 Merged in feat/lokalise-sync-120825 (pull request #2620)
Lokalise sync 12-08-25

* Lokalise sync 12-08-25


Approved-by: Anton Gunnarsson
2025-08-12 08:37:42 +00:00
Anton Gunnarsson
3922ade199 Merged in chore/update-translations-2025-07-31 (pull request #2585)
Update translations

* Update translations


Approved-by: Matilda Landström
2025-07-31 11:59:08 +00:00
Anton Gunnarsson
ab233fb1c0 Merged in chore/synk-lokalise-25-07-11 (pull request #2551)
chore: Sync with Lokalise

* Run i18n:sync


Approved-by: Matilda Landström
2025-07-11 07:55:11 +00:00
Anton Gunnarsson
233c685e52 Merged in feat/sw-2333-package-and-sas-i18n (pull request #2538)
feat(SW-2333): I18n for multiple apps and packages

* Set upp i18n in partner-sas

* Adapt lokalise workflow to monorepo

* Fix layout props


Approved-by: Linus Flood
2025-07-10 07:00:03 +00:00
Joakim Jäderberg
daf765f3d5 Merged in feature/wrap-logging (pull request #2511)
Feature/wrap logging

* feat: change all logging to go through our own logger function so that we can control log levels

* move packages/trpc to using our own logger

* merge


Approved-by: Linus Flood
2025-07-03 12:37:04 +00:00
Anton Gunnarsson
6eeaa1cd40 Merged in feat/sw-2872-dependency-inject-app-context-in-trpc-package (pull request #2478)
feat(SW-2872) Dependency inject app context in trpc package

* Move appRouter to trpc package

* WIP Move serverClient to trpc package

Doesn't handle errors yet

* Don't use global

* Use trpc everywhere


Approved-by: Linus Flood
2025-07-01 08:49:33 +00:00
Linus Flood
5ba31f6afe Merged in feat/lokalise-sync-250701 (pull request #2486)
Lokalise sync

* Lokalise sync
2025-07-01 06:04:59 +00:00
Linus Flood
a8a11cca25 Merged in fix/lokalise-sync-250630 (pull request #2474)
Sync lokalise

* Sync lokalise


Approved-by: Bianca Widstam
2025-06-30 11:26:14 +00:00
Anton Gunnarsson
002d093af4 Merged in feat/sw-2863-move-contentstack-router-to-trpc-package (pull request #2389)
feat(SW-2863): Move contentstack router to trpc package

* Add exports to packages and lint rule to prevent relative imports

* Add env to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* WIP first step

* update internal imports in trpc

* Fix most errors in scandic-web

Just 100 left...

* Move Props type out of trpc

* Fix CategorizedFilters types

* Move more schemas in hotel router

* Fix deps

* fix getNonContentstackUrls

* Fix import error

* Fix entry error handling

* Fix generateMetadata metrics

* Fix alertType enum

* Fix duplicated types

* lint:fix

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package

* Fix broken imports

* Merge branch 'master' into feat/sw-2863-move-contentstack-router-to-trpc-package


Approved-by: Linus Flood
2025-06-26 07:53:01 +00:00
Michael Zetterberg
db0e92ff12 feat: sync labels 2025-06-18 13:30:42 +00:00
Anton Gunnarsson
846fd904a6 Merged in feat/sw-2859-set-up-shared-trpc-package (pull request #2319)
feat(SW-2859): Create trpc package

* Add isEdge, safeTry and dataCache to new common package

* Add eslint and move prettier config

* Clean up tests

* Create trpc package and move initialization

* Move errors and a few procedures

* Move telemetry to common package

* Move tokenManager to common package

* Add Sentry to procedures

* Clean up procedures

* Fix self-referencing imports

* Add exports to packages and lint rule to prevent relative imports

* Add env to trpc package

* Add eslint to trpc package

* Apply lint rules

* Use direct imports from trpc package

* Add lint-staged config to trpc

* Move lang enum to common

* Restructure trpc package folder structure

* Fix lang imports


Approved-by: Linus Flood
2025-06-18 12:14:20 +00:00
Michael Zetterberg
5826901c0e feat: include hidden labels + sync 2025-06-13 12:01:54 +00:00
Michael Zetterberg
2c9f3c4c5e feat: lokalise clean 2025-06-12 08:56:10 +00:00
Michael Zetterberg
925890dc71 feat: sync labels 2025-06-09 08:55:41 +00:00
Anton Gunnarsson
cbf9e7b7c2 Merged in chore/next15 (pull request #1999)
chore (SW-834): Upgrade to Next 15

* wip: apply codemod and upgrade swc plugin

* wip: design-system to react 19, fix issues from async (search)params

* wip: fix remaining issues from codemod

serverClient is now async because context use headers()
getLang is now async because it uses headers()

* Minor cleanup

* Inline react-material-symbols package

Package is seemingly not maintained any more and doesn't support
React 19. This copies the package source into `design-system`,
makes the necessary changes for 19 and export it for others to use.

* Fix missing awaits

* Disable modal exit animations

Enabling modal exit animations via isExiting prop is causing
modals to be rendered in "hidden" state and never unmount.
Seems to be an issue with react-aria-components,
see https://github.com/adobe/react-spectrum/issues/7563.
Can probably be fixed by rewriting to a solution similar to
https://react-spectrum.adobe.com/react-aria/examples/framer-modal-sheet.html

* Remove unstable cache implementation and use in memory cache locally

* Fix ref type in SelectFilter

* Use cloneElement to add key prop to element


Approved-by: Linus Flood
2025-06-02 11:11:50 +00:00
Michael Zetterberg
8d5fc6e678 fix: sync from Lokalise 2025-05-28 2025-06-02 10:07:43 +00:00
Michael Zetterberg
db93cc7d0e fix: sync from Lokalise 2025-05-27 06:24:20 +00:00
Michael Zetterberg
b5b4a61c41 feat: add support for hidden labels when diffing Lokalise labels 2025-05-23 07:07:03 +00:00
Anton Gunnarsson
e4ad0d3466 Update typescript 2025-05-22 14:00:38 +02:00
Michael Zetterberg
f3936f41d8 Merged in fix/label-sync (pull request #2163)
fix: english label sync

* fix: english label sync

* fix: sync from Lokalise


Approved-by: Linus Flood
2025-05-21 04:11:22 +00:00
Joakim Jäderberg
cbbde963dc Merged in fix/my-pages-menu-not-translated (pull request #2045)
fix: my pages menu not translated

* fix: my pages menu not translated
fix: able to pass lang to getIntl()


Approved-by: Michael Zetterberg
2025-05-12 07:57:11 +00:00
Michael Zetterberg
ef380e2d36 fix: sync from Lokalise 2025-05-09 14:37:15 +02:00
Matilda Landström
e70273f257 fix: update copy 2025-05-03 09:59:54 +00:00
Matilda Landström
e059c5d30d fix: update copy 2025-05-03 09:59:54 +00:00
Matilda Landström
2a333334ac fix: update copy 2025-05-03 09:59:54 +00:00
Anton Gunnarsson
a04817277e Merged in fix/sync-from-lokalise (pull request #1905)
Sync from Lokalise

* Sync from lokalise 2025-04-29


Approved-by: Joakim Jäderberg
2025-04-29 13:59:08 +00:00
Michael Zetterberg
fcf1cc8fbb fix: sync from Lokalise 2025-04-29 11:09:14 +02:00
Erik Tiekstra
8152aea649 fix(SW-1241): Adjusted amenities sidepeek on hotel pages and booking flow
Approved-by: Michael Zetterberg
Approved-by: Matilda Landström
2025-04-23 08:41:04 +00:00
Erik Tiekstra
7108537cb8 fix/SW-2247 enter details fixes
* fix(SW-2247): Removed accordion like special requests block and changed button variant

* fix(SW-2247): Added additional info for bedtype selection

Approved-by: Tobias Johansson
Approved-by: Niclas Edenvin
2025-04-16 09:49:53 +00:00
Erik Tiekstra
af182b49d8 feat(SW-2227): Implemented new design for room package filters
Approved-by: Arvid Norlin
2025-04-16 07:07:49 +00:00
Anton Gunnarsson
3449ccec52 Merged in feat/sw-2232-sas-api-updates (pull request #1786)
SW-2232 Adapt SAS router to API changes

* Adapt sas procedures to api changes

* Remove debug logs

* Capture performLevelUpgrade error

* More sentry logging

* Merge branch 'master' into feat/sw-2232-sas-api-updates


Approved-by: Joakim Jäderberg
2025-04-14 13:42:58 +00:00
Michael Zetterberg
37ac9f607c feat(SW-706): load .env.local for download and upload 2025-04-14 11:30:07 +00:00
Michael Zetterberg
7de46cafa8 feat(SW-706): add diff tooling 2025-04-14 11:30:07 +00:00
Michael Zetterberg
65932ddfd3 feat(SW-706): use Lokalise 2025-04-14 11:30:06 +00:00
Michael Zetterberg
e22fc1f3c8 feat(SW-706): add Lokalise tooling and codemod 2025-04-14 11:30:05 +00:00
Simon Emanuelsson
d72c84d949 feat: filters work together 2025-04-14 06:51:44 +00:00
Chuma Mcphoy (We Ahead)
31370fe711 Merged in fix/SW-2197-dont-show-benefits-not-applied-text (pull request #1776)
fix(SW-2197): remove no membership benefits message

* fix(SW-2197): remove no membership benefits message


Approved-by: Christian Andolf
Approved-by: Matilda Landström
2025-04-14 06:40:40 +00:00
Simon Emanuelsson
afb37d0cc5 feat: bedtypes is selectable again 2025-04-12 08:32:42 +00:00
Bianca Widstam
77c03905e4 Merged in fix/hide-payment-if-only-points (pull request #1741)
Feat(SW-1943): add new design for pay ancillaries with points

* fix: hide card and payment info if only quantity with points is selected

* feat(SW-1943): add new design for pay ancillaries with points

* feat(SW-1943): add missing translation

* feat(SW-1943): fix rebase

* feat(SW-1943): remove console log


Approved-by: Linus Flood
Approved-by: Matilda Landström
2025-04-10 06:18:02 +00:00
Matilda Landström
6bbe80526e Merged in feat/SW-2238-icons (pull request #1767)
Feat/SW-2238: Fix swapped icons, add missing translation

* fix(SW-2238): switch swapped icons

* fix: add missing translation


Approved-by: Christian Andolf
2025-04-09 12:58:48 +00:00
Hrishikesh Vaipurkar
73cb423c95 Merged in feat/SW-2078-update-confirmation-page-vouchers (pull request #1731)
Feat/SW-2078 update confirmation page vouchers and Corp Cheques rate

* feat: SW-2078 Tablet bookingCode ref forward issue fix

(cherry picked from commit 16a6a00fd99b6b6220a98ad74de062d67d35e1c0)

* feat: SW-2078 Display Vouchers and Cheques prices on confirmation page

(cherry picked from commit a76494de497a7d5e7641cb0036bd7055acf875c1)

* feat: SW-2078 Rebase issue fix

* feat: SW-2079 Updated rate title in terms modal

* feat: SW-2078 Optimized code

* feat: SW-2078 Removed extra tags


Approved-by: Christian Andolf
2025-04-08 07:27:40 +00:00