diff --git a/submit-web/src/routes/proponent/_proponentLayout/projects/$projectId/_projectLayout/submission-packages/$submissionPackageId/_submissionLayout/index.tsx b/submit-web/src/routes/proponent/_proponentLayout/projects/$projectId/_projectLayout/submission-packages/$submissionPackageId/_submissionLayout/index.tsx index 50994717..abc08960 100644 --- a/submit-web/src/routes/proponent/_proponentLayout/projects/$projectId/_projectLayout/submission-packages/$submissionPackageId/_submissionLayout/index.tsx +++ b/submit-web/src/routes/proponent/_proponentLayout/projects/$projectId/_projectLayout/submission-packages/$submissionPackageId/_submissionLayout/index.tsx @@ -72,16 +72,15 @@ export default function SubmissionPage() { }); const currentPackageVersion = packageVersions?.find( - (pv) => pv.package_id === submissionPackageId + (pv) => pv.package_id === submissionPackageId, ); - const isLatestApprovedPackageVersion = - currentPackageVersion?.is_latest && - currentPackageVersion?.is_approved; + const hasAnyApprovedPackageVersion = packageVersions?.some( + (pv) => pv.is_approved, + ); - const isNewerThanLastApprovedButNotApproved = - currentPackageVersion?.is_latest && - !currentPackageVersion?.is_approved; + const isLatestApprovedPackageVersion = + currentPackageVersion?.is_latest && currentPackageVersion?.is_approved; const { mutate: updateStateSubmissionPackage, @@ -212,11 +211,9 @@ export default function SubmissionPage() { alignItems: "center", justifyContent: "space-between", - mb: - isLatestApprovedPackageVersion || - isNewerThanLastApprovedButNotApproved - ? 0 - : BCDesignTokens.layoutMarginXlarge, + mb: hasAnyApprovedPackageVersion + ? 0 + : BCDesignTokens.layoutMarginXlarge, }} > @@ -255,7 +252,12 @@ export default function SubmissionPage() { - + - Please Note: This submission is still pending EAO review. - Until finalized, it is not considered enforceable. + Please Note: This submission is not considered enforceable. + Please refer to the Submission Package with this icon + + for the enforceable version.