refactor: use tstripped instead of englishstrippedstr

tests/automation/call_checks.spec.ts

@@ -1,4 +1,4 @@
-import { englishStrippedStr } from '../localization/englishStrippedStr';
+import { tStripped } from '../localization/lib';
 import { Global, HomeScreen } from './locators';
 import { test_Alice_1W_Bob_1W } from './setup/sessionTest';
 import { createContact } from './utilities/create_contact';
@@ -22,23 +22,21 @@ test_Alice_1W_Bob_1W(
     await waitForTestIdWithText(
       bobWindow1,
       'call-notification-answered-a-call',
-      englishStrippedStr('callsInProgress').toString(),
+      tStripped('callsInProgress'),
     );
     // Control message should be '{callerName} called you'
     // await waitForTestIdWithText(
     //   bobWindow1,
     //   'call-notification-answered-a-call',
-    //   englishStrippedStr('callsCalledYou')
+    //   tStripped('callsCalledYou')
     //     .withArgs({ name: caller.userName })
     //     .toString(),
     // );
     // In the callers window, the message is 'You called {reciverName}'
     await waitForTestIdWithText(
       aliceWindow1,
       'call-notification-started-call',
-      englishStrippedStr('callsYouCalled')
-        .withArgs({ name: bob.userName })
-        .toString(),
+      tStripped('callsYouCalled', { name: bob.userName }),
     );
   },
 );

tests/automation/community_tests.spec.ts

@@ -1,4 +1,4 @@
-import { englishStrippedStr } from '../localization/englishStrippedStr';
+import { tStripped } from '../localization/lib';
 import { testCommunityName } from './constants/community';
 import { Conversation, Global, HomeScreen } from './locators';
 import { newUser } from './setup/new_user';
@@ -26,8 +26,8 @@ import {
   waitForTestIdWithText,
 } from './utilities/utils';
 
