Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
af47c53
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile May 13, 2025
ad28b50
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile May 14, 2025
715e5a0
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile May 20, 2025
c746e33
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile May 20, 2025
6e1998a
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile May 21, 2025
1de3855
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile May 30, 2025
d0e2f31
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 1, 2025
63abb8e
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 3, 2025
f02d9e1
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 4, 2025
97fc39e
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 5, 2025
d439a60
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 6, 2025
eda19b8
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 11, 2025
ead1332
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 16, 2025
1d5a25e
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 23, 2025
5abe285
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 23, 2025
10f71cb
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 24, 2025
e44ca97
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 25, 2025
78bb157
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 25, 2025
fcc6cb3
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 25, 2025
63bccf7
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 26, 2025
1f998f3
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 28, 2025
370c1c5
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jun 28, 2025
97d9e2d
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jul 4, 2025
6ffbbcc
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jul 7, 2025
46984ae
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jul 29, 2025
08c8a78
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jul 30, 2025
a0b90a4
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jul 30, 2025
b70804b
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Jul 31, 2025
5156b24
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Aug 1, 2025
9f1db52
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Aug 14, 2025
111b6ec
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Aug 16, 2025
b5273aa
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Aug 18, 2025
ef56e7d
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Aug 19, 2025
c2617f8
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Aug 25, 2025
d9309d4
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Aug 25, 2025
c5692cf
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Sep 1, 2025
f83bfcd
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Sep 13, 2025
5a5e513
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Sep 30, 2025
69550e2
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Oct 2, 2025
c806a69
Merge branch 'master' of https://github.com/pocketnetteam/pocketnet.gui
maxgithubprofile Oct 9, 2025
92e621e
v
maxgithubprofile Oct 9, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions components/activities/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ var activities = (function () {

var el, loading, scnt, currentFilter = 'all', end = false, block;

var ed = {}

var filtersList = ['all', 'interactions', 'comment', 'subscriber', 'blocking', 'video']

filtersList.push('pending')
Expand Down Expand Up @@ -576,7 +578,9 @@ var activities = (function () {
return {
primary: primary,

getdata: function (clbk) {
getdata: function (clbk, p){

ed = p.settings.essenseData || {}

var data = {
filters: filtersList
Expand All @@ -585,7 +589,7 @@ var activities = (function () {
currentFilter = 'all'

try{
currentFilter = localStorage['activityFilter'] || 'all'
currentFilter = ed.activityFilter || localStorage['activityFilter'] || 'all'
}
catch (e){
}
Expand Down
68 changes: 59 additions & 9 deletions components/fastsend/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var fastsend = (function(){

var actions = {

makeTransaction : function(list, message, clbk){
makeTransaction : function(list, message, clbk, nr){

var transaction = new Transaction()

Expand All @@ -30,7 +30,7 @@ var fastsend = (function(){

self.app.platform.actions.addActionAndSendIfCan(transaction, 1, null, {
calculatedFee : 0,
rejectIfError : true
rejectIfError : nr ? false : true
}).then((action) => {

text.value = ''
Expand Down Expand Up @@ -145,15 +145,65 @@ var fastsend = (function(){

var value = _.reduce(list, function(m,v){return m + v.value}, 0).toFixed(8)

var count = 100

if (count < 2) count = 2

if (list.length && value){
new dialog({
html : 'Do you really want to send ' + self.app.platform.mp.coin(value) + ' to ' + list.length + ' addresses',
class : 'one',

success : function(){
actions.makeTransaction(list, message.value)
}
})
if(list.length < count){
new dialog({
html : 'Do you really want to send ' + self.app.platform.mp.coin(value) + ' to ' + list.length + ' addresses',
class : 'one',

success : function(){
actions.makeTransaction(list, message.value, function(){

})
}
})
}

else{

var llist = _.toArray(_.groupBy(list, (l, index) => {
return Math.floor(index / count)
}))

console.log('llist', llist)

new dialog({
html : '!IMORTANT! There will be <b>'+llist.length+'</b> transactions. Do you really want to send ' + self.app.platform.mp.coin(value) + ' to ' + list.length + ' addresses',
class : 'one',

success : function(){
_.each(llist, (list) => {

actions.makeTransaction(list, message.value, function(){

})

})

setTimeout(() => {
self.nav.api.go({
open : true,
href : 'activities',
inWnd : true,
history : true,
essenseData : {
activityFilter : "pending"
}
})
}, 300)



}
})
}


}
else{
sitemessage('Empty list')
Expand Down
2 changes: 1 addition & 1 deletion css/fontawesome/css/all.min.css

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"name": "pocketnet",
"project": "Bastyon",

"version": "0.9.132",
"version": "0.9.133",
"versionsuffix": "1",
"cordovaversion": "1.8.132",
"cordovaversioncode": "1801321",
"cordovaversion": "1.8.133",
"cordovaversioncode": "1801331",

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