Fix issue 2927 (Ivy-Apps#2936)

* Excluded Amount issue in Account Tab Excluded Amount issue in Account tab is fixed * Reorder Button Issue Reorder Button Issue
michalguspiel · Feb 9, 2024 · 701b00e · 701b00e
1 parent 727031e
commit 701b00e
Showing 1 changed file with 10 additions and 11 deletions.
diff --git a/screen/accounts/src/main/java/com/ivy/accounts/AccountsTab.kt b/screen/accounts/src/main/java/com/ivy/accounts/AccountsTab.kt
@@ -106,16 +106,6 @@ private fun BoxWithConstraintsScope.UI(
                             fontWeight = FontWeight.ExtraBold
                         )
                     )
-
-                    Spacer(Modifier.height(16.dp))
-
-                    IncomeExpensesRow(
-                        currency = state.baseCurrency,
-                        incomeLabel = stringResource(id = R.string.total_balance),
-                        income = state.totalBalanceWithoutExcluded.toDoubleOrNull() ?: 0.00,
-                        expensesLabel = stringResource(id = R.string.total_balance_excluded),
-                        expenses = state.totalBalanceWithExcluded.toDoubleOrNull() ?: 0.00
-                    )
                 }
 
                 Spacer(Modifier.weight(1f))
@@ -128,7 +118,16 @@ private fun BoxWithConstraintsScope.UI(
 
                 Spacer(Modifier.width(24.dp))
             }
-
+            Column {
+                Spacer(Modifier.height(16.dp))
+                IncomeExpensesRow(
+                    currency = state.baseCurrency,
+                    incomeLabel = stringResource(id = R.string.total_balance),
+                    income = state.totalBalanceWithoutExcluded.toDoubleOrNull() ?: 0.00,
+                    expensesLabel = stringResource(id = R.string.total_balance_excluded),
+                    expenses = state.totalBalanceWithExcluded.toDoubleOrNull() ?: 0.00
+                )
+            }
             Spacer(Modifier.height(16.dp))
         }
         items(state.accountsData) {