partial: commissions css migration

This commit is contained in:
Rafael Taranto 2025-04-29 12:58:08 +01:00
parent f9103bd1ba
commit 926b7e6933
2 changed files with 6 additions and 40 deletions

View file

@ -1,5 +1,4 @@
import { useQuery, useMutation, gql } from "@apollo/client"; import { useQuery, useMutation, gql } from '@apollo/client'
import { makeStyles } from '@mui/styles'
import * as R from 'ramda' import * as R from 'ramda'
import React, { useState } from 'react' import React, { useState } from 'react'
import { HelpTooltip } from 'src/components/Tooltip' import { HelpTooltip } from 'src/components/Tooltip'
@ -16,14 +15,6 @@ import { P } from '../../components/typography'
import CommissionsDetails from './components/CommissionsDetails' import CommissionsDetails from './components/CommissionsDetails'
import CommissionsList from './components/CommissionsList' import CommissionsList from './components/CommissionsList'
const styles = {
listViewButton: {
marginLeft: 4
}
}
const useStyles = makeStyles(styles)
const GET_DATA = gql` const GET_DATA = gql`
query getData { query getData {
config config
@ -49,7 +40,6 @@ const removeCoinFromOverride = crypto => override =>
}) })
const Commissions = ({ name: SCREEN_KEY }) => { const Commissions = ({ name: SCREEN_KEY }) => {
const classes = useStyles()
const [showMachines, setShowMachines] = useState(false) const [showMachines, setShowMachines] = useState(false)
const [error, setError] = useState(null) const [error, setError] = useState(null)
const { data, loading } = useQuery(GET_DATA) const { data, loading } = useQuery(GET_DATA)
@ -120,7 +110,7 @@ const Commissions = ({ name: SCREEN_KEY }) => {
toggle: setShowMachines toggle: setShowMachines
} }
]} ]}
iconClassName={classes.listViewButton} iconClassName="ml-1"
appendix={ appendix={
<HelpTooltip width={320}> <HelpTooltip width={320}>
<P> <P>
@ -150,7 +140,6 @@ const Commissions = ({ name: SCREEN_KEY }) => {
error={error} error={error}
save={save} save={save}
saveOverrides={saveOverrides} saveOverrides={saveOverrides}
classes={classes}
/> />
)} )}
{showMachines && !loading && ( {showMachines && !loading && (

View file

@ -1,4 +1,3 @@
import { makeStyles } from '@mui/styles'
import * as R from 'ramda' import * as R from 'ramda'
import React, { memo, useState } from 'react' import React, { memo, useState } from 'react'
import { import {
@ -11,24 +10,6 @@ import {
import { Table as EditableTable } from 'src/components/editableTable' import { Table as EditableTable } from 'src/components/editableTable'
import { Select } from 'src/components/inputs' import { Select } from 'src/components/inputs'
const styles = {
headerLine: {
display: 'flex',
justifyContent: '',
marginBottom: 24
},
select: {
marginRight: 24
},
tableWrapper: {
flex: 1,
display: 'block',
overflowY: 'auto',
width: '100%',
maxHeight: '70vh'
}
}
const SHOW_ALL = { const SHOW_ALL = {
code: 'SHOW_ALL', code: 'SHOW_ALL',
display: 'Show all' display: 'Show all'
@ -61,8 +42,6 @@ const ORDER_OPTIONS = [
} }
] ]
const useStyles = makeStyles(styles)
const getElement = (code, display) => ({ const getElement = (code, display) => ({
code: code, code: code,
display: display || code display: display || code
@ -92,8 +71,6 @@ const filterCommissions = (coinFilter, machineFilter) =>
const CommissionsList = memo( const CommissionsList = memo(
({ config, localeConfig, currency, data, error, saveOverrides }) => { ({ config, localeConfig, currency, data, error, saveOverrides }) => {
const classes = useStyles()
const [machineFilter, setMachineFilter] = useState(SHOW_ALL) const [machineFilter, setMachineFilter] = useState(SHOW_ALL)
const [coinFilter, setCoinFilter] = useState(SHOW_ALL) const [coinFilter, setCoinFilter] = useState(SHOW_ALL)
const [orderProp, setOrderProp] = useState(ORDER_OPTIONS[0]) const [orderProp, setOrderProp] = useState(ORDER_OPTIONS[0])
@ -137,9 +114,9 @@ const CommissionsList = memo(
return ( return (
<div> <div>
<div className={classes.headerLine}> <div className="flex mb-6">
<Select <Select
className={classes.select} className="mr-5"
onSelectedItemChange={setMachineFilter} onSelectedItemChange={setMachineFilter}
label="Machines" label="Machines"
default={SHOW_ALL} default={SHOW_ALL}
@ -147,7 +124,7 @@ const CommissionsList = memo(
selectedItem={machineFilter} selectedItem={machineFilter}
/> />
<Select <Select
className={classes.select} className="mr-5"
onSelectedItemChange={setCoinFilter} onSelectedItemChange={setCoinFilter}
label="Cryptocurrency" label="Cryptocurrency"
default={SHOW_ALL} default={SHOW_ALL}
@ -163,7 +140,7 @@ const CommissionsList = memo(
defaultAsFilter defaultAsFilter
/> />
</div> </div>
<div className={classes.tableWrapper}> <div className="flex-1 w-full max-h-[70vh] overflow-y-auto">
<EditableTable <EditableTable
error={error?.message} error={error?.message}
name="comissionsList" name="comissionsList"