Merge pull request #642 from Adamant-im/dev

Release 4.7.3
Adamant-im · Jul 1, 2024 · 832d196 · 832d196
2 parents 340cf01 + 85920b0
commit 832d196
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git 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
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "adamant-im",
-  "version": "4.7.2",
+  "version": "4.7.3",
   "author": "ADAMANT Foundation <devs@adamant.im>",
   "license": "GPLv3",
   "description": "Decentralized Messenger",

diff --git 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)