From d2cb95d0ce65b25cd3ec53c911fe24a386989223 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Thu, 28 Nov 2024 14:19:52 +0200
Subject: [PATCH] UI: Fixed mobile center congiguration dialog

---
 .../mobile-app-configuration-dialog.component.ts   | 14 ++++++++++++--
 .../src/assets/locale/locale.constant-en_US.json   |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-app-configuration-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-app-configuration-dialog.component.ts
index f15b48fcce..a4784ebfad 100644
--- a/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-app-configuration-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-app-configuration-dialog.component.ts
@@ -66,11 +66,21 @@ export class MobileAppConfigurationDialogComponent extends DialogComponent<Mobil
       this.configureApi += '\n';
       if (!!this.data.androidApp) {
         this.configureApi += `\nstatic const thingsboardAndroidAppSecret = '${this.data.androidApp.appSecret}';`;
-        this.renameCommands.push(`rename setBundleId --targets android --value "${this.data.androidApp.pkgName}"`);
       }
       if (!!this.data.iosApp) {
         this.configureApi += `\nstatic const thingsboardIOSAppSecret = '${this.data.iosApp.appSecret}';`;
-        this.renameCommands.push(`rename setBundleId --targets ios --value "${this.data.iosApp.pkgName}"`);
+      }
+    }
+    if (this.setApplication) {
+      if (this.data.androidApp?.pkgName === this.data.iosApp?.pkgName) {
+        this.renameCommands.push(`rename setBundleId --targets android, ios --value "${this.data.androidApp.pkgName}"`);
+      } else {
+        if (!!this.data.androidApp) {
+          this.renameCommands.push(`rename setBundleId --targets android --value "${this.data.androidApp.pkgName}"`);
+        }
+        if (!!this.data.iosApp) {
+          this.renameCommands.push(`rename setBundleId --targets ios --value "${this.data.iosApp.pkgName}"`);
+        }
       }
     }
   }
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index dd2bb62ba2..bc6874d5ff 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -3548,7 +3548,7 @@
             "configure-package-title": "Configure application package",
             "configure-package-text": "You can manually change the Application Package or use third party CLI tool.",
             "configure-package-text-install": "To install the Rename CLI Tool, execute the following command:",
-            "configure-package-run-commands": "Run these commands in the root directory of your projectЖ"
+            "configure-package-run-commands": "Run these commands in the root directory of your project:"
         }
     },
     "notification": {