Skip to content

Commit

Permalink
fix: transaction message style (#1319)
Browse files Browse the repository at this point in the history
* v

* Update satolist.js

* v

* Update package.json

* Update Bastyon.json
  • Loading branch information
maxgithubprofile authored Nov 16, 2024
1 parent 3ead99c commit f671e05
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 7 deletions.
2 changes: 1 addition & 1 deletion config/Bastyon.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"grantedPermissions" : ["account", "chat"],
"includeinsearch" : true,
"includeminiapps" : true,
"store" : {}
"store" : {"g" : true}
}],
"protocol" : "bastyon",
"support" : "[email protected]",
Expand Down
12 changes: 12 additions & 0 deletions css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -5438,6 +5438,18 @@ html.allcontent_application #footerWrapper {
.fastMessage.smallsize .cwrapper > div .tips > div {
display: none;
}
.fastMessage.smallsize .cwrapper > div .tips > div.transactionmessage {
display: block;
}
.fastMessage.smallsize .cwrapper > div .tips > div.transactionmessage .transactionmessagewrapper {
display: block;
}
.fastMessage.smallsize .cwrapper > div .tips > div.transactionmessage .foramount {
text-align: left;
}
.fastMessage.smallsize .cwrapper > div .tips > div.transactionmessage .formessage {
display: none;
}
.fastMessage.smallsize .cwrapper > div .tips > div.notifytext {
display: block;
font-size: 0.8em;
Expand Down
16 changes: 16 additions & 0 deletions css/main.less
Original file line number Diff line number Diff line change
Expand Up @@ -6620,6 +6620,22 @@ html.allcontent_application{
>div{
display: none;

&.transactionmessage{
display: block;

.transactionmessagewrapper{
display: block;
}

.foramount{
text-align: left;
}

.formessage{
display: none;
}
}

&.notifytext{
display: block;
font-size : 0.8em;
Expand Down
13 changes: 9 additions & 4 deletions js/satolist.js
Original file line number Diff line number Diff line change
Expand Up @@ -12101,8 +12101,6 @@ Platform = function (app, listofnodes) {

var apppromise = (() => {return Promise.resolve(null)})()

console.log('appinfo', appinfo)

if (appinfo){
apppromise = self.app.apps.get.applicationAny(appinfo).then(r => {

Expand Down Expand Up @@ -20587,6 +20585,8 @@ Platform = function (app, listofnodes) {

platform.actions.ws.block(data)

platform.app.apps.emit('block', {height : hb})

////////////////


Expand Down Expand Up @@ -20664,6 +20664,9 @@ Platform = function (app, listofnodes) {
if(tx.height && tx.height != platform.currentBlock) tx.confirmations ++
})


platform.app.apps.emit('block', {height : data.block || data.height})

////////////////


Expand Down Expand Up @@ -21921,7 +21924,7 @@ Platform = function (app, listofnodes) {
if (!m) m = {}


if (data.txid) {
if (data.txid) {

if (txidstorage[data.txid] || (data.msg === 'transaction' && data.donation)) return;

Expand Down Expand Up @@ -22478,8 +22481,10 @@ Platform = function (app, listofnodes) {
node: "137.135.25.73:38081:8087",
time: 1636521290,
txid: "65fee9b1e925833c5ff623178efecc436d3af0c9f6a4baa0b73c52907a9d1d7b"
})*/
})


self.messageHandler({"addr":"PR7srzZt4EfcNb3s27grgmiG8aB9vYNV82","msg":"transaction","txid":"02049bfc66ccf0efdd03cf715dad9d3f18c729b4012671982b115ff4d67f8069","time":1731655840,"amount":"1250000","nout":"6","node":"185.9.187.123:38081:8087"})*/


// test coin
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

"version": "0.9.103",

"versionsuffix": "1",
"versionsuffix": "2",
"cordovaversion": "1.8.103",
"cordovaversioncode": "1801021",
"cordovaversioncode": "1801032",

"description": "Bastyon desktop application",
"author": "Pocketnet Community <[email protected]>",
Expand Down

0 comments on commit f671e05

Please sign in to comment.