Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Commit 57a794c

Browse files
committed
Rearranged payment actions menu items. Resolved some prop-types warnings.
1 parent 2d68c40 commit 57a794c

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

src/components/JobName/index.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const JobName = ({ className, jobId }) => {
2424

2525
JobName.propTypes = {
2626
className: PT.string,
27-
jobId: PT.oneOfType([PT.number, PT.string]).isRequired,
27+
jobId: PT.oneOfType([PT.number, PT.string]),
2828
};
2929

3030
export default memo(JobName);

src/routes/WorkPeriods/components/PaymentActions/index.jsx

+7-7
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ const PaymentActions = ({ className, daysPaid, daysWorked, payment }) => {
2929

3030
const actions = useMemo(
3131
() => [
32+
{
33+
label: "Edit Payment",
34+
action() {
35+
setIsOpenEditModal(true);
36+
},
37+
disabled: paymentStatus === PAYMENT_STATUS.IN_PROGRESS,
38+
},
3239
{
3340
label: "Cancel Payment",
3441
action() {
@@ -38,13 +45,6 @@ const PaymentActions = ({ className, daysPaid, daysWorked, payment }) => {
3845
paymentStatus === PAYMENT_STATUS.CANCELLED ||
3946
paymentStatus === PAYMENT_STATUS.IN_PROGRESS,
4047
},
41-
{
42-
label: "Edit Payment",
43-
action() {
44-
setIsOpenEditModal(true);
45-
},
46-
disabled: paymentStatus === PAYMENT_STATUS.IN_PROGRESS,
47-
},
4848
],
4949
[paymentStatus]
5050
);

src/routes/WorkPeriods/components/PaymentModalUpdateBA/index.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ PaymentModalUpdateBA.propTypes = {
217217
).isRequired,
218218
period: PT.shape({
219219
id: PT.string.isRequired,
220-
jobId: PT.oneOfType([PT.number, PT.string]).isRequired,
220+
jobId: PT.oneOfType([PT.number, PT.string]),
221221
projectId: PT.oneOfType([PT.number, PT.string]).isRequired,
222222
billingAccountId: PT.number,
223223
userHandle: PT.string.isRequired,

0 commit comments

Comments
 (0)