Merge branch 'main' into fix-#21753

Expensify · Nov 14, 2023 · 1d6b926 · 1d6b926
2 parents 5d40ac3 + 1b51807
commit 1d6b926
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/__tests__/ExpensiMark-HTML-test.js b/__tests__/ExpensiMark-HTML-test.js
@@ -1262,6 +1262,7 @@ test('Test for @here mention with italic, bold and strikethrough styles', () =>
     + ' @here_123'
     + ' @here_abc'
     + ' @here123'
+    + ' @herea'
     + ' @hereabc'
     + ' @here abc'
     + ' @here*'
@@ -1270,7 +1271,10 @@ test('Test for @here mention with italic, bold and strikethrough styles', () =>
     + ' @here@'
     + ' @here$'
     + ' @here^'
-    + ' @here(';
+    + ' @here('
+    + ' @here.'
+    + ' @here!'
+    + ' @here?';
 
     const resultString = '<mention-here>@here</mention-here>'
     + ' <em><mention-here>@here</mention-here></em>'
@@ -1280,6 +1284,7 @@ test('Test for @here mention with italic, bold and strikethrough styles', () =>
     + ' @here_123'
     + ' @here_abc'
     + ' @here123'
+    + ' @herea'
     + ' @hereabc'
     + ' <mention-here>@here</mention-here> abc'
     + ' <mention-here>@here</mention-here>*'
@@ -1288,7 +1293,10 @@ test('Test for @here mention with italic, bold and strikethrough styles', () =>
     + ' <mention-here>@here</mention-here>@'
     + ' <mention-here>@here</mention-here>$'
     + ' <mention-here>@here</mention-here>^'
-    + ' <mention-here>@here</mention-here>(';
+    + ' <mention-here>@here</mention-here>('
+    + ' <mention-here>@here</mention-here>.'
+    + ' <mention-here>@here</mention-here>!'
+    + ' <mention-here>@here</mention-here>?';
     expect(parser.replace(testString)).toBe(resultString);
 });
 

diff --git a/lib/API.jsx b/lib/API.jsx
@@ -833,12 +833,13 @@ export default function API(network, args) {
              * @param {string} parameters.assigneeEmail
              * @param {number} parameters.cardLimit
              * @param {string} parameters.cardLimitType
+             * @param {string} parameters.domainName
              *
              * @returns {APIDeferred}
              */
             createAdminIssuedVirtualCard: function (parameters) {
                 const commandName = 'Card_CreateAdminIssuedVirtualCard';
-                requireParameters(['cardTitle', 'assigneeEmail', 'cardLimit', 'cardLimitType'], parameters, commandName);
+                requireParameters(['cardTitle', 'assigneeEmail', 'cardLimit', 'cardLimitType', 'domainName'], parameters, commandName);
                 return performPOSTRequest(commandName, parameters);
             },