Merge branch 'main' into ar/frames-refactor

ephemeraHQ · Oct 28, 2024 · 5e5d353 · 5e5d353
2 parents 0cecad2 + 6825113
commit 5e5d353
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/utils/conversation.ts b/utils/conversation.ts
@@ -271,7 +271,7 @@ export const openMainConversationWithPeer = async (
       isDone = true;
       Alert.alert(
         translate("identity_not_yet_xmtp_title"),
-        translate("identity_not_yet_xmtp", {}),
+        translate("identity_not_yet_xmtp", { identity: peerToCreateConvoWith }),
         [
           {
             text: "OK",

diff --git a/utils/regex.ts b/utils/regex.ts
@@ -1,6 +1,6 @@
-const BOUNDARY_START_LOOKBEHIND = /(\s|\(|"|')/.source; // Either a space or a (, or a " or a '
+const BOUNDARY_START_LOOKBEHIND = /(\s|\(|"|'|,)/.source; // Either a space or a (, or a " or a '
 const BOUNDARY_START = new RegExp(`(?<=${BOUNDARY_START_LOOKBEHIND})|^`).source; // It must be start of the line or be preceded by lookbehind
-const BOUNDARY_END_LOOKAHEAD = /(\s|\)|$|\.|!|\?|\r\n|\r|\n|"|')/.source; // Either a space, the end of the text, or a ), a ., a !, a ?, a line break, or a " or a '
+const BOUNDARY_END_LOOKAHEAD = /(\s|\)|$|\.|!|\?|\r\n|\r|\n|"|'|,)/.source; // Either a space, the end of the text, or a ), a ., a !, a ?, a line break, or a " or a '
 const BOUNDARY_END = new RegExp(`(?=${BOUNDARY_END_LOOKAHEAD})`).source;
 const WORD_CONTENT = /[^()/\s]/.source; // Not a space, not a ( or ), not a /