diff --git a/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskForm.tsx b/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskForm.tsx
index 831cc4f1f..0093c5b4c 100644
--- a/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskForm.tsx
+++ b/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskForm.tsx
@@ -5,10 +5,10 @@ import { Intent } from '@blueprintjs/core';
import { AppToaster } from '@/components';
import { CreateProjectTaskFormSchema } from './ProjectTaskForm.schema';
import { useProjectTaskFormContext } from './ProjectTaskFormProvider';
-import ProjectTaskFormContent from './ProjectTaskFormContent';
-import withDialogActions from '@/containers/Dialog/withDialogActions';
import { transformToValue } from './utils';
import { compose, transformToForm } from '@/utils';
+import ProjectTaskFormContent from './ProjectTaskFormContent';
+import withDialogActions from '@/containers/Dialog/withDialogActions';
const defaultInitialValues = {
name: '',
diff --git a/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFields.tsx b/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFields.tsx
index 5bbee5ed6..8abc41ef0 100644
--- a/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFields.tsx
+++ b/src/containers/Projects/containers/ProjectTaskFormDialog/ProjectTaskFormFields.tsx
@@ -11,12 +11,17 @@ import {
import { EstimateAmount } from './utils';
import { taskChargeOptions } from '../common/modalChargeOptions';
import { ChangeTypesSelect } from '../../components';
+import withCurrentOrganization from '@/containers/Organization/withCurrentOrganization';
+import { compose } from '@/utils';
/**
* Project task form fields.
* @returns
*/
-function ProjectTaskFormFields() {
+function ProjectTaskFormFields({
+ // #withCurrentOrganization
+ organization: { base_currency },
+}) {
// Formik context.
const { values } = useFormikContext();
@@ -62,9 +67,9 @@ function ProjectTaskFormFields() {
{/*------------ Estimated Amount -----------*/}
-
+
);
}
-export default ProjectTaskFormFields;
+export default compose(withCurrentOrganization())(ProjectTaskFormFields);
diff --git a/src/containers/Projects/containers/ProjectTaskFormDialog/utils.tsx b/src/containers/Projects/containers/ProjectTaskFormDialog/utils.tsx
index 2825c5554..389f05e33 100644
--- a/src/containers/Projects/containers/ProjectTaskFormDialog/utils.tsx
+++ b/src/containers/Projects/containers/ProjectTaskFormDialog/utils.tsx
@@ -2,9 +2,9 @@ import React from 'react';
import _ from 'lodash';
import { useFormikContext } from 'formik';
import styled from 'styled-components';
-import { Choose, FormattedMessage as T } from '@/components';
+import { Choose, Money, FormattedMessage as T } from '@/components';
-export function EstimateAmount() {
+export function EstimateAmount({ baseCurrency }) {
const { values } = useFormikContext();
// Calculate estimate amount.
@@ -16,15 +16,21 @@ export function EstimateAmount() {
- {estimatedAmount}
+
+
+
- {values.rate}
+
+
+
- 0.00
+
+
+