From 81c69c41be3bca35c444f2ec1bbd0fcfc716f439 Mon Sep 17 00:00:00 2001
From: Mantri Ramkishor <mantri.ramkishor@navi.com>
Date: Tue, 4 Feb 2025 19:13:00 +0530
Subject: [PATCH] NTP-34529 | Old Feedback not visible fix (#1082)

---
 .github/workflows/codePush.yml           | 4 ++--
 buildFlavor/field/buildNumber.txt        | 2 +-
 buildFlavor/field/buildVersion.txt       | 2 +-
 package.json                             | 3 ++-
 scripts/codepushBuildScript.sh           | 9 +++++++++
 src/screens/addressGeolocation/index.tsx | 6 +++---
 6 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100755 scripts/codepushBuildScript.sh

diff --git a/.github/workflows/codePush.yml b/.github/workflows/codePush.yml
index c57a6a02..d7d382d9 100644
--- a/.github/workflows/codePush.yml
+++ b/.github/workflows/codePush.yml
@@ -56,10 +56,10 @@ jobs:
         run: appcenter login --token ${{ secrets.APP_CENTER_LOGIN_TOKEN }}
       - name: CodePush QA
         if: ((github.event.inputs.environment == 'QA' || inputs.environment == 'QA'))
-        run: yarn move:qa && appcenter codepush release-react -a nfa-navi.com/nfa-app -d Staging -t "${{github.event.inputs.target_versions}}" --description "${{github.event.inputs.description}}"
+        run: yarn move:qa && yarn prepare-codepush-field-build && appcenter codepush release-react -a nfa-navi.com/nfa-app -d Staging -t "${{github.event.inputs.target_versions}}" --description "${{github.event.inputs.description}}"
       - name: CodePush Prod
         if: ((github.event.inputs.environment == 'Prod' || inputs.environment == 'Prod'))
-        run: yarn move:prod && appcenter codepush release-react -a nfa-navi.com/nfa-app -d Production -t "${{github.event.inputs.target_versions}}" --description "${{github.event.inputs.description}}"
+        run: yarn move:prod && yarn prepare-codepush-field-build && appcenter codepush release-react -a nfa-navi.com/nfa-app -d Production -t "${{github.event.inputs.target_versions}}" --description "${{github.event.inputs.description}}"
 
   generate_source_map:
     needs: generate
diff --git a/buildFlavor/field/buildNumber.txt b/buildFlavor/field/buildNumber.txt
index f937f7e2..df689d84 100644
--- a/buildFlavor/field/buildNumber.txt
+++ b/buildFlavor/field/buildNumber.txt
@@ -1 +1 @@
-233
\ No newline at end of file
+234
\ No newline at end of file
diff --git a/buildFlavor/field/buildVersion.txt b/buildFlavor/field/buildVersion.txt
index 6618ab54..94c60781 100644
--- a/buildFlavor/field/buildVersion.txt
+++ b/buildFlavor/field/buildVersion.txt
@@ -1 +1 @@
-2.17.0
\ No newline at end of file
+2.17.1
\ No newline at end of file
diff --git a/package.json b/package.json
index fa215f1b..408fc20e 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,8 @@
     "copy-tele-assets": "cp buildFlavor/tele/buildNumber.txt ./ && cp buildFlavor/tele/buildVersion.txt ./ ",
     "copy-field-assets": "cp buildFlavor/field/buildNumber.txt ./ && cp buildFlavor/field/buildVersion.txt ./ ",
     "prepare-tele-build": "yarn copy-tele-assets && chmod +x ./scripts/buildScript.sh && ./scripts/buildScript.sh",
-    "prepare-field-build": "yarn copy-field-assets && chmod +x ./scripts/buildScript.sh && ./scripts/buildScript.sh"
+    "prepare-field-build": "yarn copy-field-assets && chmod +x ./scripts/buildScript.sh && ./scripts/buildScript.sh",
+    "prepare-codepush-field-build": "ls && yarn copy-field-assets && chmod +x ./scripts/codepushBuildScript.sh && ./scripts/codepushBuildScript.sh"
   },
   "dependencies": {
     "@bam.tech/react-native-image-resizer": "3.0.5",
diff --git a/scripts/codepushBuildScript.sh b/scripts/codepushBuildScript.sh
new file mode 100755
index 00000000..798df4bb
--- /dev/null
+++ b/scripts/codepushBuildScript.sh
@@ -0,0 +1,9 @@
+ENV_BUILD_NUMBER=`cat ./buildNumber.txt`
+ENV_BUILD_VERSION=`cat ./buildVersion.txt`
+
+# Use double quotes so variables are expanded
+sed -i "s/^\(def VERSION_CODE = \).*/\1${ENV_BUILD_NUMBER}/" android/app/build.gradle
+sed -i "s/^\(def VERSION_NAME = \).*/\1\"${ENV_BUILD_VERSION}\"/" android/app/build.gradle
+
+sed -i 's/"version": "[^"]*"/"version": "'${ENV_BUILD_VERSION}'"/' ./package.json
+sed -i 's/"buildNumber": "[^"]*"/"buildNumber": "'${ENV_BUILD_NUMBER}'"/' ./package.json
diff --git a/src/screens/addressGeolocation/index.tsx b/src/screens/addressGeolocation/index.tsx
index 89900384..ecac34f3 100644
--- a/src/screens/addressGeolocation/index.tsx
+++ b/src/screens/addressGeolocation/index.tsx
@@ -89,14 +89,14 @@ const AddressGeolocation: React.FC<IAddressGeolocation> = ({ route: routeParams
 
   useEffect(() => {
     if (isOnline) {
-      getGroupedAddresses();
+      dispatch(getAddressesAndGeolocations(loanAccountNumber, caseId, caseBusinessVertical, true));
+      dispatch(getUngroupedAddress(loanAccountNumber, caseId, caseBusinessVertical, true));
+      dispatch(getSkipTracingAddress(loanAccountNumber, caseId, caseBusinessVertical, true));
     }
   }, [retryBtnToggle, isOnline]);
 
   useEffect(() => {
     addClickstreamEvent(CLICKSTREAM_EVENT_NAMES.FA_ALL_ADDRESSES_LANDED, commonParams);
-    dispatch(getUngroupedAddress(loanAccountNumber, caseId, caseBusinessVertical, true));
-    dispatch(getSkipTracingAddress(loanAccountNumber, caseId, caseBusinessVertical, true));
   }, []);
 
   useEffect(() => {