Eunjae Lee and Peer Richelsen
7ec928f5c2
feat: keep column visibility on query params ( #19013 )
...
* feat: keep column visibility on query params
* fix resizing logic
---------
Co-authored-by: Peer Richelsen <peeroke@gmail.com >
2025-01-30 13:19:03 +00:00
1e610ea684
perf: don't fetch all the hosts ( #18319 )
...
* perf: don't fetch all the hosts
* fix: type err
* use appschema only when necessary
* Variable casing change and type fixes
* Another missing ts fix
* chore: update variable name
* chore: remove from personal event types
* chore: remove limitHostsToThree
* chore: make it a variable
* chore: move it below
* chore: change name to firstThreeHosts
* chore: update to first three users
* fix: type error
* chore: add firstThreeHosts
* fix: type error
* fix: type error
* fix: support users
* chore: update metadata
* fix: API v2 build error
* chore: change var name
* chore: remove cursorrules
* chore: undo API v2 changes
* chore: add type
---------
Co-authored-by: Hariom <hariombalhara@gmail.com >
Co-authored-by: Keith Williams <keithwillcode@gmail.com >
2025-01-29 19:05:54 +02:00
Eunjae Lee
5c98861f6f
fix: re-design DateRangeFilter ( #18924 )
...
* fix: re-design DateRangeFilter
* update style
* adjust padding
2025-01-29 16:41:53 +00:00
Somay Chauhan
be1b9d1a79
feat: skip confirm step in booker ( #18773 )
...
* feat: skip confirm step
* better naming
* disable on loading
* feat: added cloudflare turnstile captcha to booker
* Update Booker.tsx
* Update AvailableTimeSlots.tsx
* made optional to fix type errors
* Update Booker.tsx
* Update getBookingResponsesSchema.ts
* Update Booker.tsx
* fixed failing tests
* added tests
* fix: fixed failing embed tests
2025-01-29 12:56:23 -03:00
Hariom Balhara
ac8b4a2861
fix: Wrong username with -{DOMAIN} in case of an autoAcceptEmail when synced through SCIM ( #18384 )
...
* Okta fixes
* Fix username and name in case of sync from Okta
* Fix username and name in case of sync from Okta
* Add test
* cleanup code and add tests
2025-01-29 12:05:27 -03:00
Syed Ali Shahbaz
92678dc042
fix: eventtype null cant be booked error ( #18975 )
...
* fix err msg and add more description
* improvements
* fix cause
* add warn logs for when failing to specific limit checks
* typefix
* safestringify log
* improve error
* test fix and log min booking notice
* adds out of bounds error code
* test fix
* fix
2025-01-29 13:00:51 +00:00
8615ccb1aa
feat: routing forms integration for booker atom ( #18726 )
...
* update booker atom for routing form
* remove logs
* hide routing form properties from docs
* fixup
* add comments to explain why certain fields are not defined for routing forms in v2
* chore: routing for handler return team and org id
* bump libraries platform
* fixup! bump libraries platform
* chore: get routing form params to embed
* logs to remove
* fix import path
* chore: handle routing form params in booker embed
* wip need router api v2 endpoint
* resolve merge conflicts
* fixup
* fixup! Merge branch 'main' into remove-redirect-on-success-for-platform
* fixup! fixup! Merge branch 'main' into remove-redirect-on-success-for-platform
* router atom
* fix libraries version
* cleanup
* remove console logs
* bump libraries
---------
Co-authored-by: Morgan Vernay <morgan@cal.com >
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com >
2025-01-29 13:51:58 +02:00
438a73b0cd
feat: Setting for rescheduling past bookings ( #18358 )
...
* feat: Setting for rescheduling past bookings
* fix stuff
* rename column
* add e2e test
* fix column name
* fix typo
---------
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com >
Co-authored-by: Peer Richelsen <peeroke@gmail.com >
Co-authored-by: CarinaWolli <wollencarina@gmail.com >
2025-01-28 19:25:41 +00:00
Joe Au-Yeung
39891ee308
fix: Tasker CRM - parse full app metadata ( #18961 )
...
* Parse correct app data
* Add error catching
2025-01-28 15:57:55 -03:00
Eunjae Lee
f8a443557a
fix: show sort state on column header ( #18950 )
2025-01-28 18:50:16 +01:00
Carina Wollendorfer and CarinaWolli
fa82ecd2a5
fix: admin should see all routing forms (Router position) ( #18931 )
...
Co-authored-by: CarinaWolli <wollencarina@gmail.com >
2025-01-28 17:29:44 +00:00
Eunjae Lee
8f8af6536c
fix: remove stale cache for column visibility state ( #18944 )
2025-01-28 16:37:06 +00:00
Joe Au-Yeung
7d4abea9b4
Add uid and event responses to tasker calendar event ( #18930 )
2025-01-27 22:29:48 +00:00
Benny Joo
ae51c8b599
fix: make workflow page not static ( #18925 )
...
* fix: make workflow page not static
* fix
* fix
2025-01-27 18:05:15 +00:00
Joe Au-Yeung
4a93511f50
fix: Add Stripe past_due to active team subscription status ( #18917 )
2025-01-27 16:17:09 +00:00
Eunjae Lee
61a2a3ef5a
chore: clean up ColumnFilterType ( #18915 )
2025-01-27 17:13:10 +01:00
Eunjae Lee
8be2ea8117
chore: split data-table/components/filters/index.tsx ( #18679 )
...
* chore: split data-table/components/filters/index.tsx
* fix type error
* fix type error
2025-01-27 10:35:51 +00:00
Eunjae Lee
d3ef807af5
feat: add command list to DataTable column header ( #18867 )
...
* feat: add command list to DataTable column header
* disable hiding and sorting for some columns
* disable hiding & sorting
2025-01-27 10:20:59 +00:00
Syed Ali Shahbaz and Morgan Vernay
41f63582b2
feat: Add booking and user creation source ( #18768 )
...
* migration and init to accept creationSource for new bookings
* V1 create booking
* V1 user creation
* webapp booking + V1 user
* user creation in V1, V2 and webapp
* booking source V2 and fix for v1 user
* fit type
* --fix type
* add test -- WIP
* fix type
* fix type
* ^
* Need more sleep zzz
* -_-
* bump libraries platform
* adds for v2 recurring booking
* fix lint
* instant meetings
* fix: api v2 creation source
* fixup! fix: api v2 creation source
* bump libraries
* add user
* fix test
* fixup! fix test
* add more source
* more source...
* fix type & test --1
* fix type & test --2
* typefix
* fixup test
---------
Co-authored-by: Morgan Vernay <morgan@cal.com >
2025-01-27 11:01:33 +01:00
Benny Joo
2b79ef0836
perf: replace getServerSessionForAppDir usages with our original getServerSession function ( #18897 )
2025-01-26 21:57:02 +00:00
Benny Joo
828940b4d6
chore: app router - /payment pages ( #18152 )
...
* remove Head from payment page comp
* remove route from pages router
* move out of future folder
* add to config.matcher
* remove unneeded code
* update middleware
* fix
* fix
2025-01-25 13:23:41 -05:00
Eunjae Lee
b234b16ad0
fix: convert People filter on /insights/routing from single select to multi select ( #18735 )
2025-01-24 17:15:49 +00:00
Anik Dhabal Babu and Udit Takkar
3586046786
fix: Hide events in the event type assignment tab for teams does not save ( #18868 )
...
* fix: flaky test organization.spec
* fix: Hide events in the event type assignment tab for teams does not save
---------
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com >
2025-01-24 22:15:11 +05:30
Eunjae Lee and Benny Joo
d5e633b481
fix: re-implement filter components in /insights/routing ( #18655 )
...
* fix: re-implement team filter & people filter components
* implement DateRangeFilter
* show selected filter values
---------
Co-authored-by: Benny Joo <sldisek783@gmail.com >
2025-01-24 17:38:48 +01:00
sean-brydon and Udit Takkar
38e7eb03f9
fix: attribute assignment hosts ( #18831 )
...
* load correct users in query state for attribute rr
* add segment loading state
* skeleton
* fix query value
* update tests
* fix type
* use query by testId so no error is thrown
* ensure queryValue children has valid values before we trigger api key
* chore: remove lg
---------
Co-authored-by: Udit Takkar <udit222001@gmail.com >
2025-01-24 09:41:13 +00:00
sean-brydon and Eunjae Lee
656d6dc195
feat: Internal Notes for bookings ( #18804 )
...
* migration + migrate booking limit page to team settings
* new pages
* use settings toggle for displaying content
* get current team presets
* update mutation
* i18n for settings page
* remove redudant await
* cancelation UI for select
* handle other selection
* extract into a util
* inital cancelation reason flow
* fix i18n to be more readable
* add cancel reason logic
* nits
* improve copy
* ensure is teamMember and not isAdmin for getting internalNotes
* improvie spacing between elements
* fix types
* more type fixes
* correct types
* Update packages/features/bookings/lib/handleNewBooking/getEventTypesFromDB.ts
* use input component and remove mb-2 to allign with icon button
* Update packages/trpc/server/routers/viewer/teams/updateInternalNotesPresets.handler.ts
Co-authored-by: Eunjae Lee <hey@eunjae.dev >
* nits
* type fixs
* fix type
* fix type
* fix nullable option lost in merge
---------
Co-authored-by: Eunjae Lee <hey@eunjae.dev >
2025-01-24 09:26:52 +00:00
Hariom Balhara
b3f946dd0b
feat: "cal.isBookingDryRun" to be used for Routing form as well ( #18832 )
2025-01-24 09:27:18 +05:30
Omar López
161aece3a1
fix: dual-sided incentives on webapp ( #18846 )
2025-01-23 21:30:36 +00:00
Eunjae Lee and sean-brydon
b304467f15
fix: use columnPinning API ( #18830 )
...
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com >
2025-01-23 18:25:42 +00:00
Benny Joo
8e191fed71
perf: Use one PageWrapper instance for every non-settings / non-bookings page in App Router ( #18747 )
...
* add a layoutfile to use-page-wrapper route group
* refactor and move bookings status page to route group
* improve logic in pagesAndRewritePaths
* fix
* add use client directive
* move /403 and /500
* move /auth/error
* move /connect-and-join
* move /enterprise
* move /maintenance
* move /more
* move /upgrade
* chore: remove WithLayout from 8 low-risk single pages (#18745 )
* move /403 and /500
* move /auth/error
* move /connect-and-join
* move /enterprise
* move /maintenance
* move /more
* move /upgrade
* move /availability pages
* move /event-types pages
* move /insights pages
* move /apps to use-page-wrapper group
* move /getting-started to use-page-wrapper group
* move /signup to use-page-wrapper group
* move /workflows to use-page-wrapper group
* move /video pages to use-page-wrapper group
* pass dehydratedState in layout
* pass dehydratedState in layout
* fix test
* fix @test
* fix
2025-01-23 10:01:46 -05:00
Benny Joo
f0d1c92e99
perf: create (use-page-wrapper) route group and replace WithLayout from /bookings/[status] page + 8 low-risk single pages ( #18737 )
...
* add a layoutfile to use-page-wrapper route group
* refactor and move bookings status page to route group
* improve logic in pagesAndRewritePaths
* fix
* add use client directive
* chore: remove WithLayout from 8 low-risk single pages (#18745 )
* move /403 and /500
* move /auth/error
* move /connect-and-join
* move /enterprise
* move /maintenance
* move /more
* move /upgrade
* pass dehydratedState in layout
2025-01-22 12:52:58 -05:00
Carina Wollendorfer and CarinaWolli
f523ce7795
fix: custom templates on team plan ( #18792 )
...
Co-authored-by: CarinaWolli <wollencarina@gmail.com >
2025-01-21 20:16:57 +00:00
7a9d291d1f
fix: handle cancelation reason when user is host ( #18681 )
...
* handle cancelation reason when user is host
* add attendee reason warning
* add cancellation reason to tests when we are the host
* req.body and not req
* fix: isloggedIn logic
* use new isLoggedInUser from ssr instead of client
* update e2e tests to fill in reason when hosts
---------
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com >
Co-authored-by: Udit Takkar <udit222001@gmail.com >
Co-authored-by: Peer Richelsen <peeroke@gmail.com >
2025-01-21 20:24:06 +05:30
3eb5490df9
feat: Use Cloudflare Turnstile in booker ( #18755 )
...
* feat: Use Cloudflare Turnstile in booker
* move files arround
* render turnstile widget and add token to store
* use token from body instead of headers
* watch cf token to re-render disabled state
* Update packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx
* Update packages/features/bookings/lib/create-booking.ts
* ensure bool
* add to recuring event
* fix recuring events
---------
Co-authored-by: sean-brydon <sean@cal.com >
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com >
Co-authored-by: Benny Joo <sldisek783@gmail.com >
2025-01-21 11:27:56 +05:30
Joe Au-Yeung
d6306dcd22
fix: Disable custom templates for trialing teams ( #18748 )
...
* Create `checkIfTeamHasActivePlan` method on `stripe-billing-service`
* Add `checkIfTeamPlanIsActive` to `InternalTeamBilling`
* Create `hasActiveTeamPlan` trpc endpoint
* Check for active team plan when updating workflows
* Create `useHasActiveTeamPlan` hook
* Use `useHasActiveTeamPlan` on workflow edit page
* Type fixes
* Type fix
* Add `accepted` to team query
2025-01-20 14:48:33 +00:00
Muhammad Aiman Sulaiman and kutsaniuk
7131a1f015
feat: HitPay Payment App ( #17213 )
...
* Build HitPay app
* Deleted a lint comment
* Add redirect for iframe
* Fix type check error
* Fixed issue of payment pending
* Update hitpay package.json
* fix: fix lint issue in KeyInput and update zod
* fix: fix issue of parsing string to number
* fix: add default hitpay API links
* fix: resolve atoms build error
---------
Co-authored-by: kutsaniuk <kutsaniuk@gmail.com >
2025-01-20 15:36:23 +01:00
Eunjae Lee
5357228f72
fix: nested scrolls on /bookings/upcoming ( #18760 )
2025-01-20 09:18:12 -05:00
Syed Ali Shahbaz
1f91fe888a
bump libphonenumber-js version to 1.11.18 ( #18757 )
2025-01-20 07:14:01 +00:00
sean-brydon and Alex van Andel
b4a51d3560
feat: auto lock ( #18630 )
...
* add delete to redis service
* auto lock + tests
* changes to autolock in api/book call
* remove log clutter
* add detection in api v1
* tpye changes
* throw error and add tests for API
* add response logic on locked + tests
* type response properly i hope?
* type fix
* add tests for counter not existing + redis errors
* remove IP - add sentry to track
* rename symbol
* fix type error
* fix tests
* remove sentry call spy
* fix type on sentry setUser call
---------
Co-authored-by: Alex van Andel <me@alexvanandel.com >
2025-01-18 16:21:12 -03:00
Eunjae Lee
4b264a867b
fix: adjust table height for a few rows on /bookings ( #18728 )
2025-01-17 23:07:39 +00:00
f411c6ed11
feat: Use dub.customer.list to issue dual-sided incentives ( #18452 )
...
* [FEAT] Use dub.customer to issue dual-sided incentives
* update dub implementation
* uncommit yarn.lock
* Update yarn.lock
* account for self-hosting
* remove comments
---------
Co-authored-by: Omar López <zomars@me.com >
Co-authored-by: Peer Richelsen <peeroke@gmail.com >
2025-01-17 21:33:33 +00:00
Steven Tey and Alex van Andel
6be69b820c
chore: Bump Dub version to fix createMany error ( #18591 )
...
Co-authored-by: Alex van Andel <me@alexvanandel.com >
2025-01-17 08:53:44 -07:00
Anik Dhabal Babu
8cc61a1fe9
fix: Impersonation issue from userstable ( #18608 )
...
* fix: visible error in the userlist handler
* Uncommit yarn.lock
* update
2025-01-17 14:04:41 +00:00
Anik Dhabal Babu
be2e1274ff
fix: Getting an error with managed events when accessing through api/v1 ( #18683 )
...
* fix: getting error with managed events when get through api/v1
* update
2025-01-17 13:59:34 +00:00
Udit Takkar
ea827ebbc6
fix: edit webhook time ( #18549 )
2025-01-17 08:56:50 +00:00
Cao Hoang
da1b8137c2
fix: filters ui breaking on mobile in routing insights page ( #18713 )
2025-01-17 09:40:16 +01:00
Anik Dhabal Babu and Udit Takkar
d182e5c99a
fix: Booking with the same email when using capital letters ( #18694 )
...
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com >
2025-01-17 09:37:10 +01:00
+8
6561b92f40
perf: Move CRM event creation to tasker ( #18370 )
...
* Upgrade jsforce to 3.6.2
* Refactor connecting to Salesforce
* Revert yarn.lock changes
* Add `TASKER_ENABLE_CRM_EVENT_CREATION` to .env
* Add createCRMEvent scheduler
* Schedule CRM event creating in `EventManager`
* Add calendar event builder for CRM tasks
* Do not write to person record if fields don't exist
* Change type to expect string from tasker
* Create CRM event
* Create booking references
* Type fixes
* Migrate callback endpoint
* Add jsforce node dependency
* Migrate add endpoint
* Import
* Import package into crmService
* Use new package types
* Type fix
* Update vite config
* Push updated lockfile
* Attempt to bump platform/libraries to unlock jsforce
* Also update lockfile, naturally
* bump platform libraries
* feat: salesforce to tasker improvements (#18419 )
* feat: salesforce to tasker
* refactor: event manager
* tests: add unit tests for create CRM Event
* Update vite.config
* Add jsforce to vite config
* Revert mint.json changes
* Default to not enabling
* Revert yarn.lock changes
* Remove `TASKER_ENABLE_CRM_EVENT_CREATION` variable
* Revert yarn.lock changes
* feat: Round Robin weights future members toggle (#17782 )
Co-authored-by: Omar López <zomars@me.com >
* detailed customer card (#18511 )
Co-authored-by: Omar López <zomars@me.com >
* chore: app router - all sub-pages in `/apps` (#16976 )
* chore: apps/[slug] remove pages router
* remove apps/[slug] pages from /future
* chore: apps/installed remove pages router
* chore: apps/installation remove pages router
* remove Head element
* fix metadata
* fix test
* fix another test
* chore: apps/categories remove pages router
* revert unneeded changes
* update middleware
* Remove <Head>
* remove unused import and code
* remove unused import and code again
* fix
* fix category page
* add split icon
* add /routing paths to middleware matcher
* wip
* remove HeadSeo from App.tsx
* clean up head-seo test
* add generateAppMetadata
* use generateAppMetadata in apps/[slug] page
* delete file
* remove log
* fix
* fix
* fix apps/installed pages
* fix cateogires pages
* fix
* fix imports
* wip
* fix
* fix
* fix metadata
* fix
* redirect /apps/routing-forms to /routing
* replace all usages of /apps/routing-forms to /routing
* better naming
* /routing -> /routing/forms
* fix
* fix
* fix
* fix
* remove backPath as it is irrelevant when withoutMain is true
* fix type checks
* fix type check in apps/[slug]
* refactors
* fix
* fix test
* fix
* fix
* fix
* Replace multiple leading slashes with a single slash
* migrate routing-forms too
* add re routing
* fix
* add redirection
---------
Co-authored-by: Peer Richelsen <peeroke@gmail.com >
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com >
* chore: app router 404 page (#18597 )
* wip
* wip
* fix not found page
* render middleware for /settings pages
* fix
* remove global-error page
* add metadata to not-found page
* make not-found page static
* remove 404
* adding not-found to middleware is not necessary
* add every routes to config.matcher
* fix test
* fix style
* use i18n string
* fix tests
* fix
* fix
* revert unneeded changes
* fix
* fix
* fix
* fix style
* fix
* remove 404
* remove log
* fix
* fix
* fix
* fix
* better naming
* parallel testing
---------
Co-authored-by: Benny Joo <sldisek783@gmail.com >
* feat: render custom error page for unexpected sever error + remove` pages/_error` (#18606 )
* remove page/_error
* refactor app/error
* fix: app/not-found cannot be a static page (#18610 )
* Async False (#18611 )
* chore: redirect to /500 if pathname does not exist + better error handling (#18615 )
* fix lint error
* fix booking page and better error handling
* chore: gracefully handle 404s from pages router's dynamic pages + tests (#18618 )
* restore pages/_error
* set custom header in pages/_error
* handle it in middleware
* add test
* remove logs
* better test description
* chore: try using custom 404 in pages/_error (#18622 )
* fix: parsing teamId (#18623 )
* chore: restore error pages for pages router (#18625 )
* disable emails to all guests (#18628 )
Co-authored-by: CarinaWolli <wollencarina@gmail.com >
* revert: "feat: bulk shorten links with dub.links.createMany (#18539 )" (#18587 )
This reverts commit 4902c6a0f8me@alexvanandel.com >
* chore: release v4.8.18
* fix: disable sending sms when email is present (#18632 )
* fix: disable sending sms when email is present
* fix: update test
* fix: main lint errors (#18634 )
* fix: error-page.tsx related lint errors
* fix: lint no continue-on-error
* Adding more lint fixes
* Bring back annotate code linting results
* Bring back linting continue-on-error
* Slimline lint
* feat: do not show automation webhooks in webhook list (#18607 )
* fix: make ESLint work and fix lint errors that were undetected before (#18639 )
* fix eslint config
* fix
* add it to dev dep
* fix
* sync eslint version
* force ts-node to compile our ESLint plugin's TS files into CommonJS (which ESLint requires)
* fix some lint errors
* fix lint errors
* remove duplicate classname
* make @typescript-eslint/ban-types a warn for packages/trpc files
* fix lint errors in trpc
* fix lint errors in trpc - 2
* fix
* fix
* fix lint warnings
* chore: clean up config.matcher in middleware (#18638 )
Co-authored-by: Alex van Andel <me@alexvanandel.com >
* Allow lint to error but continue (unblock pipeline)
* fix: potential fix for flaky layout shift (#18651 )
* potential fix: layout shift
* fix lint error
* feat: update translations via @replexica (#18598 )
* chore: sync with main
* feat: update translations via @replexica
---------
Co-authored-by: Replexica <support@replexica.com >
* Update yarn.lock
* nit: let tasker handle payload stringification
---------
Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com >
Co-authored-by: Alex van Andel <me@alexvanandel.com >
Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com >
Co-authored-by: Morgan Vernay <morgan@cal.com >
Co-authored-by: Omar López <zomars@me.com >
Co-authored-by: sean-brydon <55134778+sean-brydon@users.noreply.github.com >
Co-authored-by: Nizzy <140507264+nizzyabi@users.noreply.github.com >
Co-authored-by: Benny Joo <sldisek783@gmail.com >
Co-authored-by: Peer Richelsen <peeroke@gmail.com >
Co-authored-by: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com >
Co-authored-by: Carina Wollendorfer <30310907+CarinaWolli@users.noreply.github.com >
Co-authored-by: CarinaWolli <wollencarina@gmail.com >
Co-authored-by: Keith Williams <keithwillcode@gmail.com >
Co-authored-by: GitHub Actions <github-actions@github.com >
Co-authored-by: Kartik Saini <41051387+kart1ka@users.noreply.github.com >
Co-authored-by: Calcom Bot <109866826+calcom-bot@users.noreply.github.com >
Co-authored-by: Replexica <support@replexica.com >
2025-01-16 22:07:30 -05:00
Alex van Andel
b7f7c33afc
feature: Allow non-calcom domains to run team slug pages ( #18711 )
2025-01-16 09:44:14 -03:00
Benny Joo
ce87de4fc7
fix: Revert - chore: app router - all sub-pages in /apps #16976 ( #18702 )
...
* revert
* add incomplete-booking
2025-01-15 21:12:18 -03:00
Eunjae LeeandPeer Richelsen
Somay Chauhan
Syed Ali Shahbaz
Joe Au-Yeung
Carina WollendorferandCarinaWolli
Benny Joo
sean-brydonandUdit Takkar
Omar López
Muhammad Aiman Sulaimanandkutsaniuk
Cao Hoang
