Merge branch 'master' into 2651-upgrade-openpgp-to-v6

FlowCrypt · Jan 20, 2025 · a58378e · a58378e
2 parents 17fc004 + 3fc3a23
commit a58378e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 18 deletions.
diff --git a/Core/source/lib/emailjs/emailjs-mime-codec.js b/Core/source/lib/emailjs/emailjs-mime-codec.js
@@ -30,7 +30,7 @@
     });
   } else if (typeof exports === 'object' && typeof navigator !== 'undefined') {
     // common.js for browser
-    encoding = require('emailjs-stringencoding');
+    encoding = require('./emailjs-stringencoding');
     module.exports = factory(encoding.TextEncoder, encoding.TextDecoder, root.btoa);
   } else if (typeof exports === 'object') {
     // common.js for node.js

diff --git a/FlowCrypt/Controllers/Compose/Extensions/ComposeViewController+Nodes.swift b/FlowCrypt/Controllers/Compose/Extensions/ComposeViewController+Nodes.swift
@@ -296,9 +296,6 @@ extension ComposeViewController {
             }
             return isValid
         }
-        .onShouldEndEditing { [weak self] textField in
-            return self?.showAlertIfTextFieldNotValidEmail(textField: textField) ?? true
-        }
         .onShouldChangeCharacters { [weak self] textField, character in
             self?.shouldChange(with: textField, and: character, for: type) ?? true
         }

diff --git a/appium/tests/data/index.ts b/appium/tests/data/index.ts
@@ -238,6 +238,7 @@ export const CommonData = {
       '\n' +
       'This will likely download a corrupted file. Download anyway?',
     invalidRecipient: 'Invalid recipient\nPlease enter a valid email address.',
+    oneOrMoreInvalidRecipient: 'One or more of your recipients have invalid email address (marked in red)',
     decryptMessageWithNoKeys:
       'Error\n' +
       'Could not open message\n\n' +

diff --git a/appium/tests/helpers/TouchHelper.ts b/appium/tests/helpers/TouchHelper.ts
@@ -63,19 +63,7 @@ class TouchHelper {
   };
 
   static tapScreenAt = async ({ x, y }: { x: number; y: number }) => {
-    await driver.performActions([
-      {
-        id: 'tapScreenAt',
-        type: 'pointer',
-        parameters: { pointerType: 'touch' },
-        actions: [
-          { duration: 0, x, y, type: 'pointerMove', origin: 'viewport' },
-          { button: 0, type: 'pointerDown' },
-          { type: 'pause', duration: 100 },
-          { button: 0, type: 'pointerUp' },
-        ],
-      },
-    ]);
+    await driver.execute('mobile: tap', { x, y });
     await browser.pause(100);
   };
 

diff --git a/appium/tests/specs/mock/composeEmail/CheckInvalidEmailRecipient.spec.ts b/appium/tests/specs/mock/composeEmail/CheckInvalidEmailRecipient.spec.ts
@@ -24,6 +24,7 @@ describe('COMPOSE EMAIL: ', () => {
     };
 
     const invalidRecipientError = CommonData.errors.invalidRecipient;
+    const oneOrMoreInvalidRecipientError = CommonData.errors.oneOrMoreInvalidRecipient;
 
     await mockApi.withMockedApis(async () => {
       await SplashScreen.mockLogin();
@@ -42,7 +43,7 @@ describe('COMPOSE EMAIL: ', () => {
       await BaseScreen.clickOkButtonOnError();
 
       await NewMessageScreen.clickSendButton();
-      await BaseScreen.checkModalMessage(invalidRecipientError);
+      await BaseScreen.checkModalMessage(oneOrMoreInvalidRecipientError);
       await BaseScreen.clickOkButtonOnError();
     });
   });