From 926b7e6933c60fc94e853fc0571f94490416266b Mon Sep 17 00:00:00 2001 From: Rafael Taranto Date: Tue, 29 Apr 2025 12:58:08 +0100 Subject: [PATCH] partial: commissions css migration --- .../src/pages/Commissions/Commissions.jsx | 15 ++------- .../components/CommissionsList.jsx | 31 +++---------------- 2 files changed, 6 insertions(+), 40 deletions(-) diff --git a/new-lamassu-admin/src/pages/Commissions/Commissions.jsx b/new-lamassu-admin/src/pages/Commissions/Commissions.jsx index 36b2388b..bfe4a9d2 100644 --- a/new-lamassu-admin/src/pages/Commissions/Commissions.jsx +++ b/new-lamassu-admin/src/pages/Commissions/Commissions.jsx @@ -1,5 +1,4 @@ -import { useQuery, useMutation, gql } from "@apollo/client"; -import { makeStyles } from '@mui/styles' +import { useQuery, useMutation, gql } from '@apollo/client' import * as R from 'ramda' import React, { useState } from 'react' import { HelpTooltip } from 'src/components/Tooltip' @@ -16,14 +15,6 @@ import { P } from '../../components/typography' import CommissionsDetails from './components/CommissionsDetails' import CommissionsList from './components/CommissionsList' -const styles = { - listViewButton: { - marginLeft: 4 - } -} - -const useStyles = makeStyles(styles) - const GET_DATA = gql` query getData { config @@ -49,7 +40,6 @@ const removeCoinFromOverride = crypto => override => }) const Commissions = ({ name: SCREEN_KEY }) => { - const classes = useStyles() const [showMachines, setShowMachines] = useState(false) const [error, setError] = useState(null) const { data, loading } = useQuery(GET_DATA) @@ -120,7 +110,7 @@ const Commissions = ({ name: SCREEN_KEY }) => { toggle: setShowMachines } ]} - iconClassName={classes.listViewButton} + iconClassName="ml-1" appendix={

@@ -150,7 +140,6 @@ const Commissions = ({ name: SCREEN_KEY }) => { error={error} save={save} saveOverrides={saveOverrides} - classes={classes} /> )} {showMachines && !loading && ( diff --git a/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.jsx b/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.jsx index 0889e6dd..927660c8 100644 --- a/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.jsx +++ b/new-lamassu-admin/src/pages/Commissions/components/CommissionsList.jsx @@ -1,4 +1,3 @@ -import { makeStyles } from '@mui/styles' import * as R from 'ramda' import React, { memo, useState } from 'react' import { @@ -11,24 +10,6 @@ import { import { Table as EditableTable } from 'src/components/editableTable' 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 = { code: 'SHOW_ALL', display: 'Show all' @@ -61,8 +42,6 @@ const ORDER_OPTIONS = [ } ] -const useStyles = makeStyles(styles) - const getElement = (code, display) => ({ code: code, display: display || code @@ -92,8 +71,6 @@ const filterCommissions = (coinFilter, machineFilter) => const CommissionsList = memo( ({ config, localeConfig, currency, data, error, saveOverrides }) => { - const classes = useStyles() - const [machineFilter, setMachineFilter] = useState(SHOW_ALL) const [coinFilter, setCoinFilter] = useState(SHOW_ALL) const [orderProp, setOrderProp] = useState(ORDER_OPTIONS[0]) @@ -137,9 +114,9 @@ const CommissionsList = memo( return (

-
+
-
+