Merge pull request #80 from session-foundation/dev

iOS 2.14.9, Android 1.30.3

Author: Bilb

eslint.config.mjs

@@ -89,5 +89,11 @@ export default tseslint.config(
       'perfectionist/sort-named-imports': 'off',
       'perfectionist/sort-union-types': 'off',
     },
+  },
+  {
+    files: ['run/test/specs/locators/*'],
+    rules: {
+      'perfectionist/sort-modules': 'error',
+    },
   }
 );

run/localizer/locales.ts

@@ -56,6 +56,7 @@ export type TokenSimpleNoArgs =
     'accountIdYoursDescription' |
     'actualSize' |
     'add' |
+    'addAdminSingular' |
     'addAdminsDescription' |
     'adminCannotBeDemoted' |
     'adminCannotBeRemoved' |
@@ -864,6 +865,7 @@ export type TokenSimpleNoArgs =
     'quitButton' |
     'rateSession' |
     'rateSessionApp' |
+    'rateUs' |
     'read' |
     'readReceipts' |
     'readReceiptsDescription' |
@@ -974,6 +976,8 @@ export type TokenSimpleNoArgs =
     'shareExtensionNoAccountError' |
     'shareGroupMessageHistory' |
     'shareToSession' |
+    'sharingSupportMultipleMedia' |
+    'sharingSupportMultipleMediaExcluded' |
     'show' |
     'showAll' |
     'showLess' |
@@ -1270,6 +1274,7 @@ export type TokensSimpleAndArgs = {
    proUpgradingTosPrivacy: WithIcon,
    processingRefundRequest: { platform: string },
    rateSessionModalDescription: WithStoreVariant,
+   rateSessionModalDescriptionUpdated: WithStoreVariant,
    refundNonOriginatorApple: { platform_account: string },
    remainingCharactersOverTooltip: WithCount,
    requestRefundPlatformWebsite: { platform: string, platform_account: string },
@@ -1558,6 +1563,7 @@ export type TokenSimpleWithArgs =
     'proUpgradingTosPrivacy' |
     'processingRefundRequest' |
     'rateSessionModalDescription' |
+    'rateSessionModalDescriptionUpdated' |
     'refundNonOriginatorApple' |
     'remainingCharactersOverTooltip' |
     'requestRefundPlatformWebsite' |
@@ -1671,6 +1677,9 @@ export const simpleDictionaryNoArgs: Record<
   add: {
       en: "Add",
   },
+  addAdminSingular: {
+      en: "Add Admin",
+  },
   addAdminsDescription: {
       en: "Enter the Account ID of the user you are promoting to admin.<br/><br/>To add multiple users, enter each Account ID separated by a comma. Up to 20 Account IDs can be specified at a time.",
   },
@@ -4095,6 +4104,9 @@ export const simpleDictionaryNoArgs: Record<
   rateSessionApp: {
       en: "Rate App",
   },
+  rateUs: {
+      en: "Rate Us",
+  },
   read: {
       en: "Read",
   },
@@ -4425,6 +4437,12 @@ export const simpleDictionaryNoArgs: Record<
   shareToSession: {
       en: "Share to Session",
   },
+  sharingSupportMultipleMedia: {
+      en: "Sorry, Session only supports sharing multiple images and videos at once",
+  },
+  sharingSupportMultipleMediaExcluded: {
+      en: "Sharing only supports media. Non-media files have been excluded",
+  },
   show: {
       en: "Show",
   },
@@ -5313,6 +5331,9 @@ export const simpleDictionaryWithArgs: Record<
  },
   rateSessionModalDescription: {
       en: "We're glad you're enjoying Session, if you have a moment, rating us in the {storevariant} helps others discover private, secure messaging!",
+ },
+  rateSessionModalDescriptionUpdated: {
+      en: "Session runs no ads, sells no data, and answers only to its users. Your {storevariant} rating helps more people find messaging that actually respects their privacy.",
  },
   refundNonOriginatorApple: {
       en: "Because you originally signed up for Session Pro via a different {platform_account}, you'll need to use that <b><span>{platform_account}</span></b> to update your Pro access.",

run/test/specs/check_avatar_color.spec.ts

@@ -6,6 +6,7 @@ import { ConversationSettings } from './locators/conversation';
 import { ConversationItem } from './locators/home';
 import { UserAvatar, UserSettings } from './locators/settings';
 import { open_Alice1_Bob1_friends } from './state_builder';
+import { sleepFor } from './utils';
 import { isSameColor } from './utils/check_colour';
 import { closeApp, SupportedPlatformsType } from './utils/open_app';
 
@@ -40,6 +41,7 @@ async function avatarColor(platform: SupportedPlatformsType, testInfo: TestInfo)
   });
   await test.step(`Get Alice's avatar color on bob's device from the Conversation Settings avatar`, async () => {
     await bob1.clickOnElementAll(new ConversationItem(bob1, alice.userName));
+    await sleepFor(500); // Wait for conversation to open
     bob1PixelColor = await bob1.getElementPixelColor(new ConversationSettings(bob1));
   });
   await test.step('Compare the avatar colors', () => {

run/test/specs/disappearing_link.spec.ts

@@ -12,6 +12,7 @@ import {
   OutgoingMessageStatusSent,
   SendButton,
 } from './locators/conversation';
+import { EnableLinkPreviewsModalButton } from './locators/global';
 import { open_Alice1_Bob1_friends } from './state_builder';
 import { sleepFor } from './utils';
 import { closeApp, SupportedPlatformsType } from './utils/open_app';
@@ -61,7 +62,7 @@ async function disappearingLinkMessage1o1Ios(platform: SupportedPlatformsType, t
         englishStrippedStr('linkPreviewsFirstDescription').toString()
       );
     });
