Skip to content

Commit 25d52c1

Browse files
authored
Merge pull request #790 from Ajay-aot/FWF-5239/bundle-ui-issues
FWF-5239[bugfix]bundle-ui-issues-part2
2 parents 2b474d4 + 56da10f commit 25d52c1

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

forms-flow-components/src/components/CustomComponents/FormSubmissionHistoryModal.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,21 @@ interface SubmissionHistory {
1818
id?: string;
1919
}
2020

21-
const HistoryField = ({ fields }: { fields: { id: number; value: string }[] }) => (
21+
const HistoryField = ({ fields, created }: { fields: { id: number; value: string }[]; created?: string }) => (
22+
2223
<>
2324
<p className="heading">
2425
{fields.map(({ id, value }) => (
25-
<>
26+
<React.Fragment key={id}>
2627
{value}
27-
</>
28+
</React.Fragment>
2829
))}
2930
</p>
3031

3132
<div className="details">
3233
<div>
3334
<p>Created On</p>
34-
<p>28-05-2025, 02:44:06 PM</p>
35+
<p className="text-nowrap">{created ? HelperServices.getLocalDateAndTime(created) : "N/A"}</p>
3536
</div>
3637
</div>
3738
</>
@@ -78,8 +79,8 @@ export const FormSubmissionHistoryModal: React.FC<FormSubmissionHistoryModalProp
7879
<HistoryField
7980
fields={[
8081
{ id: 1, value: entry.applicationStatus || "N/A" },
81-
{ id: 2, value: entry.created ? HelperServices.getLocalDateAndTime(entry.created) : "N/A" },
8282
]}
83+
created={entry.created}
8384
/>
8485
</div>
8586
))}

forms-flow-theme/scss/_table.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1041,5 +1041,5 @@ $white-color: var(--ff-white);
10411041
}
10421042
//bundle specific
10431043
.bundle-table-body{
1044-
max-height: 75vh;
1044+
height: 75vh;
10451045
}

forms-flow-theme/scss/historyModal.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ $white-color: var(--ff-white);
8080
@include textBaseHightlight($fontSmallest);
8181

8282
display: flex;
83-
flex-grow: 1;
83+
flex-grow: 0.95;
8484
}
8585

8686
.details {
@@ -128,7 +128,7 @@ $white-color: var(--ff-white);
128128
width: 100%;
129129

130130
& > div {
131-
flex: 1;
131+
flex: 1;
132132
width: unset;
133133
}
134134
}

0 commit comments

Comments
 (0)