diff --git a/app/assets/v2/css/town_square.css b/app/assets/v2/css/town_square.css index 13127223691..5ac342eff37 100644 --- a/app/assets/v2/css/town_square.css +++ b/app/assets/v2/css/town_square.css @@ -1343,6 +1343,46 @@ body.green.offer_view .announce { color: white; } +.dark-mode .modal-content{ + background: var(--bg-shade-0); +} + +.dark-mode .vs__dropdown-menu { + background: var(--bg-shade-1); + color: var(--default-text-color); +} + +.dark-mode .modal-content .btn-radio, +.dark-mode .modal-content .close, +.dark-mode .vs__search, +.dark-mode .vs__selected, +.dark-mode .vs__dropdown-option, +.dark-mode .vs__search:focus { + color: var(--default-text-color); +} +.dark-mode .vs__dropdown-toggle { + border-color: var(--default-text-color); +} + +.dark-mode .vs__clear, +.dark-mode .vs__open-indicator { + fill: var(--default-text-color); +} + +.dark-mode .modal-content .btn-radio:hover { + color: var(--default-text-color); +} + +.dark-mode .display-light { + display: none; +} +.display-dark { + display: none; +} +.dark-mode .display-dark { + display: block; +} + .tag-list .tag-list__item { background: #E8F0FA; padding: 4px; diff --git a/app/assets/v2/js/cart.js b/app/assets/v2/js/cart.js index 7185ecf3bed..3b0cc40e082 100644 --- a/app/assets/v2/js/cart.js +++ b/app/assets/v2/js/cart.js @@ -2561,7 +2561,19 @@ Vue.component('grants-cart', { }); // Read array of grants in cart from localStorage - this.grantData = CartData.loadCart(); + const grantData = CartData.loadCart(); + + // Make sure none have empty currencies, and if they do default to 0.001 ETH. This is done + // to prevent the cart from getting stuck loading if a currency is empty + grantData.forEach((grant, index) => { + if (!grant.grant_donation_currency) { + grantData[index].grant_donation_currency = 'ETH'; + grantData[index].grant_donation_amount = '0.001'; + } + }); + CartData.setCart(grantData); + this.grantData = grantData; + // Initialize array of empty comments this.comments = this.grantData.map(grant => undefined); diff --git a/app/assets/v2/js/onboard.js b/app/assets/v2/js/onboard.js index 940ef30a4cd..bd1912c6978 100644 --- a/app/assets/v2/js/onboard.js +++ b/app/assets/v2/js/onboard.js @@ -107,10 +107,13 @@ if (document.getElementById('gc-onboard')) { } this.profileWidget(); this.$refs['onboard-modal'].closeModal(); + if (typeof ga !== 'undefined') { + ga('send', 'event', 'Saved profile onboard', 'click', 'Person'); + } }).catch((err) => { console.log(err); - _alert('Unable to create a bounty. Please try again later', 'error'); + _alert('Unable to save your profile. Please login again', 'error'); }); }, fetchOnboardData(profileHandle) { diff --git a/app/dashboard/templates/dashboard/index-vue.html b/app/dashboard/templates/dashboard/index-vue.html index 35190a4d60a..24dd9520efb 100644 --- a/app/dashboard/templates/dashboard/index-vue.html +++ b/app/dashboard/templates/dashboard/index-vue.html @@ -622,7 +622,7 @@
Invite [[numUsers]] Users to the Bounty
- +