Moar transversal cleaning

alephium · Dec 16, 2024 · 2d29a52 · 2d29a52
1 parent 435a301
commit 2d29a52
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 16 deletions.
diff --git a/apps/desktop-wallet/src/components/AddressRow.tsx b/apps/desktop-wallet/src/components/AddressRow.tsx
@@ -22,7 +22,7 @@ import styled from 'styled-components'
 
 import AddressBadge from '@/components/AddressBadge'
 import AddressColorIndicator from '@/components/AddressColorIndicator'
-import { TableRow } from '@/components/Table'
+import { TableCell, TableRow } from '@/components/Table'
 
 interface AddressRowProps {
   addressHash: AddressHash
@@ -41,25 +41,19 @@ const AddressRow = ({ addressHash, onClick, children, className, subtitle }: Add
     onKeyDown={() => onClick && onClick(addressHash)}
     className={className}
   >
-    <Row>
+    <TableCell>
       <AddressColorIndicatorStyled addressHash={addressHash} />
       <Label>
         <AddressBadge addressHash={addressHash} hideColorIndication truncate appendHash displayHashUnder />
         <AddressSubtitle>{subtitle}</AddressSubtitle>
       </Label>
-      {children}
-    </Row>
+    </TableCell>
+    {children && <TableCell>{children}</TableCell>}
   </TableRow>
 )
 
 export default AddressRow
 
-const Row = styled.div`
-  display: flex;
-  align-items: center;
-  flex-grow: 1;
-`
-
 const AddressColorIndicatorStyled = styled(AddressColorIndicator)`
   margin-right: 15px;
 `

diff --git a/apps/desktop-wallet/src/components/CheckMark.tsx b/apps/desktop-wallet/src/components/CheckMark.tsx
@@ -39,4 +39,5 @@ export default styled(CheckMark)`
   color: var(--color-white);
   border-radius: 40px;
   padding: 3px;
+  margin: 0 var(--spacing-2);
 `
diff --git a/apps/desktop-wallet/src/components/Table.tsx b/apps/desktop-wallet/src/components/Table.tsx
@@ -83,6 +83,8 @@ export interface TableRowProps extends TableColumnsProps {
 }
 
 export const TableRow = styled(TableColumns)<TableRowProps>`
+  min-height: var(--inputHeight);
+
   ${({ onClick }) =>
     onClick &&
     css`

diff --git a/apps/desktop-wallet/src/components/TokenBadge.tsx b/apps/desktop-wallet/src/components/TokenBadge.tsx
@@ -94,6 +94,7 @@ const TokenBadgeText = ({
         isLoading={isLoadingAmount}
         showPlusMinus={displaySign}
         highlight={displaySign}
+        semiBold
       />
     )
 

diff --git a/apps/desktop-wallet/src/components/WorthOverview.tsx b/apps/desktop-wallet/src/components/WorthOverview.tsx
@@ -27,7 +27,7 @@ interface WorthOverviewProps extends AmountLoaderProps {
 }
 
 const WorthOverview = ({ overrideWorth, worth, ...props }: WorthOverviewProps) => (
-  <WorthOverviewStyled value={overrideWorth ?? worth} isFiat loaderHeight={32} tabIndex={0} {...props} />
+  <WorthOverviewStyled value={overrideWorth ?? worth} isFiat loaderHeight={32} tabIndex={0} semiBold {...props} />
 )
 
 export default WorthOverview

diff --git a/apps/desktop-wallet/src/modals/SettingsModal/WalletsSettingsSection.tsx b/apps/desktop-wallet/src/modals/SettingsModal/WalletsSettingsSection.tsx
@@ -54,6 +54,7 @@ const WalletsSettingsSection = () => {
   return (
     <>
       <Section align="flex-start" role="table">
+        <h2>{t('Wallet list')}</h2>
         <BoxContainerStyled role="rowgroup">
           {wallets.map((wallet) => (
             <WalletItem

diff --git a/apps/desktop-wallet/src/pages/UnlockedWallet/AddressesPage/addressListRow/AddressWorth.tsx b/apps/desktop-wallet/src/pages/UnlockedWallet/AddressesPage/addressListRow/AddressWorth.tsx
@@ -28,7 +28,7 @@ interface AddressWorthProps {
 const AddressWorth = ({ addressHash }: AddressWorthProps) => {
   const { data: worth, isLoading } = useFetchAddressWorth(addressHash)
 
-  return <Amount value={worth} isFiat isLoading={isLoading} loaderHeight={18.5} />
+  return <Amount value={worth} isFiat isLoading={isLoading} loaderHeight={18.5} semiBold />
 }
 
 export default AddressWorth
diff --git a/apps/desktop-wallet/src/pages/UnlockedWallet/OverviewPage/AddressesList.tsx b/apps/desktop-wallet/src/pages/UnlockedWallet/OverviewPage/AddressesList.tsx
@@ -30,7 +30,7 @@ import ActionLink from '@/components/ActionLink'
 import AddressRow from '@/components/AddressRow'
 import Amount from '@/components/Amount'
 import FocusableContent from '@/components/FocusableContent'
-import { ExpandableTable, ExpandRow, TableCell, TableHeader } from '@/components/Table'
+import { ExpandableTable, ExpandRow, TableHeader } from '@/components/Table'
 import { openModal } from '@/features/modals/modalActions'
 import { useAppDispatch } from '@/hooks/redux'
 import { useFetchSortedAddressesHashes } from '@/hooks/useAddresses'
@@ -84,9 +84,7 @@ const AddressesRows = ({ className, isExpanded, onExpand, onAddressClick }: Addr
       <motion.div {...fadeIn} className={className}>
         {allAddressHashes.map((addressHash) => (
           <AddressRow addressHash={addressHash} onClick={handleRowClick} key={addressHash}>
-            <TableCell>
-              <AddressWorth addressHash={addressHash} />
-            </TableCell>
+            <AddressWorth addressHash={addressHash} />
           </AddressRow>
         ))}
       </motion.div>