From 0de3d1c1f51333f8e8c96229fa2048cb00ccfcd2 Mon Sep 17 00:00:00 2001 From: bludnic Date: Mon, 1 Jul 2024 18:27:03 +0100 Subject: [PATCH 1/2] fix(Chat): in-chat transfer without comment is marked as "Unsupported transaction" --- src/lib/chat/helpers/normalizeMessage.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/chat/helpers/normalizeMessage.js b/src/lib/chat/helpers/normalizeMessage.js index ae3cef22b..227bc0a74 100644 --- a/src/lib/chat/helpers/normalizeMessage.js +++ b/src/lib/chat/helpers/normalizeMessage.js @@ -96,7 +96,11 @@ export function normalizeMessage(abstract) { transaction.type = notSupportedYetCrypto || 'UNKNOWN_CRYPTO' transaction.status = TS.UNKNOWN } - } else if (typeof abstract.message === 'string' || abstract.type === Transactions.SEND) { + } else if ( + typeof abstract.message === 'string' || + abstract.type === Transactions.SEND || + abstract.amount > 0 + ) { // ADM transaction or Message transaction.message = abstract.message || '' transaction.hash = abstract.id // adm transaction id (hash) From 85920b0a93ebd98d9a2d8d57daeb6784bc88bf74 Mon Sep 17 00:00:00 2001 From: bludnic Date: Mon, 1 Jul 2024 18:27:56 +0100 Subject: [PATCH 2/2] chore: release 4.7.3 --- android/app/build.gradle | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index bb4de241e..ebf46d732 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "im.adamant.adamantmessengerpwa" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 472 - versionName "4.7.2" + versionCode 473 + versionName "4.7.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/package-lock.json b/package-lock.json index 6be36ef51..f4ca1778d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "adamant-im", - "version": "4.7.2", + "version": "4.7.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "adamant-im", - "version": "4.7.2", + "version": "4.7.3", "hasInstallScript": true, "license": "GPLv3", "dependencies": { diff --git a/package.json b/package.json index f36ccc752..002f0bfa3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "adamant-im", - "version": "4.7.2", + "version": "4.7.3", "author": "ADAMANT Foundation ", "license": "GPLv3", "description": "Decentralized Messenger",