diff --git a/packages/webapp/src/components/Aside/Aside.module.scss b/packages/webapp/src/components/Aside/Aside.module.scss index 4fd2a37a1..742d0c4c5 100644 --- a/packages/webapp/src/components/Aside/Aside.module.scss +++ b/packages/webapp/src/components/Aside/Aside.module.scss @@ -20,4 +20,5 @@ display: flex; flex-direction: column; flex: 1 1 auto; + background-color: #fff; } \ No newline at end of file diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsDataTable.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsDataTable.tsx index 2b7c9e79a..9d50816ec 100644 --- a/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsDataTable.tsx +++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsDataTable.tsx @@ -106,6 +106,10 @@ const DashboardConstrantTable = styled(DataTable)` .thead { .th { background: #fff; + letter-spacing: 1px; + text-transform: uppercase; + font-weight: 500; + font-size: 13px; } } diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsUncategorizedTable.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsUncategorizedTable.tsx index a8abfa503..ba6df4656 100644 --- a/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsUncategorizedTable.tsx +++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/AccountTransactionsUncategorizedTable.tsx @@ -120,6 +120,10 @@ const DashboardConstrantTable = styled(DataTable)` .thead { .th { background: #fff; + text-transform: uppercase; + letter-spacing: 1px; + font-size: 13px;i + font-weight: 500; } } diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/RecognizedTransactions/_utils.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/RecognizedTransactions/_utils.tsx index 9cf05787f..d734d1163 100644 --- a/packages/webapp/src/containers/CashFlow/AccountTransactions/RecognizedTransactions/_utils.tsx +++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/RecognizedTransactions/_utils.tsx @@ -55,14 +55,17 @@ export function useUncategorizedTransactionsColumns() { Header: 'Date', accessor: 'formatted_date', width: 110, + textOverview: true, }, { Header: 'Description', accessor: descriptionAccessor, + textOverview: true, }, { Header: 'Payee', accessor: 'payee', + textOverview: true, }, { Header: 'Recognize', @@ -72,6 +75,7 @@ export function useUncategorizedTransactionsColumns() { { Header: 'Rule', accessor: 'bank_rule_name', + textOverview: true, }, { Header: 'Deposit', diff --git a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionContent.tsx b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionContent.tsx index f6767ac07..a07004d2b 100644 --- a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionContent.tsx +++ b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionContent.tsx @@ -1,11 +1,10 @@ // @ts-nocheck import styled from 'styled-components'; -import { DrawerBody } from '@/components'; import { CategorizeTransactionBoot } from './CategorizeTransactionBoot'; import { CategorizeTransactionForm } from './CategorizeTransactionForm'; import { useCategorizeTransactionTabsBoot } from '@/containers/CashFlow/CategorizeTransactionAside/CategorizeTransactionTabsBoot'; -export function CategorizeTransactionContent({}) { +export function CategorizeTransactionContent() { const { uncategorizedTransactionId } = useCategorizeTransactionTabsBoot(); return ( @@ -19,7 +18,8 @@ export function CategorizeTransactionContent({}) { ); } -const CategorizeTransactionDrawerBody = styled(DrawerBody)` - padding: 20px; - background-color: #fff; +const CategorizeTransactionDrawerBody = styled.div` + display: flex; + flex-direction: column; + flex: 1 1 auto; `; diff --git a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionForm.tsx b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionForm.tsx index ea8dd7f24..9f328bd7d 100644 --- a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionForm.tsx +++ b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionForm.tsx @@ -63,18 +63,16 @@ function CategorizeTransactionFormRoot({ }; return ( - - -
- - - -
-
+ + + + + + ); } @@ -82,7 +80,11 @@ export const CategorizeTransactionForm = compose(withBankingActions)( CategorizeTransactionFormRoot, ); -const DivRoot = styled.div` +const FormRoot = styled(Form)` + display: flex; + flex-direction: column; + flex: 1 1 auto; + .bp4-form-group .bp4-form-content { flex: 1 0; } diff --git a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionFormContent.tsx b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionFormContent.tsx index b6259c663..af3b10400 100644 --- a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionFormContent.tsx +++ b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionFormContent.tsx @@ -2,7 +2,7 @@ import React from 'react'; import styled from 'styled-components'; import { FormGroup } from '@blueprintjs/core'; -import { FFormGroup, FSelect, } from '@/components'; +import { Box, FFormGroup, FSelect } from '@/components'; import { getAddMoneyInOptions, getAddMoneyOutOptions } from '@/constants'; import { useFormikContext } from 'formik'; import { useCategorizeTransactionTabsBoot } from '@/containers/CashFlow/CategorizeTransactionAside/CategorizeTransactionTabsBoot'; @@ -25,7 +25,7 @@ export function CategorizeTransactionFormContent() { : MoneyOutOptions; return ( - <> + {uncategorizedTransaction.formatted_amount} @@ -42,7 +42,7 @@ export function CategorizeTransactionFormContent() { - + ); } diff --git a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionFormFooter.tsx b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionFormFooter.tsx index 142c9f901..780731692 100644 --- a/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionFormFooter.tsx +++ b/packages/webapp/src/containers/CashFlow/CategorizeTransaction/drawers/CategorizeTransactionDrawer/CategorizeTransactionFormFooter.tsx @@ -1,6 +1,6 @@ // @ts-nocheck import * as R from 'ramda'; -import { Button, Classes, Intent } from '@blueprintjs/core'; +import { Button, Intent } from '@blueprintjs/core'; import { useFormikContext } from 'formik'; import styled from 'styled-components'; import { Group } from '@/components'; @@ -18,26 +18,24 @@ function CategorizeTransactionFormFooterRoot({ return ( -
- - + + - - -
+ +
); } @@ -47,9 +45,6 @@ export const CategorizeTransactionFormFooter = R.compose(withBankingActions)( ); const Root = styled.div` - // position: absolute; - // bottom: 0; - // left: 0; - // right: 0; - // background: #fff; + border-top: 1px solid #c7d5db; + padding: 14px 20px; `;