💥 fix: Fixed conflicts

LerianStudio · Dec 4, 2024 · 3119951 · 3119951
1 parent 5713577
commit 3119951
Show file tree

Hide file tree

Showing 4 changed files with 213 additions and 169 deletions.
diff --git a/locales/extracted/en.json b/locales/extracted/en.json
@@ -157,6 +157,7 @@
   "ledgers.account.sheet.edit.title": "Edit {accountName}",
   "ledgers.account.sheet.tabs.details": "Account Details",
   "ledgers.accounts.createFirst": "Create first account",
+  "ledgers.accounts.showing": "Showing {count} {number, plural, =0 {accounts} one {account} other {accounts}}.",
   "ledgers.accounts.subtitle": "{count} {count, plural, =0 {accounts found} one {account found} other {accounts found}}",
   "ledgers.accounts.title": "Accounts",
   "ledgers.assets.createButton": "Create your first Asset",
@@ -191,6 +192,7 @@
   "ledgers.portfolio.sheet.title": "New Portfolio",
   "ledgers.portfolio.subtitle": "{count} {count, plural, =0 {portfolios found} one {portfolio found} other {portfolios found}}",
   "ledgers.portfolio.title": "Portfolios",
+  "ledgers.portfolios.showing": "Showing {count} {number, plural, =0 {portfolios} one {portifolio} other {portfolios}}.",
   "ledgers.products.emptyResource": "You haven't created any Products yet",
   "ledgers.products.sheet.description": "Fill in the details of the Product you want to create.",
   "ledgers.products.sheet.edit.description": "View and edit product fields.",

diff --git a/locales/extracted/pt.json b/locales/extracted/pt.json
@@ -284,5 +284,7 @@
   "notFound.backToHome": "Voltar para Home",
   "ledgers.assets.showing": "Mostrando {count} {number, plural, =0 {ativos} one {ativo} other {ativos}}.",
   "ledgers.products.showing": "Mostrando {count} {number, plural, =0 {produtos} one {produto} other {produtos}}.",
-  "ledgers.showing": "Mostrando {count} {number, plural, =0 {ledgers} one {ledger} other {ledgers}}."
-}
+  "ledgers.showing": "Mostrando {count} {number, plural, =0 {ledgers} one {ledger} other {ledgers}}.",
+  "ledgers.accounts.showing": "Mostrando {count} {number, plural, =0 {contas} one {conta} other {contas}}.",
+  "ledgers.portfolios.showing": "Mostrando {count} {number, plural, =0 {portfólios} one {portfólio} other {portfólios}}."
+}
diff --git a/src/app/(routes)/ledgers/[id]/accounts/accounts-tab-content.tsx b/src/app/(routes)/ledgers/[id]/accounts/accounts-tab-content.tsx
@@ -224,16 +224,33 @@ export const AccountsTabContent = () => {
         </EntityBox.Actions>
       </EntityBox.Root>
 
-      {accountsList && (
-        <AccountsDataTable
-          accounts={{ items: accountsList }}
-          isLoading={isAccountsLoading}
-          table={table}
-          handleEdit={handleEdit}
-          onDelete={handleDialogOpen}
-          refetch={refetchAccounts}
-        />
-      )}
+      <EntityDataTable.Root>
+        {accountsList && (
+          <AccountsDataTable
+            accounts={{ items: accountsList }}
+            isLoading={isAccountsLoading}
+            table={table}
+            handleEdit={handleEdit}
+            onDelete={handleDialogOpen}
+            refetch={refetchAccounts}
+          />
+        )}
+        <EntityDataTable.Footer>
+          <EntityDataTable.FooterText>
+            {intl.formatMessage(
+              {
+                id: 'ledgers.accounts.showing',
+                defaultMessage:
+                  'Showing {count} {number, plural, =0 {accounts} one {account} other {accounts}}.'
+              },
+              {
+                number: accountsList?.length,
+                count: <span className="font-bold">{accountsList?.length}</span>
+              }
+            )}
+          </EntityDataTable.FooterText>
+        </EntityDataTable.Footer>
+      </EntityDataTable.Root>
     </React.Fragment>
   )
 }