diff --git a/src/components/blocks/APIPagination.js b/src/components/blocks/APIPagination.js index 786e17ca..6ecce771 100644 --- a/src/components/blocks/APIPagination.js +++ b/src/components/blocks/APIPagination.js @@ -62,7 +62,7 @@ export const PagesContainer = styled(ControlsContainer)` color: ${props.theme.colors.default.secondaryDark};`; } else { return `border: 1px solid ${props.theme.colors.default.shade5}; - color: ${props.theme.colors.default.secondary};`; + color: #586065;`; } }}; @@ -72,8 +72,8 @@ export const PagesContainer = styled(ControlsContainer)` return `border: 1px solid ${props.theme.colors.default.secondaryDark}; color: ${props.theme.colors.default.secondaryDark};`; } else { - return `border: 1px solid ${props.theme.colors.default.secondaryDark}; - color: ${props.theme.colors.default.secondaryDark};`; + return `border: 1px solid ${props.theme.colors.default.shade5}; + color: ${props.theme.colors.default.shade5};`; } }}; } @@ -139,7 +139,7 @@ const APIPagination = withTheme(({ showLast = false, actions }) => { !backButtonIsDisabled && changeCurrentPageTo(currentPageNumber - 1) } > - + {displayedPages && displayedPages.map(element => ( @@ -153,14 +153,16 @@ const APIPagination = withTheme(({ showLast = false, actions }) => { {element} ))} - {showLast && currentPageNumber + 3 < numberOfPages && numberOfPages > 5 && ( - <> - - changeCurrentPageTo(numberOfPages)}> - {numberOfPages} - - - )} + {showLast && + currentPageNumber + 3 < numberOfPages && + numberOfPages > 5 && ( + <> + + changeCurrentPageTo(numberOfPages)}> + {numberOfPages} + + + )} { !nextButtonIsDisabled && changeCurrentPageTo(currentPageNumber + 1) } > - + ); diff --git a/src/components/blocks/Pagination.js b/src/components/blocks/Pagination.js index 04f93ac9..92c37095 100644 --- a/src/components/blocks/Pagination.js +++ b/src/components/blocks/Pagination.js @@ -59,7 +59,7 @@ const PagesContainer = styled(ControlsContainer)` color: ${props.theme.colors.default.secondaryDark};`; } else { return `border: 1px solid ${props.theme.colors.default.shade5}; - color: ${props.theme.colors.default.secondary};`; + color: #586065;`; } }}; @@ -69,8 +69,8 @@ const PagesContainer = styled(ControlsContainer)` return `border: 1px solid ${props.theme.colors.default.secondaryDark}; color: ${props.theme.colors.default.secondaryDark};`; } else { - return `border: 1px solid ${props.theme.colors.default.secondaryDark}; - color: ${props.theme.colors.default.secondaryDark};`; + return `border: 1px solid ${props.theme.colors.default.shade5}; + color: ${props.theme.colors.default.shade5};`; } }}; } @@ -112,7 +112,7 @@ const Pagination = withTheme( !backButtonIsDisabled && changeCurrentPageTo(currentPageNumber - 1) } > - + {displayedPages && displayedPages.map(element => ( @@ -130,7 +130,7 @@ const Pagination = withTheme( currentPageNumber + 2 + 1 < numberOfPages && numberOfPages > 5 && ( <> - + changeCurrentPageTo(numberOfPages)} > @@ -145,7 +145,7 @@ const Pagination = withTheme( !nextButtonIsDisabled && changeCurrentPageTo(currentPageNumber + 1) } > - + ); diff --git a/src/components/icons/ArrowDownIcon.js b/src/components/icons/ArrowDownIcon.js index ed46ec92..fad66368 100644 --- a/src/components/icons/ArrowDownIcon.js +++ b/src/components/icons/ArrowDownIcon.js @@ -1,17 +1,18 @@ import React from 'react'; import { withTheme } from 'styled-components'; -const ArrowDownIcon = withTheme(({ width, height }) => { +const ArrowDownIcon = withTheme(({ width, height, color = 'black' }) => { return ( + xmlns="http://www.w3.org/2000/svg" + > ); diff --git a/src/components/icons/ThreeDotsIcon.js b/src/components/icons/ThreeDotsIcon.js index 3fe6e2bc..9d19dbc0 100644 --- a/src/components/icons/ThreeDotsIcon.js +++ b/src/components/icons/ThreeDotsIcon.js @@ -1,17 +1,18 @@ import React from 'react'; import { withTheme } from 'styled-components'; -const ThreeDotsIcon = withTheme(({ width, height }) => { +const ThreeDotsIcon = withTheme(({ width, height, color = 'black' }) => { return ( + xmlns="http://www.w3.org/2000/svg" + > ); diff --git a/src/pages/Audit/index.js b/src/pages/Audit/index.js index 7bfdb644..52b14f46 100644 --- a/src/pages/Audit/index.js +++ b/src/pages/Audit/index.js @@ -197,6 +197,7 @@ const Audit = () => { limit: constants.MAX_AUDIT_TABLE_SIZE, useMockedResponse: false, order: auditSortOrder, + storeFullResponse: true, }), ) }