🌟 feat(WalletManagment.tsx): add support for displaying gross amount …

…in Wallet Management page 🌟 feat(columns.ts): add support for sorting by gross amount in Wallet Management page
AppQuality · Sep 18, 2023 · b48a74f · b48a74f
1 parent 194813c
commit b48a74f
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 2 deletions.
diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
@@ -67,7 +67,9 @@
   "All your certifications were successfully removed": "All your certifications were successfully removed",
   "All_female": "All",
   "All_male": "All",
-  "Amount": "Amount",
+  "Amount": "Net received",
+  "Amount gross": "Tot. gross",
+  "Amount to get": "Net to be received",
   "Annual witholding < 5000€": "Annual witholding < 5000€",
   "Annual witholding > 5000": "Annual witholding > 5000",
   "Apply now": "Apply now",

diff --git a/src/locales/es/translation.json b/src/locales/es/translation.json
@@ -68,6 +68,8 @@
   "All_female": "Todas",
   "All_male": "Todos",
   "Amount": "Importe",
+  "Amount gross": "",
+  "Amount to get": "",
   "Annual witholding < 5000€": "Deducción anual < 5000€",
   "Annual witholding > 5000": "Deducción anual > 5000",
   "Apply now": "Apúntate ahora",
@@ -701,6 +703,7 @@
     "BUGFORM_UPLOAD_PROGRESS": "{{num}} subido",
     "BUGFORM_UPLOAD_PROGRESS_plural": "{{num}} subidos"
   },
+  "Amount Gross": "",
   "Home": "Página de inicio",
   "Loading": "Cargando",
   "Redirecting to your dashboard...": "Redireccionando a tu dashboard...",

diff --git a/src/locales/it/translation.json b/src/locales/it/translation.json
@@ -68,6 +68,8 @@
   "All_female": "Tutte",
   "All_male": "Tutti",
   "Amount": "Importo",
+  "Amount gross": "",
+  "Amount to get": "",
   "Annual witholding < 5000€": "Trattenuta annua < 5000€",
   "Annual witholding > 5000": "Trattenuta annua > 5000€",
   "Apply now": "Candidati",
@@ -701,6 +703,7 @@
     "BUGFORM_UPLOAD_PROGRESS": "{{num}} caricato",
     "BUGFORM_UPLOAD_PROGRESS_plural": "{{num}} caricati"
   },
+  "Amount Gross": "",
   "Home": "Home",
   "Loading": "Caricamento in corso...",
   "Redirecting to your dashboard...": "Reindirizzamento alla dashboard in corso ...",

diff --git a/src/pages/Wallet/WalletManagment.tsx b/src/pages/Wallet/WalletManagment.tsx
@@ -144,7 +144,18 @@ export const WalletManagment = () => {
                   : "aq-text-primary"
               }
             >
-              <strong>{booty.amount?.toFixed(2)}€</strong>
+              <strong>
+                {t("Amount to get")} {booty.amount?.toFixed(2)}€
+              </strong>
+            </Text>
+            <Text
+              className={
+                !isVerified || booty.amount === 0 || paymentInProcessing
+                  ? "aq-text-disabled-dark"
+                  : "aq-text-primary"
+              }
+            >
+              ({t("Amount gross")} {booty.amount_gross?.toFixed(2)}€)
             </Text>
           </div>
         </div>

diff --git a/src/pages/Wallet/columns.ts b/src/pages/Wallet/columns.ts
@@ -22,6 +22,18 @@ export const walletColumns = (
       role: "overline",
       hideIndex: true,
     },
+    {
+      title: t("Amount gross"),
+      dataIndex: "amount_gross",
+      key: "amount_gross",
+      isSortable: true,
+      onSort: (newOrder) => {
+        setIsLoading(true);
+        dispatch(updateSortingOptions(newOrder, "amount_gross")).then(() =>
+          setIsLoading(false)
+        );
+      },
+    },
     {
       title: t("Amount"),
       dataIndex: "amount",