PenaSide/front-hub
3
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'main'

Browse Source 
fix createdAt in history

See merge request frontend/marketplace!62
This commit is contained in:
Nastya 2023-10-16 11:38:58 +00:00
commit ce7587d0dd
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/History/AccordionWrapper.tsx
View File

@ -15,9 +15,10 @@ interface AccordionWrapperProps {
content: KeyValue[]; content: KeyValue[];
last?: boolean; last?: boolean;
first?: boolean; first?: boolean;
createdAt: string
} }
export default function AccordionWrapper({ content, last, first }: AccordionWrapperProps) { export default function AccordionWrapper({ content, last, first, createdAt }: AccordionWrapperProps) {
const theme = useTheme(); const theme = useTheme();
const upMd = useMediaQuery(theme.breakpoints.up("md")); const upMd = useMediaQuery(theme.breakpoints.up("md"));
const upSm = useMediaQuery(theme.breakpoints.up("sm")); const upSm = useMediaQuery(theme.breakpoints.up("sm"));
@ -25,7 +26,7 @@ export default function AccordionWrapper({ content, last, first }: AccordionWrap
const isMobile = useMediaQuery(theme.breakpoints.down(560)); const isMobile = useMediaQuery(theme.breakpoints.down(560));
const valuesByKey: any = {}; const valuesByKey: any = {};
console.log(content)
content.forEach((item) => { content.forEach((item) => {
valuesByKey[item.Key] = item.Value; valuesByKey[item.Key] = item.Value;
}); });
@ -81,7 +82,7 @@ export default function AccordionWrapper({ content, last, first }: AccordionWrap
whiteSpace: "nowrap", whiteSpace: "nowrap",
}} }}
> >
{extractDateFromString(valuesByKey.createdat)} {extractDateFromString(createdAt)}
</Typography> </Typography>
<Typography <Typography

5
src/pages/History/index.tsx
View File

@ -65,12 +65,13 @@ export default function History() {
) : ( ) : (
<Tabs items={subPages} selectedItem={selectedItem} setSelectedItem={setSelectedItem} /> <Tabs items={subPages} selectedItem={selectedItem} setSelectedItem={setSelectedItem} />
)} )}
{historyData?.records.map(({ rawDetails }, index) => ( {historyData?.records.map(( e, index) => (
<Box key={index} sx={{ mt: index === 0 ? "27px" : "0px" }}> <Box key={index} sx={{ mt: index === 0 ? "27px" : "0px" }}>
<AccordionWrapper <AccordionWrapper
first={index === 0} first={index === 0}
last={index === historyData?.records.length - 1} last={index === historyData?.records.length - 1}
content={rawDetails[0]} content={e.rawDetails[0]}
createdAt={e.createdAt}
/> />
</Box> </Box>
))} ))}