lamassu/lamassu-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: remove rebase leftovers

Browse source
This commit is contained in:
José Oliveira 2021-11-16 11:44:26 +00:00
parent 7eb10f1515
commit 80d6052788
2 changed files with 0 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

24
new-lamassu-admin/src/pages/Customers/CustomerProfile.js
View file

@ -262,30 +262,6 @@ const CustomerProfile = memo(() => {
</div>
)}
</div>
<div className={classes.rightSidePanel}>
{isOverview && (
<div>
<Box
className={classes.customerDetails}
display="flex"
justifyContent="space-between">
<CustomerDetails
customer={customerData}
locale={locale}
setShowCompliance={() => setShowCompliance(!showCompliance)}
/>
</Box>
<div>
<TransactionsList
customer={customerData}
data={sortedTransactions}
locale={locale}
loading={loading}
/>
</div>
</div>
)}
</div>
<div className={classes.rightSidePanel}>
{isOverview && (
<div>

5
new-lamassu-admin/src/pages/Customers/components/EditableCard.js
View file

@ -123,12 +123,7 @@ const EditableCard = ({
[classes.label1Rejected]: state === OVERRIDE_REJECTED,
[classes.label1Accepted]: state === OVERRIDE_AUTHORIZED
}
<<<<<<< HEAD
=======
const isNotAuthorized =
state === OVERRIDE_REJECTED || state === OVERRIDE_PENDING
>>>>>>> feat: add dynamic position to editable cards, reject/authorize buttons
const authorized =
state === OVERRIDE_PENDING
? { label: 'Pending', type: 'neutral' }