fix merge conflict

vue-app/src/App.vue

@@ -62,13 +62,14 @@ import {
   LOAD_BRIGHT_ID,
 } from '@/store/action-types'
 import { SET_CURRENT_USER } from '@/store/mutation-types'
+import { operator } from '@/api/core'
 
 @Component({
   name: 'clr.fund',
   metaInfo() {
     return {
       title: this.$route.meta.title,
-      titleTemplate: 'clr.fund - %s',
+      titleTemplate: `${operator} - %s`,
       meta: [
         {
           name: 'git-commit',

vue-app/src/api/core.ts

@@ -44,14 +44,14 @@ if (
 }
 export const recipientRegistryPolicy =
   process.env.VUE_APP_RECIPIENT_REGISTRY_POLICY
-export const operator: string = process.env.VUE_APP_OPERATOR || 'Clr.fund team'
+export const operator: string = process.env.VUE_APP_OPERATOR || 'Clr.fund'
 export const extraRounds: string[] = process.env.VUE_APP_EXTRA_ROUNDS
   ? process.env.VUE_APP_EXTRA_ROUNDS.split(',')
   : []
 
 export const SUBGRAPH_ENDPOINT =
   process.env.VUE_APP_SUBGRAPH_URL ||
-  'https://api.thegraph.com/subgraphs/name/daodesigner/clrfund'
+  'https://api.thegraph.com/subgraphs/name/clrfund/clrfund'
 
 // application theme
 export enum ThemeMode {

vue-app/src/api/user.ts

@@ -3,11 +3,11 @@ import { BigNumber, Contract } from 'ethers'
 import { Web3Provider } from '@ethersproject/providers'
 
 import { UserRegistry, ERC20 } from './abi'
-import { factory, ipfsGatewayUrl, provider } from './core'
+import { factory, ipfsGatewayUrl, provider, operator } from './core'
 import { BrightId } from './bright-id'
 
 //TODO: update anywhere this is called to take factory address as a parameter, default to env. variable
-export const LOGIN_MESSAGE = `Welcome to clr.fund!
+export const LOGIN_MESSAGE = `Welcome to ${operator}!
 
 To get logged in, sign this message to prove you have access to this wallet. This does not cost any ether.
 

vue-app/src/components/CriteriaModal.vue

@@ -45,18 +45,13 @@ import Vue from 'vue'
 import Component from 'vue-class-component'
 import Links from '@/components/Links.vue'
 
-import { operator } from '@/api/core'
 import { criteria, Criterion } from '@/plugins/round/criteria'
 
 @Component({ components: { Links } })
 export default class CriteriaModal extends Vue {
   get criteria(): Criterion[] {
     return criteria
   }
-
-  get operator(): string {
-    return operator
-  }
 }
 </script>
 

vue-app/src/components/NavBar.vue

@@ -1,7 +1,11 @@
 <template>
   <nav id="nav-bar">
     <links to="/">
-      <img class="clr-logo" alt="clr fund" src="@/assets/clr.svg" />
+      <img
+        class="clr-logo"
+        :alt="$store.getters.operator"
+        src="@/assets/clr.svg"
+      />
     </links>
     <div class="btn-row">
       <a

vue-app/src/components/RoundInformation.vue

@@ -7,7 +7,7 @@
       <template v-if="roundInfo">
         <div class="round">
           <div class="round-title-bar">
-            <h2 class="round-title">CLR.fund</h2>
+            <h2 class="round-title">{{ $store.getters.operator }}</h2>
             <v-popover class="verified-container">
               <div class="verified">
                 <img src="@/assets/verified.svg" />

vue-app/src/store/getters.ts

@@ -4,7 +4,7 @@ import { DateTime } from 'luxon'
 
 // API
 import { CartItem, Contributor } from '@/api/contributions'
-import { recipientRegistryType } from '@/api/core'
+import { recipientRegistryType, operator } from '@/api/core'
 import { RoundInfo, RoundStatus } from '@/api/round'
 import { Tally } from '@/api/tally'
 import { User } from '@/api/user'
@@ -251,6 +251,9 @@ const getters = {
       const currentRoundAddress = state.currentRoundAddress || ''
       return isSameAddress(roundAddress, currentRoundAddress)
     },
+  operator: (): string => {
+    return operator
+  },
 }
 
 export default getters

vue-app/src/views/AboutDecentralization.vue

@@ -3,7 +3,7 @@
     <h1 class="content-heading">Decentralization in Clr.fund</h1>
     <h2>What is Decentralization?</h2>
     <p>
-      When we say something is "decentralized" in clr.fund and in web3 broadly,
+      When we say something is "decentralized" in clr.fund, and in web3 broadly,
       we mean that no single person, company, or other entity is solely
       responsible for running or maintaining it. Instead, a decentralized system
       is run or maintained by a large group of independent entities, coordinated

vue-app/src/views/AboutLayer2.vue

@@ -70,7 +70,8 @@
       <h2>{{ chain.label }}</h2>
       <p>
         There are many variations on the layer 2 rollup approach. This current
-        clr.fund round uses {{ chain.label }}, an "optimistic"-style rollup.
+        {{ $store.getters.operator }} round uses {{ chain.label }}, an
+        "optimistic"-style rollup.
         <links to="https://developer.offchainlabs.com/docs/rollup_basics"
           >Learn more in the {{ chain.label }} docs</links
         >.

vue-app/src/views/Landing.vue

@@ -65,8 +65,8 @@
           <h2>How it works</h2>
           <ol>
             <li>
-              The {{ operator }}, clr.fund and other donors send funds to the
-              matching pool smart contract.
+              The {{ $store.getters.operator }} and other donors send funds to
+              the matching pool smart contract.
             </li>
             <li>
               The round begins and you can donate to your favorite projects.
@@ -183,7 +183,6 @@ import Vue from 'vue'
 import Component from 'vue-class-component'
 import { DateTime } from 'luxon'
 
-import { operator } from '@/api/core'
 import { chain } from '@/api/core'
 import { ChainInfo } from '@/plugins/Web3/constants/chains'
 import RoundStatusBanner from '@/components/RoundStatusBanner.vue'
@@ -199,10 +198,6 @@ export default class Landing extends Vue {
     return this.$store.state.currentRound?.signUpDeadline
   }
 
-  get operator(): string {
-    return operator
-  }
-
   scrollToHowItWorks() {
     document
       .getElementById('section-how-it-works')