Skip to content

Commit

Permalink
Merge pull request #642 from Adamant-im/dev
Browse files Browse the repository at this point in the history
Release 4.7.3
  • Loading branch information
bludnic authored Jul 1, 2024
2 parents 340cf01 + 85920b0 commit 832d196
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "adamant-im",
"version": "4.7.2",
"version": "4.7.3",
"author": "ADAMANT Foundation <[email protected]>",
"license": "GPLv3",
"description": "Decentralized Messenger",
Expand Down
6 changes: 5 additions & 1 deletion src/lib/chat/helpers/normalizeMessage.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 832d196

Please sign in to comment.