diff --git a/www/common/common-icons.js b/www/common/common-icons.js index 74865b4f9..4c2f879be 100644 --- a/www/common/common-icons.js +++ b/www/common/common-icons.js @@ -85,7 +85,7 @@ define([ "share": "share-2", "download": "hard-drive-download", "destroy": "shredder", - "donate": "hand-coins", + "donate": "hand-heart", "send": "send", "cloud-upload": "cloud-upload", "print": "printer", diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 4f83fccd5..3bf9275f1 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -3399,9 +3399,7 @@ define([ Feedback.send('CROWDFUNDING_NEVER'); }; - var msgEl = h('div.msg'); - UI.setHTML(msgEl, Messages.crowdfunding_popup_text); - var content = h('div', [msgEl]); + var content = Messages.crowdfunding_popup_text; var buttons = [ { name: Messages.crowdfunding_popup_no, @@ -3412,6 +3410,17 @@ define([ } } ]; + if (!Config.removeDonateButton) { + buttons.push({ + name: Messages.crowdfunding_button2, + className: 'primary', + iconClass: 'crowdfunding-donate', + onClick: function () { + common.openURL(priv.accounts.donateURL); + Feedback.send('CROWDFUNDING_YES'); + } + }); + } if (Config.accounts_api && priv.accountName) { buttons.push({ name: Messages.features_f_subscribe, @@ -3423,17 +3432,6 @@ define([ } }); } - if (!Config.removeDonateButton) { - buttons.push({ - name: 'OpenCollective', - className: 'primary', - iconClass: 'donate', - onClick: function () { - common.openURL(priv.accounts.donateURL); - Feedback.send('CROWDFUNDING_YES'); - } - }); - } buttons.push({ name: Messages.dontShowAgain, className: 'cancel left', @@ -3443,8 +3441,8 @@ define([ } }); var modal = UI.dialog.customModal(content, { + force: true, scrollable: true, - rawContent: true, buttons: buttons }); UI.openCustomModal(modal, { wide: true }); diff --git a/www/common/sframe-common-outer.js b/www/common/sframe-common-outer.js index d28ee89a4..c4fc2e3f0 100644 --- a/www/common/sframe-common-outer.js +++ b/www/common/sframe-common-outer.js @@ -1024,9 +1024,9 @@ define([ // Additional actions required after each shown banner var CROWDFUNDING_ACTIONS_INTERVAL = 15; // Quota usage threshold for quota-based banner display - var CROWDFUNDING_MIN_QUOTA_MB = 10; - // Cooldown between banner displays based on last shown timestamp - var CROWDFUNDING_ONE_DAY_MS = 24 * 60 * 60 * 1000; + var CROWDFUNDING_MIN_QUOTA_MB = 50; + // Cooldown between banner displays based on last shown timestamp in milliseconds + var CROWDFUNDING_COOLDOWN_MS = 24 * 60 * 60 * 1000; var crowdfundingGetLS = function () { var get = function (suffix) { var k = CROWDFUNDING_PREFIX + suffix; @@ -1087,7 +1087,7 @@ define([ var lastShownAtTime = metrics.lastShownAtTime || 0; var now = Date.now(); var nextThreshold = lastShownAtCount === 0 ? CROWDFUNDING_MIN_ACTIONS : lastShownAtCount + CROWDFUNDING_ACTIONS_INTERVAL; - var enoughTimePassed = lastShownAtTime === 0 || (now - lastShownAtTime >= CROWDFUNDING_ONE_DAY_MS); + var enoughTimePassed = lastShownAtTime === 0 || (now - lastShownAtTime >= CROWDFUNDING_COOLDOWN_MS); var showFromActions = actionCount >= nextThreshold && enoughTimePassed; if (showFromActions) { return cb({