diff --git a/new-lamassu-admin/src/components/SearchFilter.js b/new-lamassu-admin/src/components/SearchFilter.js
new file mode 100644
index 00000000..dacbfd16
--- /dev/null
+++ b/new-lamassu-admin/src/components/SearchFilter.js
@@ -0,0 +1,41 @@
+import { makeStyles } from '@material-ui/core'
+import React from 'react'
+
+import Chip from 'src/components/Chip'
+import { P } from 'src/components/typography'
+import { ReactComponent as CloseIcon } from 'src/styling/icons/action/close/zodiac.svg'
+
+import { chipStyles, styles } from './SearchFilter.styles'
+
+const useChipStyles = makeStyles(chipStyles)
+const useStyles = makeStyles(styles)
+
+const SearchFilter = ({ filters, onFilterDelete, setFilters }) => {
+ const chipClasses = useChipStyles()
+ const classes = useStyles()
+
+ return (
+ <>
+
{'Filters:'}
+
+ {filters.map((f, idx) => (
+ onFilterDelete(f)}
+ deleteIcon={}
+ />
+ ))}
+ setFilters([])}
+ deleteIcon={}
+ />
+
+ >
+ )
+}
+
+export default SearchFilter
diff --git a/new-lamassu-admin/src/components/SearchFilter.styles.js b/new-lamassu-admin/src/components/SearchFilter.styles.js
new file mode 100644
index 00000000..ff316135
--- /dev/null
+++ b/new-lamassu-admin/src/components/SearchFilter.styles.js
@@ -0,0 +1,45 @@
+import {
+ primaryColor,
+ zircon,
+ smallestFontSize,
+ inputFontFamily,
+ inputFontWeight,
+ spacer
+} from 'src/styling/variables'
+
+const chipStyles = {
+ root: {
+ borderRadius: spacer / 2,
+ marginTop: spacer / 2,
+ marginRight: spacer / 4,
+ marginBottom: spacer / 2,
+ marginLeft: spacer / 4,
+ height: spacer * 3,
+ backgroundColor: zircon,
+ '&:hover, &:focus, &:active': {
+ backgroundColor: zircon
+ }
+ },
+ label: {
+ fontSize: smallestFontSize,
+ fontWeight: inputFontWeight,
+ fontFamily: inputFontFamily,
+ paddingRight: spacer / 2,
+ paddingLeft: spacer / 2,
+ color: primaryColor
+ }
+}
+
+const styles = {
+ button: {
+ width: 8,
+ height: 8,
+ marginLeft: 8
+ },
+ text: {
+ marginTop: 0,
+ marginBottom: 0
+ }
+}
+
+export { chipStyles, styles }
diff --git a/new-lamassu-admin/src/pages/Customers/Customers.js b/new-lamassu-admin/src/pages/Customers/Customers.js
index a6c8a17f..f263de86 100644
--- a/new-lamassu-admin/src/pages/Customers/Customers.js
+++ b/new-lamassu-admin/src/pages/Customers/Customers.js
@@ -5,20 +5,15 @@ import * as R from 'ramda'
import React, { useState } from 'react'
import { useHistory } from 'react-router-dom'
-import Chip from 'src/components/Chip'
import SearchBox from 'src/components/SearchBox'
+import SearchFilter from 'src/components/SearchFilter'
import TitleSection from 'src/components/layout/TitleSection'
-import { P } from 'src/components/typography'
import baseStyles from 'src/pages/Logs.styles'
-import { ReactComponent as CloseIcon } from 'src/styling/icons/action/close/zodiac.svg'
import { ReactComponent as TxInIcon } from 'src/styling/icons/direction/cash-in.svg'
import { ReactComponent as TxOutIcon } from 'src/styling/icons/direction/cash-out.svg'
import { fromNamespace, namespaces } from 'src/utils/config'
-import { chipStyles } from '../Transactions/Transactions.styles'
-
import CustomersList from './CustomersList'
-import styles from './CustomersList.styles'
const GET_CUSTOMER_FILTERS = gql`
query filters {
@@ -54,13 +49,9 @@ const GET_CUSTOMERS = gql`
}
`
-const useStyles = makeStyles(styles)
-const useChipStyles = makeStyles(chipStyles)
const useBaseStyles = makeStyles(baseStyles)
const Customers = () => {
- const classes = useStyles()
- const chipClasses = useChipStyles()
const baseStyles = useBaseStyles()
const history = useHistory()
@@ -107,13 +98,6 @@ const Customers = () => {
id: filtersObject.id
})
- console.log({
- phone: filtersObject.phone,
- name: filtersObject.name,
- address: filtersObject.address,
- id: filtersObject.id
- })
-
refetch && refetch()
}
@@ -146,26 +130,11 @@ const Customers = () => {
]}
/>
{filters.length > 0 && (
- <>
- {'Filters:'}
-
- {filters.map((f, idx) => (
- onFilterDelete(f)}
- deleteIcon={}
- />
- ))}
- setFilters([])}
- deleteIcon={}
- />
-
- >
+
)}
{
const classes = useStyles()
const history = useHistory()
- const chipClasses = useChipStyles()
const [filters, setFilters] = useState([])
const { data: filtersResponse, loading: loadingFilters } = useQuery(
@@ -300,26 +296,11 @@ const Transactions = () => {
{filters.length > 0 && (
- <>
- {'Filters:'}
-
- {filters.map((f, idx) => (
- onFilterDelete(f)}
- deleteIcon={}
- />
- ))}
- setFilters([])}
- deleteIcon={}
- />
-
- >
+
)}