Skip to content

Commit

Permalink
chore: Android/iOS v1.10.23
Browse files Browse the repository at this point in the history
  • Loading branch information
muhsin-k committed Nov 25, 2023
1 parent d5515d2 commit 4906790
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 16 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Expand Up @@ -79,8 +79,8 @@ android {
applicationId "com.chatwoot.app"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 5180010
versionName "1.10.22"
versionCode 5180011
versionName "1.10.23"
}
lintOptions {
checkReleaseBuilds false
Expand Down
8 changes: 4 additions & 4 deletions ios/Chatwoot.xcodeproj/project.pbxproj
Expand Up @@ -557,7 +557,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Chatwoot/Chatwoot.entitlements;
CURRENT_PROJECT_VERSION = 323;
CURRENT_PROJECT_VERSION = 324;
DEVELOPMENT_TEAM = L7YLMN4634;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Chatwoot/Info.plist;
Expand All @@ -566,7 +566,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.10.22;
MARKETING_VERSION = 1.10.23;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -591,15 +591,15 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Chatwoot/Chatwoot.entitlements;
CURRENT_PROJECT_VERSION = 323;
CURRENT_PROJECT_VERSION = 324;
DEVELOPMENT_TEAM = L7YLMN4634;
INFOPLIST_FILE = Chatwoot/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = Chatwoot;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.10.22;
MARKETING_VERSION = 1.10.23;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "@chatwoot/mobile-app",
"version": "1.10.22",
"version": "1.10.23",
"private": true,
"scripts": {
"android": "react-native run-android",
Expand Down
22 changes: 13 additions & 9 deletions src/helpers/conversationHelpers.js
Expand Up @@ -125,16 +125,20 @@ export const buildCreatePayload = ({
};

export const replaceMentionsWithUsernames = text => {
// eslint-disable-next-line no-useless-escape
const regex = /\[@([^\]]+)\]\(mention:\/\/user\/\d+\/([^\)]+)\)/g;
const matches = text.matchAll(regex);
let result = text;
for (const match of matches) {
const [fullMatch, username] = match;
const replacement = `@${decodeURIComponent(username)}`;
result = result.replace(fullMatch, replacement);
try {
// eslint-disable-next-line no-useless-escape
const regex = /\[@([^\]]+)\]\(mention:\/\/user\/\d+\/([^\)]+)\)/g;
const matches = text.matchAll(regex);
let result = text;
for (const match of matches) {
const [fullMatch, username] = match;
const replacement = `@${decodeURIComponent(username)}`;
result = result.replace(fullMatch, replacement);
}
return result;
} catch (error) {
return text;
}
return result;
};

export const findUniqueMessages = ({ allMessages }) => {
Expand Down

0 comments on commit 4906790

Please sign in to comment.