-const banUserString = englishStrippedStr('banUser').toString();
-const unbanUserString = englishStrippedStr('banUnbanUser').toString();
+const banUserString = tStripped('banUser');
+const unbanUserString = tStripped('banUnbanUser');
 
 test_Alice_2W(
   'Join community and sync',

tests/automation/cta_donations.spec.ts

@@ -1,6 +1,6 @@
 import { Page } from '@playwright/test';
 
-import { englishStrippedStr } from '../localization/englishStrippedStr';
+import { tStripped } from '../localization/lib';
 import { CTA, Global } from './locators';
 import { test_Alice_1W } from './setup/sessionTest';
 import { mockDBCreationTime } from './utilities/time_travel';
@@ -15,12 +15,9 @@ import {
 async function verifyDonateCTAShows(window: Page) {
   await checkCTAStrings(
     window,
-    englishStrippedStr('donateSessionHelp').toString(),
-    englishStrippedStr('donateSessionDescription').toString(),
-    [
-      englishStrippedStr('donate').toString(),
-      englishStrippedStr('maybeLater').toString(),
-    ],
+    tStripped('donateSessionHelp'),
+    tStripped('donateSessionDescription'),
+    [tStripped('donate'), tStripped('maybeLater')],
   );
 }
 
@@ -63,8 +60,8 @@ urlModalButtons.forEach(({ button, name }) => {
       await clickOn(aliceWindow1, CTA.confirmButton);
       await checkModalStrings(
         aliceWindow1,
-        englishStrippedStr('urlOpen').toString(),
-        englishStrippedStr('urlOpenDescription').withArgs({ url }).toString(),
+        tStripped('urlOpen'),
+        tStripped('urlOpenDescription', { url }),
         'openUrlModal',
       );
 

tests/automation/delete_account.spec.ts

@@ -1,6 +1,6 @@
 import { Page } from '@playwright/test';
 
-import { englishStrippedStr } from '../localization/englishStrippedStr';
+import { tStripped } from '../localization/lib';
 import { sleepFor } from '../promise_utils';
 import { Global, HomeScreen, LeftPane, Onboarding, Settings } from './locators';
 import { forceCloseAllWindows } from './setup/closeWindows';
@@ -43,23 +43,17 @@ sessionTestTwoWindows(
       await clickOnWithText(
         windowA,
         Settings.clearDataMenuItem,
-        englishStrippedStr('sessionClearData').toString(),
+        tStripped('sessionClearData'),
       );
       // Select entire account
       await clickOnWithText(
         windowA,
         Settings.clearDeviceAndNetworkRadial,
-        englishStrippedStr('clearDeviceAndNetwork').toString(),
+        tStripped('clearDeviceAndNetwork'),
       );
       // Confirm deletion by clicking Clear, twice
-      await clickOnMatchingText(
-        windowA,
-        englishStrippedStr('clear').toString(),
-      );
-      await clickOnMatchingText(
-        windowA,
-        englishStrippedStr('clear').toString(),
-      );
+      await clickOnMatchingText(windowA, tStripped('clear'));
+      await clickOnMatchingText(windowA, tStripped('clear'));
       await waitForLoadingAnimationToFinish(
         windowA,
         Global.loadingSpinner.selector,
@@ -136,18 +130,12 @@ sessionTestTwoWindows(
       await clickOnWithText(
         windowA,
         Settings.clearDataMenuItem,
-        englishStrippedStr('sessionClearData').toString(),
+        tStripped('sessionClearData'),
       );
       // Keep 'Clear Device only' selection
       // Confirm deletion by clicking Clear, twice
-      await clickOnMatchingText(
-        windowA,
-        englishStrippedStr('clear').toString(),
-      );
-      await clickOnMatchingText(
-        windowA,
-        englishStrippedStr('clear').toString(),
-      );
+      await clickOnMatchingText(windowA, tStripped('clear'));
+      await clickOnMatchingText(windowA, tStripped('clear'));
       restoringWindows = await openApp(1);
       const [restoringWindow] = restoringWindows;
       // Sign in with deleted account and check that nothing restores

tests/automation/disappearing_message_checks.spec.ts

@@ -1,4 +1,4 @@
-import { englishStrippedStr } from '../localization/englishStrippedStr';
+import { tStripped } from '../localization/lib';
 import { sleepFor } from '../promise_utils';
 import { testCommunityName } from './constants/community';
 import {
@@ -60,23 +60,19 @@ mediaArray.forEach(
           waitForTestIdWithText(
             aliceWindow1,
             Conversation.disappearingControlMessage.selector,
-            englishStrippedStr('disappearingMessagesSetYou')
-              .withArgs({
-                time: formattedTime,
-                disappearing_messages_type: disappearAction,
-              })
-              .toString(),
+            tStripped('disappearingMessagesSetYou', {
+              time: formattedTime,
+              disappearing_messages_type: disappearAction,
+            }),
           ),
           waitForTestIdWithText(
             bobWindow1,
             Conversation.disappearingControlMessage.selector,
-            englishStrippedStr('disappearingMessagesSet')
-              .withArgs({
-                time: formattedTime,
-                disappearing_messages_type: disappearAction,
-                name: alice.userName,
-              })
-              .toString(),
+            tStripped('disappearingMessagesSet', {
+              time: formattedTime,
+              disappearing_messages_type: disappearAction,
+              name: alice.userName,
+            }),
           ),
         ]);
         // Send media
@@ -128,23 +124,19 @@ test_Alice_1W_Bob_1W(
       waitForTestIdWithText(
         aliceWindow1,
         Conversation.disappearingControlMessage.selector,
-        englishStrippedStr('disappearingMessagesSetYou')
-          .withArgs({
-            time: formattedTime,
-            disappearing_messages_type: disappearAction,
-          })
-          .toString(),
+        tStripped('disappearingMessagesSetYou', {
+          time: formattedTime,
+          disappearing_messages_type: disappearAction,
+        }),
       ),
       waitForTestIdWithText(
         bobWindow1,
         Conversation.disappearingControlMessage.selector,
-        englishStrippedStr('disappearingMessagesSet')
-          .withArgs({
-            time: formattedTime,
-            disappearing_messages_type: disappearAction,
-            name: alice.userName,
-          })
-          .toString(),
+        tStripped('disappearingMessagesSet', {
+          time: formattedTime,
+          disappearing_messages_type: disappearAction,
+          name: alice.userName,
+        }),
       ),
     ]);
     await typeIntoInput(aliceWindow1, 'message-input-text-area', longText);
@@ -173,23 +165,19 @@ test_Alice_1W_Bob_1W(
       waitForTestIdWithText(
         aliceWindow1,
         Conversation.disappearingControlMessage.selector,
-        englishStrippedStr('disappearingMessagesSetYou')
-          .withArgs({
-            time: formattedTime,
-            disappearing_messages_type: disappearAction,
-          })
-          .toString(),
+        tStripped('disappearingMessagesSetYou', {
+          time: formattedTime,
+          disappearing_messages_type: disappearAction,
+        }),
       ),
       waitForTestIdWithText(
         bobWindow1,
         Conversation.disappearingControlMessage.selector,
-        englishStrippedStr('disappearingMessagesSet')
-          .withArgs({
-            time: formattedTime,
-            disappearing_messages_type: disappearAction,
-            name: alice.userName,
-          })
-          .toString(),
+        tStripped('disappearingMessagesSet', {
+          time: formattedTime,
+          disappearing_messages_type: disappearAction,
+          name: alice.userName,
+        }),
       ),
     ]);
     await sendLinkPreview(aliceWindow1, testLink);
@@ -227,23 +215,19 @@ test_Alice_1W_Bob_1W(
       waitForTestIdWithText(
         aliceWindow1,
         Conversation.disappearingControlMessage.selector,
-        englishStrippedStr('disappearingMessagesSetYou')
-          .withArgs({
-            time: formattedTime,
-            disappearing_messages_type: disappearAction,
-          })
-          .toString(),
+        tStripped('disappearingMessagesSetYou', {
+          time: formattedTime,
+          disappearing_messages_type: disappearAction,
+        }),
       ),
       waitForTestIdWithText(
         bobWindow1,
         Conversation.disappearingControlMessage.selector,
-        englishStrippedStr('disappearingMessagesSet')
-          .withArgs({
-            time: formattedTime,
-            disappearing_messages_type: disappearAction,
-            name: alice.userName,
-          })
-          .toString(),
+        tStripped('disappearingMessagesSet', {
+          time: formattedTime,
+          disappearing_messages_type: disappearAction,
+          name: alice.userName,
+        }),
       ),
     ]);
     await joinCommunity(aliceWindow1);
@@ -254,7 +238,7 @@ test_Alice_1W_Bob_1W(
     await waitForTestIdWithText(
       aliceWindow1,
       'modal-heading',
-      englishStrippedStr('membersInvite').toString(),
+      tStripped('membersInvite'),
     );
     await clickOnWithText(aliceWindow1, Global.contactItem, bob.userName);
     await clickOn(aliceWindow1, Global.confirmButton);
@@ -321,23 +305,19 @@ test_Alice_1W_Bob_1W(
       waitForTestIdWithText(
         aliceWindow1,
         Conversation.disappearingControlMessage.selector,
-        englishStrippedStr('disappearingMessagesSetYou')
-          .withArgs({
-            time: formattedTime,
-            disappearing_messages_type: disappearAction,
-          })
-          .toString(),
+        tStripped('disappearingMessagesSetYou', {
+          time: formattedTime,
+          disappearing_messages_type: disappearAction,
+        }),
       ),
       waitForTestIdWithText(
         bobWindow1,
         Conversation.disappearingControlMessage.selector,
-        englishStrippedStr('disappearingMessagesSet')
-          .withArgs({
-            time: formattedTime,
-            disappearing_messages_type: disappearAction,
-            name: alice.userName,
-          })
-          .toString(),
+        tStripped('disappearingMessagesSet', {
+          time: formattedTime,
+          disappearing_messages_type: disappearAction,
+          name: alice.userName,
+        }),
       ),
     ]);
     await makeVoiceCall(aliceWindow1, bobWindow1);
@@ -346,15 +326,13 @@ test_Alice_1W_Bob_1W(
       waitForTestIdWithText(
         bobWindow1,
         'call-notification-answered-a-call',
-        englishStrippedStr('callsInProgress').toString(),
+        tStripped('callsInProgress'),
       ),
       // In the callers window, the message is 'You called {reciverName}'
       waitForTestIdWithText(
         aliceWindow1,
         'call-notification-started-call',
-        englishStrippedStr('callsYouCalled')
-          .withArgs({ name: bob.userName })
-          .toString(),
+        tStripped('callsYouCalled', { name: bob.userName }),
       ),
     ]);
     // Wait 30 seconds for call message to disappear
@@ -365,16 +343,14 @@ test_Alice_1W_Bob_1W(
         'data-testid',
         'call-notification-answered-a-call',
         undefined,
-        englishStrippedStr('callsInProgress').toString(),
+        tStripped('callsInProgress'),
       ),
       hasElementBeenDeleted(
         aliceWindow1,
         'data-testid',
         'call-notification-started-call',
         undefined,
-        englishStrippedStr('callsYouCalled')
-          .withArgs({ name: bob.userName })
-          .toString(),
+        tStripped('callsYouCalled', { name: bob.userName }),
       ),
     ]);
   },