Skip to content

Commit 8ca9db5

Browse files
authored
Merge branch 'main' into kw/fix/SDK-198
2 parents eedf43e + 2cd6075 commit 8ca9db5

File tree

8 files changed

+176
-121
lines changed

8 files changed

+176
-121
lines changed

package-lock.json

Lines changed: 161 additions & 110 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
"sass-embedded": "^1.96.0",
101101
"ts-morph": "^27.0.2",
102102
"tsx": "^4.21.0",
103-
"typescript-eslint": "^8.49.0",
103+
"typescript-eslint": "^8.50.0",
104104
"vite": "^6.4.1",
105105
"vite-plugin-checker": "^0.12.0",
106106
"vite-plugin-circular-dependency": "^0.5.0",
@@ -117,15 +117,15 @@
117117
"typescript": "^5.8.3"
118118
},
119119
"dependencies": {
120-
"@gusto/embedded-api": "^0.11.3",
120+
"@gusto/embedded-api": "^0.11.4",
121121
"@hookform/error-message": "^2.0.1",
122122
"@hookform/resolvers": "^5.2.2",
123123
"@internationalized/date": "^3.10.0",
124124
"@internationalized/number": "^3.6.5",
125125
"classnames": "^2.5.1",
126126
"deepmerge": "^4.3.1",
127127
"dompurify": "^3.3.1",
128-
"i18next": "^25.7.2",
128+
"i18next": "^25.7.3",
129129
"react-aria": "^3.44.0",
130130
"react-aria-components": "1.13.0",
131131
"react-error-boundary": "^6.0.0",

src/components/Common/PaginationControl/PaginationControlTypes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ export type PaginationControlProps = {
88
handleItemsPerPageChange: (n: PaginationItemsPerPage) => void
99
currentPage: number
1010
totalPages: number
11-
itemsPerPage: PaginationItemsPerPage
11+
itemsPerPage?: PaginationItemsPerPage
1212
isFetching?: boolean
1313
}

src/components/Common/ReorderableList/ReorderableItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { useComponentContext } from '@/contexts/ComponentAdapter/useComponentCon
1313
interface ReorderableItemProps {
1414
item: ReorderableListItem
1515
index: number
16-
moveItem: (fromIndex: number, toIndex: number, source?: 'keyboard' | 'dragdrop') => void
16+
moveItem: (fromIndex: number, toIndex: number, source: 'keyboard' | 'dragdrop') => void
1717
itemCount: number
1818
itemIndex: number
1919
listId: string

src/components/Common/ReorderableList/ReorderableList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export function ReorderableList({
150150
}, [])
151151

152152
const moveItem = useCallback(
153-
(fromPosition: number, toPosition: number, source: 'keyboard' | 'dragdrop' = 'dragdrop') => {
153+
(fromPosition: number, toPosition: number, source: 'keyboard' | 'dragdrop') => {
154154
if (
155155
disabled ||
156156
fromPosition === toPosition ||

src/components/Employee/PaymentMethod/Split.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ function PercentageField({
210210
split: Split
211211
control: Control<CombinedSchemaInputs>
212212
onChange: (value: number) => void
213-
currency: string
213+
currency?: string
214214
}) {
215215
const { t } = useTranslation('Employee.PaymentMethod')
216216
return (

src/components/Payroll/PayrollFlow/payrollStateMachine.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ export const payrollFlowBreadcrumbsNodes: BreadcrumbNodes = {
7070
endDate: ctx.payPeriod?.endDate ?? '',
7171
}),
7272
component: PayrollConfigurationContextual,
73+
alerts: undefined,
7374
})) as (context: unknown) => unknown,
7475
},
7576
},

src/contexts/LocaleProvider/useLocale.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { createContext, useContext } from 'react'
22

33
export interface LocaleProps {
4-
locale: string
5-
currency: string
4+
locale?: string
5+
currency?: string
66
}
77

88
export const LocaleContext = createContext<LocaleProps | null>(null)
@@ -12,14 +12,17 @@ export const useLocale = () => {
1212
if (!values) {
1313
throw new Error('useLocal used outside provider')
1414
}
15-
return values
15+
return {
16+
locale: values.locale ?? 'en-US',
17+
currency: values.currency ?? 'USD',
18+
}
1619
}
1720
export const useLocaleDateFormatter = () => {
1821
const values = useContext(LocaleContext)
1922
if (!values) {
2023
throw new Error('useLocaleDateFormatter used outside provider')
2124
}
22-
return new Intl.DateTimeFormat(values.locale, {
25+
return new Intl.DateTimeFormat(values.locale ?? 'en-US', {
2326
year: 'numeric',
2427
month: 'long',
2528
day: '2-digit',

0 commit comments

Comments
 (0)