chore!: scrub .qa suffix in favor of billing api access

Miki-Session · Miki-Session · commit 997847e0ba58 · 2025-11-03T11:13:50.000+11:00
diff --git a/run/constants/index.ts b/run/constants/index.ts
@@ -2,7 +2,7 @@ import { XPath } from '../types/testing';
 
 export const ANDROID_XPATHS: { [key: string]: XPath } = {
   PRIVACY_TOGGLE: `/hierarchy/android.widget.FrameLayout/android.widget.LinearLayout/android.widget.FrameLayout/android.view.ViewGroup/android.widget.FrameLayout[2]/android.widget.FrameLayout/android.widget.LinearLayout/android.widget.FrameLayout/androidx.recyclerview.widget.RecyclerView/android.widget.LinearLayout[5]/android.widget.RelativeLayout/android.widget.TextView[2]`,
-  FIRST_GIF: `(//android.widget.ImageView[@resource-id="network.loki.messenger.qa:id/thumbnail"])[1]`,
+  FIRST_GIF: `(//android.widget.ImageView[@resource-id="network.loki.messenger:id/thumbnail"])[1]`,
   VOICE_TOGGLE: `/hierarchy/android.widget.FrameLayout/android.widget.FrameLayout/android.widget.FrameLayout/android.widget.ScrollView/android.widget.LinearLayout/android.widget.LinearLayout/android.widget.LinearLayout[2]/android.widget.Button[1]`,
   BROWSE_BUTTON: `/hierarchy/android.widget.FrameLayout/android.widget.LinearLayout/android.widget.FrameLayout/android.widget.ScrollView/android.widget.TabHost/android.widget.LinearLayout/android.widget.FrameLayout/androidx.viewpager.widget.ViewPager/android.widget.RelativeLayout/android.widget.GridView/android.widget.LinearLayout/android.widget.LinearLayout[2]`,
   MODAL_DESCRIPTIONS: `/hierarchy/android.widget.FrameLayout/android.widget.LinearLayout/android.widget.FrameLayout/android.widget.FrameLayout/android.widget.FrameLayout/androidx.appcompat.widget.LinearLayoutCompat/android.widget.LinearLayout/android.widget.LinearLayout/android.widget.TextView[2]`,
diff --git a/run/test/specs/app_disguise_set.spec.ts b/run/test/specs/app_disguise_set.spec.ts
@@ -106,7 +106,7 @@ async function appDisguiseSetIconAndroid(platform: SupportedPlatformsType, testI
       await test.step(TestSteps.SETUP.CLOSE_APP, async () => {
         await closeApp(device);
         await runScriptAndLog(
-          `${getAdbFullPath()} -s ${device.udid} uninstall network.loki.messenger.qa`,
+          `${getAdbFullPath()} -s ${device.udid} uninstall network.loki.messenger`,
           true
         );
       });
diff --git a/run/test/specs/community_requests_off.spec.ts b/run/test/specs/community_requests_off.spec.ts
@@ -34,7 +34,7 @@ async function blindedMessageRequests(platform: SupportedPlatformsType, testInfo
   await device1
     .onAndroid()
     .clickOnElementXPath(
-      `//android.view.ViewGroup[@resource-id='network.loki.messenger.qa:id/mainContainer'][.//android.widget.TextView[contains(@text,'${message}')]]//androidx.compose.ui.platform.ComposeView[@resource-id='network.loki.messenger.qa:id/profilePictureView']`
+      `//android.view.ViewGroup[@resource-id='network.loki.messenger:id/mainContainer'][.//android.widget.TextView[contains(@text,'${message}')]]//androidx.compose.ui.platform.ComposeView[@resource-id='network.loki.messenger:id/profilePictureView']`
     );
   await device1
     .onIOS()
diff --git a/run/test/specs/community_requests_on.spec.ts b/run/test/specs/community_requests_on.spec.ts
@@ -55,7 +55,7 @@ async function blindedMessageRequests(platform: SupportedPlatformsType, testInfo
   await device1
     .onAndroid()
     .clickOnElementXPath(
-      `//android.view.ViewGroup[@resource-id='network.loki.messenger.qa:id/mainContainer'][.//android.widget.TextView[contains(@text,'${message}')]]//androidx.compose.ui.platform.ComposeView[@resource-id='network.loki.messenger.qa:id/profilePictureView']`
+      `//android.view.ViewGroup[@resource-id='network.loki.messenger:id/mainContainer'][.//android.widget.TextView[contains(@text,'${message}')]]//androidx.compose.ui.platform.ComposeView[@resource-id='network.loki.messenger:id/profilePictureView']`
     );
   await device1
     .onIOS()
@@ -92,7 +92,7 @@ async function blindedMessageRequests(platform: SupportedPlatformsType, testInfo
   });
   await device1.onAndroid().waitForTextElementToBePresent({
     strategy: 'id',
-    selector: 'network.loki.messenger.qa:id/textSendAfterApproval',
+    selector: 'network.loki.messenger:id/textSendAfterApproval',
     text: messageRequestPendingDescription,
   });
   await device1.sendMessage('Howdy partner');
@@ -106,7 +106,7 @@ async function blindedMessageRequests(platform: SupportedPlatformsType, testInfo
   await device2.onIOS().waitForControlMessageToBePresent(messageRequestsAcceptDescription);
   await device2.onAndroid().waitForTextElementToBePresent({
     strategy: 'id',
-    selector: 'network.loki.messenger.qa:id/sendAcceptsTextView',
+    selector: 'network.loki.messenger:id/sendAcceptsTextView',
     text: messageRequestsAcceptDescription,
   });
 
diff --git a/run/test/specs/disappearing_call.spec.ts b/run/test/specs/disappearing_call.spec.ts
@@ -133,30 +133,30 @@ async function disappearingCallMessage1o1Android(
   // Confirm call is put through
   await alice1.waitForTextElementToBePresent({
     strategy: 'id',
-    selector: 'network.loki.messenger.qa:id/callTitle',
+    selector: 'network.loki.messenger:id/callTitle',
     text: 'Ringing...',
     maxWait: 5_000,
   });
   await alice1.waitForTextElementToBePresent({
     strategy: 'id',
-    selector: 'network.loki.messenger.qa:id/callSubtitle',
+    selector: 'network.loki.messenger:id/callSubtitle',
     text: 'Sending Call Offer 2/5',
     maxWait: 5_000,
   });
-  await alice1.clickOnElementById('network.loki.messenger.qa:id/endCallButton');
+  await alice1.clickOnElementById('network.loki.messenger:id/endCallButton');
   const callEndTimestamp = Date.now();
   // Wait for control message to disappear
   await Promise.all([
     alice1.hasElementDisappeared({
       strategy: 'id',
-      selector: 'network.loki.messenger.qa:id/call_text_view',
+      selector: 'network.loki.messenger:id/call_text_view',
       text: `You called ${bob.userName}`,
       maxWait,
       actualStartTime: callEndTimestamp,
     }),
     bob1.hasElementDisappeared({
       strategy: 'id',
-      selector: 'network.loki.messenger.qa:id/call_text_view',
+      selector: 'network.loki.messenger:id/call_text_view',
       text: `Missed call from ${alice.userName}`,
       maxWait,
       actualStartTime: callEndTimestamp,
diff --git a/run/test/specs/group_message_video.spec.ts b/run/test/specs/group_message_video.spec.ts
@@ -83,7 +83,7 @@ async function sendVideoGroupAndroid(platform: SupportedPlatformsType, testInfo:
     bob1.waitForLoadingMedia(),
     bob1.waitForTextElementToBePresent({
       strategy: 'id',
-      selector: 'network.loki.messenger.qa:id/play_overlay',
+      selector: 'network.loki.messenger:id/play_overlay',
       maxWait: 8000,
     }),
   ]);
@@ -92,7 +92,7 @@ async function sendVideoGroupAndroid(platform: SupportedPlatformsType, testInfo:
     charlie1.waitForLoadingMedia(),
     charlie1.waitForTextElementToBePresent({
       strategy: 'id',
-      selector: 'network.loki.messenger.qa:id/play_overlay',
+      selector: 'network.loki.messenger:id/play_overlay',
       maxWait: 8000,
     }),
   ]);
diff --git a/run/test/specs/group_tests_delete_group.spec.ts b/run/test/specs/group_tests_delete_group.spec.ts
@@ -25,7 +25,7 @@ bothPlatformsIt({
 async function deleteGroup(platform: SupportedPlatformsType, testInfo: TestInfo) {
   const testGroupName = 'Delete group';
   const {
-    devices: { alice1, bob1, charlie1, alice2},
+    devices: { alice1, bob1, charlie1, alice2 },
   } = await test.step(TestSteps.SETUP.QA_SEEDER, async () => {
     return open_Alice2_Bob1_Charlie1_friends_group({
       platform,
diff --git a/run/test/specs/locators/conversation.ts b/run/test/specs/locators/conversation.ts
@@ -100,7 +100,7 @@ export class ScrollToBottomButton extends LocatorsInterface {
       case 'android':
         return {
           strategy: 'id',
-          selector: 'network.loki.messenger.qa:id/scrollToBottomButton',
+          selector: 'network.loki.messenger:id/scrollToBottomButton',
         } as const;
       case 'ios':
         return {
@@ -181,7 +181,7 @@ export class OutgoingMessageStatusSent extends LocatorsInterface {
       case 'android':
         return {
           strategy: 'id',
-          selector: 'network.loki.messenger.qa:id/messageStatusTextView',
+          selector: 'network.loki.messenger:id/messageStatusTextView',
           text: 'Sent',
         } as const;
       case 'ios':
@@ -439,7 +439,7 @@ export class CommunityInvitation extends LocatorsInterface {
       case 'android':
         return {
           strategy: 'id',
-          selector: 'network.loki.messenger.qa:id/openGroupTitleTextView',
+          selector: 'network.loki.messenger:id/openGroupTitleTextView',
           text: testCommunityName,
         } as const;
       case 'ios':
@@ -533,7 +533,7 @@ export class FirstEmojiReact extends LocatorsInterface {
       case 'android':
         return {
           strategy: 'id',
-          selector: 'network.loki.messenger.qa:id/reaction_1',
+          selector: 'network.loki.messenger:id/reaction_1',
         } as const;
       case 'ios':
         return {
@@ -558,7 +558,7 @@ export class EmojiReactsPill extends LocatorsInterface {
       case 'android':
         return {
           strategy: 'xpath',
-          selector: `//android.view.ViewGroup[@resource-id="network.loki.messenger.qa:id/mainContainer"][.//android.widget.TextView[contains(@text,"${this.messageText}")]]//android.view.ViewGroup[@resource-id="network.loki.messenger.qa:id/layout_emoji_container"]`,
+          selector: `//android.view.ViewGroup[@resource-id="network.loki.messenger:id/mainContainer"][.//android.widget.TextView[contains(@text,"${this.messageText}")]]//android.view.ViewGroup[@resource-id="network.loki.messenger:id/layout_emoji_container"]`,
         } as const;
       case 'ios':
         return {
@@ -583,7 +583,7 @@ export class EmojiReactsCount extends LocatorsInterface {
       case 'android':
         return {
           strategy: 'xpath',
-          selector: `//android.view.ViewGroup[@resource-id="network.loki.messenger.qa:id/mainContainer"][.//android.widget.TextView[contains(@text,"${this.messageText}")]]//android.widget.TextView[@resource-id="network.loki.messenger.qa:id/reactions_pill_count"][@text="${this.expectedCount}"]`,
+          selector: `//android.view.ViewGroup[@resource-id="network.loki.messenger:id/mainContainer"][.//android.widget.TextView[contains(@text,"${this.messageText}")]]//android.widget.TextView[@resource-id="network.loki.messenger:id/reactions_pill_count"][@text="${this.expectedCount}"]`,
         } as const;
       case 'ios':
         return {
@@ -606,7 +606,7 @@ export class MessageLengthCountdown extends LocatorsInterface {
       case 'android':
         return {
           strategy: 'id',
-          selector: 'network.loki.messenger.qa:id/characterLimitText',
+          selector: 'network.loki.messenger:id/characterLimitText',
           text: this.length,
         } as const;
       case 'ios':
diff --git a/run/test/specs/locators/global_search.ts b/run/test/specs/locators/global_search.ts
@@ -25,7 +25,7 @@ export class CancelSearchButton extends LocatorsInterface {
       case 'android':
         return {
           strategy: 'id',
-          selector: 'network.loki.messenger.qa:id/search_cancel',
+          selector: 'network.loki.messenger:id/search_cancel',
           text: 'Cancel',
         };
       case 'ios':
diff --git a/run/test/specs/locators/home.ts b/run/test/specs/locators/home.ts
@@ -9,7 +9,7 @@ export class EmptyLandingPage extends LocatorsInterface {
       case 'android':
         return {
           strategy: 'id',
-          selector: 'network.loki.messenger.qa:id/emptyStateContainer',
+          selector: 'network.loki.messenger:id/emptyStateContainer',
         } as const;
       case 'ios':
         return {
@@ -93,7 +93,7 @@ export class MessageSnippet extends LocatorsInterface {
       case 'android':
         return {
           strategy: 'xpath',
-          selector: `//android.widget.LinearLayout[.//android.widget.TextView[@content-desc="Conversation list item" and @text="${this.conversationName}"]]//android.widget.TextView[@resource-id="network.loki.messenger.qa:id/snippetTextView" and @text="${this.messageText}"]`,
+          selector: `//android.widget.LinearLayout[.//android.widget.TextView[@content-desc="Conversation list item" and @text="${this.conversationName}"]]//android.widget.TextView[@resource-id="network.loki.messenger:id/snippetTextView" and @text="${this.messageText}"]`,
         } as const;
     }
   }
diff --git a/run/test/specs/locators/index.ts b/run/test/specs/locators/index.ts
@@ -50,7 +50,7 @@ export class ApplyChanges extends LocatorsInterface {
       case 'android':
         return {
           strategy: 'id',
-          selector: 'network.loki.messenger.qa:id/action_apply',
+          selector: 'network.loki.messenger:id/action_apply',
         } as const;
       case 'ios':
         return {
@@ -486,7 +486,7 @@ export class LinkPreviewMessage extends LocatorsInterface {
       case 'android':
         return {
           strategy: 'id',
-          selector: 'network.loki.messenger.qa:id/linkPreviewView',
+          selector: 'network.loki.messenger:id/linkPreviewView',
         };
       case 'ios':
         throw new Error(`No such element on iOS`);
diff --git a/run/test/specs/locators/onboarding.ts b/run/test/specs/locators/onboarding.ts
@@ -28,7 +28,7 @@ export class BackButton extends LocatorsInterface {
       case 'android':
         return {
           strategy: 'id',
-          selector: 'network.loki.messenger.qa:id/back_button',
+          selector: 'network.loki.messenger:id/back_button',
         } as const;
       case 'ios':
         return {
diff --git a/run/test/specs/locators/settings.ts b/run/test/specs/locators/settings.ts
@@ -218,7 +218,7 @@ export class ClassicLightThemeOption extends LocatorsInterface {
       case 'android':
         return {
           strategy: 'id',
-          selector: 'network.loki.messenger.qa:id/theme_option_classic_light',
+          selector: 'network.loki.messenger:id/theme_option_classic_light',
         } as const;
       case 'ios':
         return {
diff --git a/run/test/specs/message_requests_accept_text_reply.spec.ts b/run/test/specs/message_requests_accept_text_reply.spec.ts
@@ -46,7 +46,7 @@ async function acceptRequestWithText(platform: SupportedPlatformsType, testInfo:
   });
   await device1.onAndroid().waitForTextElementToBePresent({
     strategy: 'id',
-    selector: 'network.loki.messenger.qa:id/textSendAfterApproval',
+    selector: 'network.loki.messenger:id/textSendAfterApproval',
     text: messageRequestPendingDescription,
   });
 
@@ -69,7 +69,7 @@ async function acceptRequestWithText(platform: SupportedPlatformsType, testInfo:
 
   await device2.onAndroid().waitForTextElementToBePresent({
     strategy: 'id',
-    selector: 'network.loki.messenger.qa:id/sendAcceptsTextView',
+    selector: 'network.loki.messenger:id/sendAcceptsTextView',
     text: messageRequestsAcceptDescription,
   });
 
diff --git a/run/test/specs/message_video.spec.ts b/run/test/specs/message_video.spec.ts
@@ -63,7 +63,7 @@ async function sendVideoAndroid(platform: SupportedPlatformsType, testInfo: Test
   await bob1.trustAttachments(alice.userName);
   await bob1.waitForTextElementToBePresent({
     strategy: 'id',
-    selector: 'network.loki.messenger.qa:id/play_overlay',
+    selector: 'network.loki.messenger:id/play_overlay',
   });
   await bob1.longPress(new MediaMessage(bob1));
   await bob1.clickOnByAccessibilityID('Reply to message');
diff --git a/run/test/specs/state_builder/index.ts b/run/test/specs/state_builder/index.ts
@@ -225,7 +225,7 @@ export async function open_Alice2_Bob1_Charlie1_friends_group({
   result.devices[0].setDeviceIdentity('alice1');
   result.devices[1].setDeviceIdentity('bob1');
   result.devices[2].setDeviceIdentity('charlie1');
-  result.devices[3].setDeviceIdentity('alice2'); 
+  result.devices[3].setDeviceIdentity('alice2');
 
   const alice = result.prebuilt.users[0];
   const bob = result.prebuilt.users[1];
diff --git a/run/test/specs/user_actions_read_status.spec.ts b/run/test/specs/user_actions_read_status.spec.ts
@@ -36,7 +36,7 @@ async function readStatus(platform: SupportedPlatformsType, testInfo: TestInfo)
   // Check read status on device 1
   await alice1.onAndroid().waitForTextElementToBePresent({
     strategy: 'id',
-    selector: 'network.loki.messenger.qa:id/messageStatusTextView',
+    selector: 'network.loki.messenger:id/messageStatusTextView',
     text: 'Read',
   });
 
diff --git a/run/test/specs/utils/capabilities_android.ts b/run/test/specs/utils/capabilities_android.ts
@@ -20,8 +20,8 @@ const sharedCapabilities: AppiumAndroidCapabilities & AppiumCapabilities = {
   'appium:app': androidAppFullPath,
   'appium:platformName': 'Android',
   'appium:platformVersion': '14',
-  'appium:appPackage': 'network.loki.messenger.qa',
-  'appium:appActivity': 'network.loki.messenger.RoutingActivity', // This one still needs the original package name (without qa suffix)
+  'appium:appPackage': 'network.loki.messenger',
+  'appium:appActivity': 'network.loki.messenger.RoutingActivity',
   'appium:automationName': 'UiAutomator2',
   'appium:newCommandTimeout': 300000,
   'appium:eventTimings': false,
diff --git a/run/test/specs/voice_calls.spec.ts b/run/test/specs/voice_calls.spec.ts
@@ -206,29 +206,29 @@ async function voiceCallAndroid(platform: SupportedPlatformsType, testInfo: Test
     await test.step(TestSteps.VERIFY.CALLING, async () => {
       await alice1.waitForTextElementToBePresent({
         strategy: 'id',
-        selector: 'network.loki.messenger.qa:id/callTitle',
+        selector: 'network.loki.messenger:id/callTitle',
         text: 'Ringing...',
         maxWait: 5_000,
       });
       await alice1.waitForTextElementToBePresent({
         strategy: 'id',
-        selector: 'network.loki.messenger.qa:id/callSubtitle',
+        selector: 'network.loki.messenger:id/callSubtitle',
         text: 'Sending Call Offer 2/5',
         maxWait: 5_000,
       });
     });
-    await alice1.clickOnElementById('network.loki.messenger.qa:id/endCallButton');
+    await alice1.clickOnElementById('network.loki.messenger:id/endCallButton');
   });
   // Bob sees the missed call and also jumps through all the hoops
   await test.step(TestSteps.VERIFY.MISSED_CALL, async () => {
     await bob1.waitForTextElementToBePresent({
       strategy: 'id',
-      selector: 'network.loki.messenger.qa:id/call_text_view',
+      selector: 'network.loki.messenger:id/call_text_view',
       text: `Missed call from ${alice.userName}`,
     });
     await bob1.clickOnElementAll({
       strategy: 'id',
-      selector: 'network.loki.messenger.qa:id/call_text_view',
+      selector: 'network.loki.messenger:id/call_text_view',
       text: `Missed call from ${alice.userName}`,
     });
   });
@@ -250,30 +250,30 @@ async function voiceCallAndroid(platform: SupportedPlatformsType, testInfo: Test
   await test.step(TestSteps.CALLS.INITIATE_CALL(bob.userName), async () => {
     await bob1.clickOnElementAll(new CallButton(bob1));
   });
-  await alice1.clickOnElementById('network.loki.messenger.qa:id/callInProgress');
-  await alice1.clickOnElementById('network.loki.messenger.qa:id/acceptCallButton');
+  await alice1.clickOnElementById('network.loki.messenger:id/callInProgress');
+  await alice1.clickOnElementById('network.loki.messenger:id/acceptCallButton');
   await test.step(TestSteps.VERIFY.CALL_SUCCESSFUL, async () => {
     await Promise.all(
       [alice1, bob1].map(device =>
         // If the text contains a colon it means its showing the call duration (ergo the call connected)
         device.waitForTextElementToBePresent({
           strategy: 'xpath',
-          selector: `//*[@resource-id='network.loki.messenger.qa:id/callTitle' and contains(@text, ':')]`,
+          selector: `//*[@resource-id='network.loki.messenger:id/callTitle' and contains(@text, ':')]`,
           maxWait: 15_000,
         })
       )
     );
-    await alice1.clickOnElementById('network.loki.messenger.qa:id/endCallButton');
+    await alice1.clickOnElementById('network.loki.messenger:id/endCallButton');
     await Promise.all([
       alice1.waitForTextElementToBePresent({
         strategy: 'id',
-        selector: 'network.loki.messenger.qa:id/call_text_view',
+        selector: 'network.loki.messenger:id/call_text_view',
         text: `${bob.userName} called you`,
         maxWait: 15_000,
       }),
       bob1.waitForTextElementToBePresent({
         strategy: 'id',
-        selector: 'network.loki.messenger.qa:id/call_text_view',
+        selector: 'network.loki.messenger:id/call_text_view',
         text: `You called ${alice.userName}`,
         maxWait: 15_000,
       }),
diff --git a/run/types/DeviceWrapper.ts b/run/types/DeviceWrapper.ts
diff --git a/run/types/testing.ts b/run/types/testing.ts
