Merge branch 'staging' into ooapi-dl

This commit is contained in:
yflory 2025-02-11 15:47:08 +01:00
commit b6327a9926
2 changed files with 3 additions and 0 deletions

View File

@ -104,6 +104,7 @@ define([
msg = JSON.parse(msg);
} catch (e) {
console.error(e);
return; // Don't show "undefined" messages
}
msg.time = time;
if (author) { msg.author = author; }
@ -232,6 +233,7 @@ define([
var anonRpc = Util.find(ctx, [ 'store', 'anon_rpc' ]);
if (!mailbox) { return void cb('E_NOT_READY'); }
if (!anonRpc) { return void cb("anonymous rpc session not ready"); }
if (!data?.ticket) { return void cb('E_NO_DATA'); }
var theirPublic, myCurve, notifKey;
var time;
nThen((waitFor) => {

View File

@ -162,6 +162,7 @@ define([
var makeForm = function (ctx, opts, cb) {
let { oldData, recorded, title, hideNotice } = opts || {};
var button;
cb = Util.once(cb);
if (typeof(cb) === "function") {
button = h('button.btn.btn-primary.cp-support-list-send', Messages.contacts_send);