diff --git a/assets/javascripts/discourse/components/karma-stats.js b/assets/javascripts/discourse/components/karma-stats.js index 4ef21bd..631039a 100644 --- a/assets/javascripts/discourse/components/karma-stats.js +++ b/assets/javascripts/discourse/components/karma-stats.js @@ -43,7 +43,7 @@ export default Component.extend({ if (!daoName) { return }; if (!this.availableDaos.find(d => d.name === daoName)) { return }; set(this, 'daoName', daoName); - window.selectedDao = daoName?.toLowerCase(); + window.selectedDao = daoName; this.fetchProfile(); }, @@ -65,6 +65,4 @@ export default Component.extend({ profile?.username === this.currentUser?.username ); }, - - }); diff --git a/assets/javascripts/discourse/components/proposal-banner.js b/assets/javascripts/discourse/components/proposal-banner.js index 1749fbe..f394303 100644 --- a/assets/javascripts/discourse/components/proposal-banner.js +++ b/assets/javascripts/discourse/components/proposal-banner.js @@ -24,6 +24,8 @@ export default Component.extend({ daoName: "", + availableDaos: [], + logo: computed(function () { return this.siteSettings.Custom_banner_icon_url || this.siteSettings.logo; }), @@ -31,6 +33,18 @@ export default Component.extend({ init() { this._super(...arguments); this.daoName = window.selectedDao; + set(this, 'availableDaos', this.siteSettings.DAO_names?.split(",").map( + name => ({ name, select: () => this.selectDao(name) }))); + }, + + @action + selectDao(daoName) { + if (!daoName) { return }; + if (!this.availableDaos.find(d => d.name === daoName)) { return }; + set(this, 'daoName', daoName); + window.selectedDao = daoName; + set(this, 'fetched', false); + this.fetchDataProposals(); }, @action @@ -50,10 +64,8 @@ export default Component.extend({ daoIds, } = this.siteSettings; // Fix this workaround when voting history is refactored into components - const graphqlIds = (window.daoIds = - window.daoIds ?? - daoIds ?? - (await fetchDaoSnapshotAndOnChainIds(this.daoName))); + const graphqlIds = + (await fetchDaoSnapshotAndOnChainIds(this.daoName)); let onChain = []; if ( diff --git a/assets/javascripts/discourse/templates/components/proposal-banner.hbs b/assets/javascripts/discourse/templates/components/proposal-banner.hbs index c5a2619..716c25a 100644 --- a/assets/javascripts/discourse/templates/components/proposal-banner.hbs +++ b/assets/javascripts/discourse/templates/components/proposal-banner.hbs @@ -1,4 +1,19 @@ {{#if (and siteSettings.Show_proposal_banner shouldShow)}} + {{#if availableDaos.length}} +
+ {{#each availableDaos as |dao|}} + {{#if (eq daoName dao.name)}} +
+ {{dao.name}} +
+ {{else}} +
+ {{dao.name}} +
+ {{/if}} + {{/each}} +
+ {{/if}} {{#if fetched}} {{#if proposals.length}}
@@ -12,8 +27,8 @@