From fb4b21869afe0bb4cc3b9300884f2f53d6d50d62 Mon Sep 17 00:00:00 2001
From: Yury Saukou <yury_saukou@epam.com>
Date: Tue, 14 Nov 2023 12:44:29 +0400
Subject: [PATCH] UIORGS-390 Update label for address category

---
 .../BankingInformationField.js                 |  4 +++-
 .../OrganizationForm/OrganizationForm.js       | 18 +++++++++---------
 translations/ui-organizations/en.json          |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/Organizations/OrganizationForm/OrganizationBankingInfoForm/BankingInformationField/BankingInformationField.js b/src/Organizations/OrganizationForm/OrganizationBankingInfoForm/BankingInformationField/BankingInformationField.js
index d350179f..b3bd781a 100644
--- a/src/Organizations/OrganizationForm/OrganizationBankingInfoForm/BankingInformationField/BankingInformationField.js
+++ b/src/Organizations/OrganizationForm/OrganizationBankingInfoForm/BankingInformationField/BankingInformationField.js
@@ -60,8 +60,10 @@ export const BankingInformationField = ({
         </Col>
         <Col xs={12} md={4}>
           <FieldSelectionFinal
-            label={<FormattedMessage id="ui-organizations.data.bankingInformation.address" />}
+            label={<FormattedMessage id="ui-organizations.data.bankingInformation.addressCategory" />}
             name={`${name}.addressId`}
+            // TODO: replace after BE changes
+            // name={`${name}.categoryId`}
             dataOptions={categoriesOptions}
             validateFields={[]}
           />
diff --git a/src/Organizations/OrganizationForm/OrganizationForm.js b/src/Organizations/OrganizationForm/OrganizationForm.js
index 6db86be3..11826ddb 100644
--- a/src/Organizations/OrganizationForm/OrganizationForm.js
+++ b/src/Organizations/OrganizationForm/OrganizationForm.js
@@ -205,15 +205,6 @@ const OrganizationForm = ({
                           <OrganizationVendorInfoForm />
                         </Accordion>
 
-                        {isBankingInformationEnabled && (
-                          <Accordion
-                            id={ORGANIZATION_SECTIONS.bankingInformationSection}
-                            label={ORGANIZATION_SECTION_LABELS[ORGANIZATION_SECTIONS.bankingInformationSection]}
-                          >
-                            <OrganizationBankingInfoForm />
-                          </Accordion>
-                        )}
-
                         <Accordion
                           id={ORGANIZATION_SECTIONS.vendorTermsSection}
                           label={ORGANIZATION_SECTION_LABELS[ORGANIZATION_SECTIONS.vendorTermsSection]}
@@ -230,6 +221,15 @@ const OrganizationForm = ({
                             accountFormValues={formValues.accounts}
                           />
                         </Accordion>
+
+                        {isBankingInformationEnabled && (
+                          <Accordion
+                            id={ORGANIZATION_SECTIONS.bankingInformationSection}
+                            label={ORGANIZATION_SECTION_LABELS[ORGANIZATION_SECTIONS.bankingInformationSection]}
+                          >
+                            <OrganizationBankingInfoForm />
+                          </Accordion>
+                        )}
                       </>
                     )
                   }
diff --git a/translations/ui-organizations/en.json b/translations/ui-organizations/en.json
index 8c1e9349..66596301 100644
--- a/translations/ui-organizations/en.json
+++ b/translations/ui-organizations/en.json
@@ -13,7 +13,7 @@
   "comingSoon": "Coming in a future release.",
 
   "data.bankingInformation.accountType": "Account type",
-  "data.bankingInformation.address": "Address",
+  "data.bankingInformation.addressCategory": "Address category",
   "data.bankingInformation.bankAccountNumber": "Bank account number",
   "data.bankingInformation.bankName": "Bank name",
   "data.bankingInformation.isPrimary": "Use as primary banking information",