-    await alice1.clickOnByAccessibilityID('Enable');
+    await alice1.clickOnElementAll(new EnableLinkPreviewsModalButton(alice1));
     // On iOS, Appium doesn't paste but type, and the link preview modal interrupts typing the link, the text must be deleted and typed again
     await alice1.deleteText(new MessageInput(alice1));
     await alice1.inputText(testLink, new MessageInput(alice1));
@@ -115,7 +116,7 @@ async function disappearingLinkMessage1o1Android(
         englishStrippedStr('linkPreviewsFirstDescription').toString()
       );
     });
-    await alice1.clickOnByAccessibilityID('Enable');
+    await alice1.clickOnElementAll(new EnableLinkPreviewsModalButton(alice1));
     // Preview takes a while to load
     await sleepFor(5000);
     await alice1.clickOnElementAll(new SendButton(alice1));

run/test/specs/group_disappearing_messages_link.spec.ts

@@ -12,6 +12,7 @@ import {
   OutgoingMessageStatusSent,
   SendButton,
 } from './locators/conversation';
+import { EnableLinkPreviewsModalButton } from './locators/global';
 import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder';
 import { sleepFor } from './utils';
 import { closeApp, SupportedPlatformsType } from './utils/open_app';
@@ -58,7 +59,7 @@ async function disappearingLinkMessageGroup(platform: SupportedPlatformsType, te
       );
     });
     // Accept link preview modal
-    await alice1.clickOnByAccessibilityID('Enable');
+    await alice1.clickOnElementAll(new EnableLinkPreviewsModalButton(alice1));
     // On iOS, Appium types so the link preview modal interrupts typing the link, must be deleted and typed again
     await alice1.onIOS().deleteText(new MessageInput(alice1));
     await alice1.onIOS().inputText(testLink, new MessageInput(alice1));

run/test/specs/group_message_link_preview.spec.ts

@@ -10,6 +10,7 @@ import {
   OutgoingMessageStatusSent,
   SendButton,
 } from './locators/conversation';
+import { EnableLinkPreviewsModalButton } from './locators/global';
 import { open_Alice1_Bob1_Charlie1_friends_group } from './state_builder';
 import { sleepFor } from './utils';
 import { closeApp, SupportedPlatformsType } from './utils/open_app';
@@ -52,7 +53,7 @@ async function sendLinkGroupiOS(platform: SupportedPlatformsType, testInfo: Test
     englishStrippedStr('linkPreviewsEnable').toString(),
     englishStrippedStr('linkPreviewsFirstDescription').toString()
   );
-  await alice1.clickOnByAccessibilityID('Enable');
+  await alice1.clickOnElementAll(new EnableLinkPreviewsModalButton(alice1));
   // No preview on first send
   await alice1.clickOnElementAll(new SendButton(alice1));
   await alice1.waitForTextElementToBePresent({
@@ -100,7 +101,7 @@ async function sendLinkGroupAndroid(platform: SupportedPlatformsType, testInfo:
     englishStrippedStr('linkPreviewsEnable').toString(),
     englishStrippedStr('linkPreviewsFirstDescription').toString()
   );
-  await alice1.clickOnByAccessibilityID('Enable');
+  await alice1.clickOnElementAll(new EnableLinkPreviewsModalButton(alice1));
   //wait for preview to generate
   await sleepFor(5000);
   // No preview on first send

run/test/specs/locators/browsers.ts

@@ -1,24 +1,19 @@
 import { LocatorsInterface } from '.';
 
-// SHARED LOCATORS
-export class URLInputField extends LocatorsInterface {
+export class ChromeNotificationsNegativeButton extends LocatorsInterface {
   public build() {
     switch (this.platform) {
       case 'android':
         return {
           strategy: 'id',
-          selector: 'com.android.chrome:id/url_bar',
+          selector: 'com.android.chrome:id/negative_button',
         } as const;
       case 'ios':
-        return {
-          strategy: 'accessibility id',
-          selector: 'URL',
-        } as const;
+        throw new Error('Unsupported platform');
     }
   }
 }
 
-// ANDROID ONLY
 export class ChromeUseWithoutAnAccount extends LocatorsInterface {
   public build() {
     switch (this.platform) {
@@ -34,43 +29,45 @@ export class ChromeUseWithoutAnAccount extends LocatorsInterface {
   }
 }
 
-export class ChromeNotificationsNegativeButton extends LocatorsInterface {
+export class SafariAddressBar extends LocatorsInterface {
   public build() {
     switch (this.platform) {
       case 'android':
+        throw new Error('Unsupported platform');
+      case 'ios':
         return {
-          strategy: 'id',
-          selector: 'com.android.chrome:id/negative_button',
+          strategy: 'accessibility id',
+          selector: 'TabBarItemTitle',
         } as const;
-      case 'ios':
-        throw new Error('Unsupported platform');
     }
   }
 }
 
-// iOS ONLY
-export class SafariAddressBar extends LocatorsInterface {
+export class SafariShareButton extends LocatorsInterface {
   public build() {
     switch (this.platform) {
       case 'android':
         throw new Error('Unsupported platform');
       case 'ios':
         return {
           strategy: 'accessibility id',
-          selector: 'TabBarItemTitle',
+          selector: 'ShareButton',
         } as const;
     }
   }
 }
-export class SafariShareButton extends LocatorsInterface {
+export class URLInputField extends LocatorsInterface {
   public build() {
     switch (this.platform) {
       case 'android':
-        throw new Error('Unsupported platform');
+        return {
+          strategy: 'id',
+          selector: 'com.android.chrome:id/url_bar',
+        } as const;
       case 'ios':
         return {
           strategy: 'accessibility id',
-          selector: 'ShareButton',
+          selector: 'URL',
         } as const;
     }
   }