Merge pull request #83 from Goldenrash-lab/feature/balance

fix balance
Goldenrash-lab · Jan 13, 2024 · 0672c71 · 0672c71
2 parents de0a988 + f5bb373
commit 0672c71
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/components/Currency/Currency.jsx b/src/components/Currency/Currency.jsx
@@ -30,7 +30,6 @@ const Currency = () => {
   const [currency, setCurrency] = useState([]);
   const dispatch = useDispatch();
   const selectedCurrency = useSelector(currencySelector);
-  console.log('here', selectedCurrency, currency);
   // const isLoading = useSelector(isLoadingSelector);
   const token = useSelector(state => state.auth.token);
 

diff --git a/src/components/TransactionsList/TransactionsItem/TransactionsItem.jsx b/src/components/TransactionsList/TransactionsItem/TransactionsItem.jsx
@@ -30,6 +30,14 @@ const TransactionsItem = ({ transaction }) => {
 
   const transType = transaction.type === 'EXPENSE' ? '-' : '+';
 
+  function correctBalance(amount) {
+    if (amount < 0) {
+      return Math.abs(amount);
+    } else {
+      return (amount = -amount);
+    }
+  }
+
   return (
     <StyledTransaction $normalFont={true}>
       <StyledTh $width={true}>{formattedDateStr}</StyledTh>
@@ -65,7 +73,7 @@ const TransactionsItem = ({ transaction }) => {
             dispatch(deleteTransactionThunk(transaction.id))
               .unwrap()
               .then(() => {
-                dispatch(changeBalance(transaction.amount));
+                dispatch(changeBalance(correctBalance(transaction.amount)));
                 dispatch(deleteTransaction(transaction.id));
                 toast.success('Transaction is deleted!');
               })