From 4062c669376c367860a9bfd243647b0cf88b8aad Mon Sep 17 00:00:00 2001
From: Yash Sancheti <32770175+Onyx2406@users.noreply.github.com>
Date: Sun, 10 Sep 2023 17:17:40 +0530
Subject: [PATCH 1/4] Add boolean shouldShowFundMapping

Updated organization.component.html
---
 .../organization/organization.component.html  | 22 +++++++++----------
 .../organization/organization.component.ts    |  1 +
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/app/organization/organization.component.html b/src/app/organization/organization.component.html
index 8af65dcbfd..e77cb591fc 100644
--- a/src/app/organization/organization.component.html
+++ b/src/app/organization/organization.component.html
@@ -49,7 +49,7 @@ <h4 matLine>Standing Instructions History</h4>
             </mat-list-item>
           </div>
 
-          <div #fundmapping>
+          <div #fundmapping *ngIf="!shouldShowFundMapping">
             <mat-list-item [routerLink]="['fund-mapping']" *mifosxHasPermission="'READ_OFFICE'">
               <mat-icon matListIcon>
                 <fa-icon icon="money-bill-alt" size="sm"></fa-icon>
@@ -100,6 +100,16 @@ <h4 matLine>Password Preferences</h4>
               <p matLine>Define standards for enforcing the usage of stronger passwords</p>
             </mat-list-item>
           </div>
+
+          <div #bulkimports>
+            <mat-list-item [routerLink]="['bulk-import']" *mifosxHasPermission="'VIEW_BULKIMPORT'">
+              <mat-icon matListIcon>
+                <fa-icon icon="upload" size="sm"></fa-icon>
+              </mat-icon>
+              <h4 matLine>Bulk Import</h4>
+              <p matLine>Bulk data import using excel spreadsheet templates for clients, offices, etc.</p>
+            </mat-list-item>
+          </div>
         </mat-nav-list>
 
       </div>
@@ -187,16 +197,6 @@ <h4 matLine>AdHocQuery</h4>
               <p matLine>Define AdHocQuery for Organization</p>
             </mat-list-item>
           </div>
-
-          <div #bulkimports>
-            <mat-list-item [routerLink]="['bulk-import']" *mifosxHasPermission="'VIEW_BULKIMPORT'">
-              <mat-icon matListIcon>
-                <fa-icon icon="upload" size="sm"></fa-icon>
-              </mat-icon>
-              <h4 matLine>Bulk Import</h4>
-              <p matLine>Bulk data import using excel spreadsheet templates for clients, offices, etc.</p>
-            </mat-list-item>
-          </div>
         </mat-nav-list>
 
       </div>
diff --git a/src/app/organization/organization.component.ts b/src/app/organization/organization.component.ts
index 7d630d6a7f..2ec0623b47 100644
--- a/src/app/organization/organization.component.ts
+++ b/src/app/organization/organization.component.ts
@@ -16,6 +16,7 @@ import { ConfigurationWizardService } from '../configuration-wizard/configuratio
 })
 export class OrganizationComponent implements OnInit, AfterViewInit {
 
+  shouldShowFundMapping: boolean = true;
   /* Reference of manage offices */
   @ViewChild('office') office: ElementRef<any>;
   /* Template for popover on manage offices */

From 8b47f4f3df05f1551563d629f70171ff55c9c6d7 Mon Sep 17 00:00:00 2001
From: Onyx2406 <63511758+onyx243@users.noreply.github.com>
Date: Thu, 21 Sep 2023 14:34:14 +0530
Subject: [PATCH 2/4] Fixed condition issue

---
 angular.json                                     | 3 +++
 src/app/organization/organization.component.html | 2 +-
 src/app/organization/organization.component.ts   | 2 +-
 src/environments/.env.ts                         | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/angular.json b/angular.json
index 24d74ff123..b385c4f138 100644
--- a/angular.json
+++ b/angular.json
@@ -229,5 +229,8 @@
         }
       }
     }
+  },
+  "cli": {
+    "analytics": "56a913e4-c03f-46e2-b1f4-5ffb4a9d3ab0"
   }
 }
diff --git a/src/app/organization/organization.component.html b/src/app/organization/organization.component.html
index e77cb591fc..1299e8960e 100644
--- a/src/app/organization/organization.component.html
+++ b/src/app/organization/organization.component.html
@@ -49,7 +49,7 @@ <h4 matLine>Standing Instructions History</h4>
             </mat-list-item>
           </div>
 
-          <div #fundmapping *ngIf="!shouldShowFundMapping">
+          <div #fundmapping *ngIf="shouldShowFundMapping">
             <mat-list-item [routerLink]="['fund-mapping']" *mifosxHasPermission="'READ_OFFICE'">
               <mat-icon matListIcon>
                 <fa-icon icon="money-bill-alt" size="sm"></fa-icon>
diff --git a/src/app/organization/organization.component.ts b/src/app/organization/organization.component.ts
index 2ec0623b47..a7a796d502 100644
--- a/src/app/organization/organization.component.ts
+++ b/src/app/organization/organization.component.ts
@@ -16,7 +16,7 @@ import { ConfigurationWizardService } from '../configuration-wizard/configuratio
 })
 export class OrganizationComponent implements OnInit, AfterViewInit {
 
-  shouldShowFundMapping: boolean = true;
+  shouldShowFundMapping: boolean = false;
   /* Reference of manage offices */
   @ViewChild('office') office: ElementRef<any>;
   /* Template for popover on manage offices */
diff --git a/src/environments/.env.ts b/src/environments/.env.ts
index 77f36ea34d..9272c0248c 100644
--- a/src/environments/.env.ts
+++ b/src/environments/.env.ts
@@ -2,8 +2,8 @@
 /* tslint:disable */
 export default {
   'mifos_x': {
-    'version': '0.0.0',
-    'hash': '9b40d307'
+    'version': '230920',
+    'hash': '4062c669'
   },
   'allow_switching_backend_instance': true
 };

From c8a37ec2feffe23d33578f06872a0d5403e7faa8 Mon Sep 17 00:00:00 2001
From: Yash Sancheti <32770175+Onyx2406@users.noreply.github.com>
Date: Thu, 21 Sep 2023 14:51:21 +0530
Subject: [PATCH 3/4] Updated angular.json to remove analytics link

---
 angular.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/angular.json b/angular.json
index b385c4f138..24d74ff123 100644
--- a/angular.json
+++ b/angular.json
@@ -229,8 +229,5 @@
         }
       }
     }
-  },
-  "cli": {
-    "analytics": "56a913e4-c03f-46e2-b1f4-5ffb4a9d3ab0"
   }
 }

From 9030546d2e52d7254e18e22eecceb596e8983bd9 Mon Sep 17 00:00:00 2001
From: Yash Sancheti <32770175+Onyx2406@users.noreply.github.com>
Date: Thu, 21 Sep 2023 14:52:10 +0530
Subject: [PATCH 4/4] Update .env.ts to change version and hash value

---
 src/environments/.env.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/environments/.env.ts b/src/environments/.env.ts
index 9272c0248c..77f36ea34d 100644
--- a/src/environments/.env.ts
+++ b/src/environments/.env.ts
@@ -2,8 +2,8 @@
 /* tslint:disable */
 export default {
   'mifos_x': {
-    'version': '230920',
-    'hash': '4062c669'
+    'version': '0.0.0',
+    'hash': '9b40d307'
   },
   'allow_switching_backend_instance': true
 };