Skip to content

Commit 390d4a8

Browse files
committed
hotfix(condo): HOTFIX added organizationId in useUpdateMeterModal
1 parent 948ce78 commit 390d4a8

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

apps/condo/domains/meter/components/BaseMeterModal/BaseMeterModalForm.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ type BaseMeterModalFormProps = ComponentProps<typeof BaseModalForm> & {
4949
ModalSaveButtonLabelMsg: JSX.Element | string
5050
modalNotification?: JSX.Element | string
5151
disabled?: boolean
52+
organizationId: string
5253
}
5354

5455
// TODO (DOMA-3721) Remove mess and create global component with global styles to common component

apps/condo/domains/meter/hooks/useUpdateMeterModal.tsx

+7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ import { Typography } from 'antd'
33
import dayjs from 'dayjs'
44
import get from 'lodash/get'
55
import pick from 'lodash/pick'
6+
67
import { useIntl } from '@open-condo/next/intl'
8+
import { useOrganization } from '@open-condo/next/organization'
79

810
import { Meter as MeterType } from '@app/condo/schema'
911
import {
@@ -32,6 +34,9 @@ export const useUpdateMeterModal = (refetch) => {
3234
const DeleteMessage = intl.formatMessage({ id: 'pages.condo.meter.DeleteMeterAndReadings' })
3335
const DeletedMessage = intl.formatMessage({ id: 'Deleted' }).toUpperCase()
3436

37+
const { organization } = useOrganization()
38+
const userOrganizationId = get(organization, 'id')
39+
3540
const [selectedMeter, setSelectedMeter] = useState<MeterType>()
3641
const meterNumber = get(selectedMeter, 'number')
3742
const isAutomatic = get(selectedMeter, 'isAutomatic', false)
@@ -96,6 +101,7 @@ export const useUpdateMeterModal = (refetch) => {
96101
? <AutoSourceAlert sourceAppName={masterAppName} />
97102
: null
98103
}
104+
organizationId={userOrganizationId}
99105
/>
100106
)
101107
}, [
@@ -108,6 +114,7 @@ export const useUpdateMeterModal = (refetch) => {
108114
selectedMeter,
109115
isAutomatic,
110116
masterAppName,
117+
userOrganizationId,
111118
])
112119

113120
return useMemo(() => ({ UpdateMeterModal, setSelectedMeter }), [UpdateMeterModal])

0 commit comments

Comments
 (0)