fix button registration disabled

Conto Comunitario... passo 2

src/server/locales/it.json

@@ -57,6 +57,8 @@
 	"CIRCUIT_EXIT_USER_TO_ME": "❌ Sei uscito dal Circuito %s",
 	"CIRCUIT_REMOVED_TO_ME": "❌ Sei stato rimosso dal Circuito %s (da parte di %s)",
 	"CIRCUIT_SENDCOINSREQ": "%s ti sta inviando <strong>%s %s</strong>.",
+	"CIRCUIT_SENDCOINSREQ_GROUP": "%s sta inviando <strong>%s %s</strong> al Conto Comunitario '%s'.",
+	"CIRCUIT_SENDCOINSREQ_FROM_GROUP": "il conto comunitario '%s' sta inviando <strong>%s %s</strong> a %s.",
 	"CIRCUIT_SENDCOINSREQ_TO_ME": "Stai inviando <strong>%s %s</strong> a %s. \nIl destinatario deve accettare la transazione.",
 	"ID_CIRCUIT_COINS_ACCEPTED": "<strong>%s %s</strong> accettati da %s.",
 	"SALDO_UPDATE": "[Saldo <strong>%s %s</strong>]",

src/server/models/sendnotif.js

@@ -349,8 +349,16 @@ sendNotifSchema.statics.getDescrAndLinkByRecNotif = async function (recnotif) {
         }
         tag = 'removeadmincircuit';
       } else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ) {
+        if (recnotif.paramsObj.extrarec.groupdest) {
+          newdescr = i18n.__('CIRCUIT_SENDCOINSREQ_GROUP', tools.getAhref(recnotif.paramsObj.username_action, await tools.getLinkUserTelegram(recnotif.idapp, recnotif.paramsObj.username_action)), recnotif.paramsObj.extrarec.qty.toString(),
+            recnotif.paramsObj.extrarec.symbol, recnotif.paramsObj.extrarec.groupdest);
+        } else if (recnotif.paramsObj.extrarec.grouporig) {
+          newdescr = i18n.__('CIRCUIT_SENDCOINSREQ_FROM_GROUP', recnotif.paramsObj.extrarec.grouporig, recnotif.paramsObj.extrarec.qty.toString(), recnotif.paramsObj.extrarec.symbol, recnotif.paramsObj.usernameDest);
+        } else {
           newdescr = i18n.__('CIRCUIT_SENDCOINSREQ', tools.getAhref(recnotif.paramsObj.username_action, await tools.getLinkUserTelegram(recnotif.idapp, recnotif.paramsObj.username_action)), recnotif.paramsObj.extrarec.qty.toString(),
             recnotif.paramsObj.extrarec.symbol);
+        }
+
         tag = 'sendcoin';
         recnotif.openUrl = '/circuit/' + recnotif.paramsObj.path; //++Todo: dove lo mando ?
       } else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_SENDCOINSREQ_SENT) {
@@ -367,9 +375,10 @@ sendNotifSchema.statics.getDescrAndLinkByRecNotif = async function (recnotif) {
           );
         tag = 'sendcoin';
       } else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_COINS_ACCEPTED_SENT) {
+        const destinatario = recnotif.paramsObj.extrarec.dest ? recnotif.paramsObj.extrarec.dest : recnotif.paramsObj.extrarec.groupdest;
+        
         newdescr = i18n.__('ID_CIRCUIT_COINS_ACCEPTED_TO_ME', recnotif.paramsObj.extrarec.qty.toString(),
-          recnotif.paramsObj.extrarec.symbol,
+          recnotif.paramsObj.extrarec.symbol, destinatario) + `\n` + i18n.__('SALDO_UPDATE', recnotif.paramsObj.extrarec.saldoOrig,
-          recnotif.paramsObj.extrarec.dest) + `\n` + i18n.__('SALDO_UPDATE', recnotif.paramsObj.extrarec.saldoOrig,
             recnotif.paramsObj.extrarec.symbol);
         tag = 'sendcoin';
       } else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_COINS_REFUSED) {
@@ -377,9 +386,11 @@ sendNotifSchema.statics.getDescrAndLinkByRecNotif = async function (recnotif) {
           recnotif.paramsObj.username_action);
         tag = 'sendcoin';
       } else if (recnotif.typeid === shared_consts.TypeNotifs.ID_CIRCUIT_COINS_REFUSED_SENT) {
+        const destinatario = recnotif.paramsObj.extrarec.dest ? recnotif.paramsObj.extrarec.dest : recnotif.paramsObj.extrarec.groupdest;
+        
         newdescr = i18n.__('ID_CIRCUIT_COINS_REFUSED_TO_ME', recnotif.paramsObj.extrarec.qty.toString(), recnotif.paramsObj.extrarec.symbol,
-          recnotif.paramsObj.extrarec.dest);
+        destinatario);
-        tag = 'sendcoin'; ac
+        tag = 'sendcoin';
       }
     }
 

src/server/models/user.js

@@ -4542,7 +4542,9 @@ UserSchema.statics.addExtraInfo = async function (idapp, recUser, recUserSave) {
     for (const group of listManageGroups) {
       const myaccounts = await Account.getGroupAccounts(idapp, group.groupname);
       if (myaccounts && myaccounts.length > 0)
-        group.account = myaccounts[0]
+        group.account = myaccounts[0];
+      else
+        group.account = null;
     }
 
     recUser.profile = { ...recUser.profile, ...circuitobj, useraccounts };