fix: more Android 1.32.0 fixes

Author: mikimandoki

run/test/specs/disappear_after_send_off_1o1.spec.ts

@@ -8,7 +8,6 @@ import {
   DisableDisappearingMessages,
   DisappearingMessagesMenuOption,
   DisappearingMessagesSubtitle,
-  FollowSettingsButton,
   SetDisappearMessagesButton,
 } from '../locators/disappearing_messages';
 import { ConversationItem } from '../locators/home';
@@ -77,13 +76,6 @@ async function disappearAfterSendOff1o1(platform: SupportedPlatformsType, testIn
     bob1.waitForControlMessageToBePresent(disappearingMessagesTurnedOff),
     alice2.waitForControlMessageToBePresent(disappearingMessagesTurnedOffYou),
   ]);
-  // Follow setting on device 2
-  await bob1.clickOnElementAll(new FollowSettingsButton(bob1));
-  await bob1.checkModalStrings(
-    tStripped('disappearingMessagesFollowSetting'),
-    tStripped('disappearingMessagesFollowSettingOff')
-  );
-  await bob1.clickOnElementAll({ strategy: 'accessibility id', selector: 'Confirm' });
   // Check conversation subtitle?
   await Promise.all(
     [alice1, bob1, alice2].map(device =>

run/test/specs/disappearing_messages_follow_settings.spec.ts

@@ -3,6 +3,7 @@ import type { TestInfo } from '@playwright/test';
 import { tStripped } from '../../localizer/lib';
 import { bothPlatformsIt } from '../../types/sessionIt';
 import { DISAPPEARING_TIMES } from '../../types/testing';
+import { MessageBody } from '../locators/conversation';
 import {
   DisappearingMessagesSubtitle,
   FollowSettingsButton,
@@ -34,10 +35,11 @@ async function disappearingMessagesFollowSetting1o1(
 ) {
   const {
     devices: { alice1, bob1 },
+    prebuilt: { alice, bob },
   } = await open_Alice1_Bob1_friends({ platform, focusFriendsConvo: true, testInfo });
-
+  const aliceMsg = `${alice.userName}'s messages will disappear`;
+  const bobMsg = `${bob.userName}'s messages will disappear`;
   await setDisappearingMessage(alice1, ['1:1', timerType, time]);
-
   // Bob should see the follow settings banner after Alice sets DM
   await bob1.clickOnElementAll(new FollowSettingsButton(bob1));
   await bob1.checkModalStrings(
@@ -55,6 +57,19 @@ async function disappearingMessagesFollowSetting1o1(
       device.waitForTextElementToBePresent(new DisappearingMessagesSubtitle(device))
     )
   );
-
+  const aliceTimestamp = await alice1.sendMessage(aliceMsg);
+  const bobTimestamp = await bob1.sendMessage(bobMsg);
+  await Promise.all(
+    [alice1, bob1].flatMap(device => [
+      device.hasElementDisappeared({
+        ...new MessageBody(device, aliceMsg).build(),
+        actualStartTime: aliceTimestamp,
+      }),
+      device.hasElementDisappeared({
+        ...new MessageBody(device, bobMsg).build(),
+        actualStartTime: bobTimestamp,
+      }),
+    ])
+  );
   await closeApp(alice1, bob1);
 }

run/test/specs/message_voice.spec.ts

@@ -31,7 +31,7 @@ async function sendVoiceMessage(platform: SupportedPlatformsType, testInfo: Test
   await sleepFor(500);
   // The voice message long tap must be offset so that it doesn't tap the scrubber
   // As this starts playback and does not open the long press menu
-  await bob1.longPressMessage(new VoiceMessage(bob1), { offset: { x: 0, y: 50 } });
+  await bob1.longPressMessage(new VoiceMessage(bob1), { offset: { x: 0, y: 100 } });
   await bob1.clickOnByAccessibilityID('Reply to message');
   await sleepFor(500); // Let the UI settle before finding message input and typing
   await bob1.sendMessage(replyMessage);

run/test/utils/community.ts

@@ -2,7 +2,7 @@ import test from '@playwright/test';
 
 import { DeviceWrapper } from '../../types/DeviceWrapper';
 import { CommunityInput, JoinCommunityButton } from '../locators';
-import { ConversationHeaderName, EmptyConversation } from '../locators/conversation';
+import { ConversationHeaderName, MessageBody } from '../locators/conversation';
 import { PlusButton } from '../locators/home';
 import { JoinCommunityOption } from '../locators/start_conversation';
 
@@ -16,7 +16,7 @@ export const joinCommunity = async (
   await device.inputText(communityLink, new CommunityInput(device));
   await device.clickOnElementAll(new JoinCommunityButton(device));
   await device.waitForTextElementToBePresent(new ConversationHeaderName(device, communityName));
-  await device.hasElementBeenDeleted(new EmptyConversation(device)); // checking that messages loaded already
+  await device.waitForTextElementToBePresent(new MessageBody(device)); // Check for ANY message
   await device.scrollToBottom();
 };