From 7746bbbde423a56eb94888b4cf1d587b9b2c1cf7 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 20 Jul 2022 09:59:11 -0400
Subject: [PATCH 01/36] refactoring

---
 vue-app/src/views/MetadataList.vue | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/vue-app/src/views/MetadataList.vue b/vue-app/src/views/MetadataList.vue
index 55aa283c1..3421e45c6 100644
--- a/vue-app/src/views/MetadataList.vue
+++ b/vue-app/src/views/MetadataList.vue
@@ -87,16 +87,16 @@ export default class MetadataList extends Vue {
     })
 
     if (this.excludeRecipients) {
-      const exclusion = await this.loadExclusion()
+      const recipients = await this.getRecipients()
       this.filteredMetadata = metadata.filter(
-        ({ id }) => !(id && exclusion.has(id))
+        ({ id }) => !(id && recipients.has(id))
       )
     } else {
       this.filteredMetadata = metadata
     }
   }
 
-  private async loadExclusion(): Promise<Set<string>> {
+  private async getRecipients(): Promise<Set<string>> {
     const roundAddress = await getCurrentRound()
     const recipientRegistryAddress = await getRecipientRegistryAddress(
       roundAddress
@@ -113,8 +113,15 @@ export default class MetadataList extends Vue {
 
     return new Set(
       recipients
-        .map(({ recipientMetadataId, verified, requestType }) => {
-          let id = recipientMetadataId || ''
+        .map(({ recipientMetadata, verified, requestType }) => {
+          let metadata: Metadata
+          try {
+            metadata = JSON.parse(recipientMetadata || '')
+          } catch {
+            metadata = new Metadata({})
+          }
+
+          let id = metadata.id || ''
           if (Number(requestType) === RequestTypeCode.Removal && verified) {
             // show metadata if it's not longer a recipient so it can be added again
             id = ''

From 6e06f87d28c3673ab1000067043356053cb54aff Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 20 Jul 2022 10:00:41 -0400
Subject: [PATCH 02/36] refactor recipient submission ui

---
 vue-app/src/views/MetadataForm.vue | 72 +++++++++++++++++++++++++++---
 1 file changed, 66 insertions(+), 6 deletions(-)

diff --git a/vue-app/src/views/MetadataForm.vue b/vue-app/src/views/MetadataForm.vue
index 02997e62c..86b0e8d3d 100644
--- a/vue-app/src/views/MetadataForm.vue
+++ b/vue-app/src/views/MetadataForm.vue
@@ -525,6 +525,10 @@
                 :form="form"
                 :onSuccess="onSuccess"
                 :onSubmit="onSubmit"
+                :txHash="txHash"
+                :isWaiting="isWaiting"
+                :progress="progress"
+                :txError="txError"
               />
             </div>
           </div>
@@ -569,12 +573,14 @@ import MetadataViewer from '@/views/MetadataViewer.vue'
 import Dropdown from '@/components/Dropdown.vue'
 import { Metadata, MetadataFormData } from '@/api/metadata'
 import { LinkInfo } from '@/api/types'
-import { Prop } from 'vue-property-decorator'
+import { Prop, Watch } from 'vue-property-decorator'
+import { chain, TransactionProgress } from '@/api/core'
 
 import { SET_METADATA } from '@/store/mutation-types'
 import { Project, projectExists } from '@/api/projects'
 import { CHAIN_INFO } from '@/plugins/Web3/constants/chains'
 import { ContractReceipt, ContractTransaction } from 'ethers'
+import { waitForTransaction } from '@/utils/contracts'
 
 type RecievingAddress = {
   network: string
@@ -667,6 +673,11 @@ export default class MetadataForm extends mixins(validationMixin) {
   selectedNetwork = ''
   receipt: { hash: string; chainId: number; id: string } | null = null
 
+  progress: TransactionProgress | null = null
+  isWaiting = false
+  txError = ''
+  txHash = ''
+
   async created() {
     const steps = [
       'project',
@@ -722,6 +733,11 @@ export default class MetadataForm extends mixins(validationMixin) {
     return this.networks.sort()
   }
 
+  @Watch('$web3.user')
+  resetError(): void {
+    this.txError = ''
+  }
+
   handleDropdownClick(selection: string): void {
     this.selectedNetwork = selection
   }
@@ -853,15 +869,59 @@ export default class MetadataForm extends mixins(validationMixin) {
     )
   }
 
-  handleStepNav(step): void {
+  updateProgress(current: number, last: number): void {
+    this.progress = { current, last }
+  }
+
+  async addMetadata(): Promise<void> {
+    const { currentUser } = this.$store.state
+
+    // Reset errors when submitting
+    this.txError = ''
+    if (currentUser) {
+      const { walletProvider } = currentUser
+      try {
+        this.isWaiting = true
+        const transaction = this.onSubmit(this.form, walletProvider)
+        const receipt = await waitForTransaction(
+          transaction,
+          (hash) => (this.txHash = hash)
+        )
+
+        await Metadata.waitForBlock(
+          receipt.blockNumber,
+          chain.name,
+          0,
+          this.updateProgress
+        )
+        this.isWaiting = false
+
+        if (this.onSuccess) {
+          this.onSuccess(receipt, this.$web3.chainId)
+        }
+      } catch (error) {
+        this.isWaiting = false
+        this.txError = error.message
+        return
+      }
+    }
+  }
+
+  handleStepNav(step: number, updateFurthest?: boolean): void {
     // If isNavDisabled => disable quick-links
     if (this.isNavDisabled) return
 
     // Save form data
-    this.saveFormData()
-    // Navigate
-    if (this.isStepUnlocked(step)) {
-      this.gotoStep(this.steps[step])
+    this.saveFormData(updateFurthest)
+
+    if (step >= this.steps.length) {
+      // submit metadata
+      this.addMetadata()
+    } else {
+      // Navigate
+      if (this.isStepUnlocked(step)) {
+        this.gotoStep(this.steps[step])
+      }
     }
   }
 

From 5571c1c2ab35812fb3fb2c289d8a5019c91b09e3 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 20 Jul 2022 10:02:38 -0400
Subject: [PATCH 03/36] add email field on the join form

---
 vue-app/src/views/JoinUniversal.vue | 225 ++++++++++++++++++++++++----
 1 file changed, 194 insertions(+), 31 deletions(-)

diff --git a/vue-app/src/views/JoinUniversal.vue b/vue-app/src/views/JoinUniversal.vue
index a143573f1..247408838 100644
--- a/vue-app/src/views/JoinUniversal.vue
+++ b/vue-app/src/views/JoinUniversal.vue
@@ -22,16 +22,48 @@
       <loader v-if="loading" />
       <div v-if="!loading" class="form-area">
         <div class="application">
-          <div v-if="currentStep === 0">
+          <div v-if="steps[currentStep] === 'metadata'">
             <metadata-list
               :onClick="handleMetadataSelected"
               :excludeRecipients="true"
             ></metadata-list>
           </div>
-          <div v-if="currentStep === 1" id="summary">
+          <div v-if="steps[currentStep] === 'summary'" id="summary">
             <metadata-viewer :metadata="metadata"></metadata-viewer>
           </div>
-          <div v-if="currentStep === 2">
+          <div v-if="steps[currentStep] === 'email'">
+            <div class="inputs">
+              <div class="heading">
+                <h2>Contact email</h2>
+              </div>
+              <p class="input-description">
+                For important updates about your project and the funding round.
+              </p>
+              <input
+                id="team-email"
+                type="email"
+                placeholder="example: doge@goodboi.com"
+                v-model.lazy="$v.metadata.email.$model"
+                :class="{
+                  input: true,
+                  invalid: $v.metadata.email.$error,
+                }"
+              />
+              <p class="input-notice">
+                We won't display this publicly or add it to the on-chain
+                registry.
+              </p>
+              <p
+                :class="{
+                  error: true,
+                  hidden: !$v.metadata.email.$error,
+                }"
+              >
+                This doesn't look like an email.
+              </p>
+            </div>
+          </div>
+          <div v-if="steps[currentStep] === 'submit'">
             <h2 class="step-title">Submit project</h2>
             <p>
               This is a blockchain transaction that will add your project
@@ -39,8 +71,9 @@
             </p>
             <div class="inputs">
               <recipient-submission-widget
-                cta="Submit project"
-                pending="Sending deposit..."
+                :isWaiting="isWaiting"
+                :txHash="txHash"
+                :txError="txError"
               />
             </div>
           </div>
@@ -62,8 +95,9 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue'
-import Component from 'vue-class-component'
+import Component, { mixins } from 'vue-class-component'
+import { validationMixin } from 'vuelidate'
+import { required, email } from 'vuelidate/lib/validators'
 import LayoutSteps from '@/components/LayoutSteps.vue'
 import ProgressBar from '@/components/ProgressBar.vue'
 import FormNavigation from '@/components/FormNavigation.vue'
@@ -74,10 +108,16 @@ import MetadataViewer from '@/views/MetadataViewer.vue'
 import Links from '@/components/Links.vue'
 import Loader from '@/components/Loader.vue'
 
-import { SET_RECIPIENT_DATA } from '@/store/mutation-types'
+import {
+  SET_RECIPIENT_DATA,
+  RESET_RECIPIENT_DATA,
+} from '@/store/mutation-types'
 
 import { Project } from '@/api/projects'
 import { Metadata } from '@/api/metadata'
+import { DateTime } from 'luxon'
+import { addRecipient } from '@/api/recipient-registry-universal'
+import { waitForTransaction } from '@/utils/contracts'
 
 @Component({
   components: {
@@ -91,19 +131,34 @@ import { Metadata } from '@/api/metadata'
     Links,
     Loader,
   },
+  validations: {
+    metadata: {
+      email: {
+        email,
+        required,
+      },
+    },
+  },
 })
-export default class JoinView extends Vue {
+export default class JoinView extends mixins(validationMixin) {
   currentStep = 0
-  steps = ['metadata', 'summary', 'submit']
-  stepNames = ['Select a project metadata', 'Review', 'Submit']
+  steps = this.isEmailRequired
+    ? ['metadata', 'summary', 'email', 'submit']
+    : ['metadata', 'summary', 'submit']
+  stepNames = this.isEmailRequired
+    ? ['Select a project metadata', 'Review', 'Email', 'Submit']
+    : ['Select a project metadata', 'Review', 'Submit']
   metadata = new Metadata({})
   loading = true
+  isWaiting = false
+  txHash = ''
+  txError = ''
 
   async created() {
     const currentStep = this.steps.indexOf(this.$route.params.step)
     this.currentStep = currentStep
 
-    // redirect to /join/ if step doesn't exist
+    // redirect to /join if step doesn't exist
     if (this.currentStep < 0) {
       this.$router.push({ name: 'join' })
     }
@@ -134,10 +189,14 @@ export default class JoinView extends Vue {
 
   saveFormData(): void {
     this.$store.commit(SET_RECIPIENT_DATA, {
-      updatedData: this.metadata.toFormData(),
+      updatedData: this.metadata,
     })
   }
 
+  get isEmailRequired(): boolean {
+    return !!process.env.VUE_APP_GOOGLE_SPREADSHEET_ID
+  }
+
   get isNavDisabled(): boolean {
     return (
       !this.isStepValid(this.currentStep) &&
@@ -160,6 +219,12 @@ export default class JoinView extends Vue {
       furthest++
       if (this.isMetadataValid) {
         furthest++
+        if (
+          process.env.VUE_APP_GOOGLE_SPREADSHEET_ID &&
+          !this.$v.metadata.email?.$invalid
+        ) {
+          furthest++
+        }
       }
     }
     return furthest
@@ -174,21 +239,26 @@ export default class JoinView extends Vue {
     })
   }
 
-  handleStepNav(step): void {
+  async handleStepNav(step: number): Promise<void> {
     // If isNavDisabled => disable quick-links
     if (this.isNavDisabled) return
     // Save form data
     this.saveFormData()
-    // Navigate
-    if (this.isStepUnlocked(step)) {
-      const id = this.metadata.id || ''
-      this.$router.push({
-        name: 'join-step',
-        params: {
-          step: this.steps[step],
-          id,
-        },
-      })
+
+    if (step >= this.steps.length) {
+      await this.addRecipient()
+    } else {
+      // Navigate
+      if (this.isStepUnlocked(step)) {
+        const id = this.metadata.id || ''
+        this.$router.push({
+          name: 'join-step',
+          params: {
+            step: this.steps[step],
+            id,
+          },
+        })
+      }
     }
   }
 
@@ -196,14 +266,18 @@ export default class JoinView extends Vue {
     const id = this.$route.params.id
 
     if (id) {
-      try {
-        const metadata = await Metadata.get(id)
-        if (metadata) {
-          this.metadata = metadata
-          this.saveFormData()
+      if (id === this.$store.state.recipient?.id) {
+        this.metadata = new Metadata(this.$store.state.recipient)
+      } else {
+        try {
+          const metadata = await Metadata.get(id)
+          if (metadata) {
+            this.metadata = metadata
+            this.saveFormData()
+          }
+        } catch (err) {
+          // TODO display the error
         }
-      } catch (err) {
-        // TODO display the error
       }
     }
   }
@@ -211,6 +285,65 @@ export default class JoinView extends Vue {
   get projectInterface(): Project {
     return this.metadata.toProject()
   }
+
+  private async addRecipient() {
+    const {
+      currentRound,
+      currentUser,
+      recipient,
+      recipientRegistryAddress,
+      recipientRegistryInfo,
+    } = this.$store.state
+    this.isWaiting = true
+    // Reset errors when submitting
+    this.txError = ''
+    if (
+      recipientRegistryAddress &&
+      recipient &&
+      recipientRegistryInfo &&
+      currentUser
+    ) {
+      try {
+        if (currentRound && DateTime.now() >= currentRound.votingDeadline) {
+          this.$router.push({
+            name: 'join',
+          })
+          throw { message: 'round over' }
+        }
+        await waitForTransaction(
+          addRecipient(
+            recipientRegistryAddress,
+            new Metadata(recipient).toFormData(),
+            recipientRegistryInfo.deposit,
+            currentUser.walletProvider.getSigner()
+          ),
+          (hash) => (this.txHash = hash)
+        )
+        // Send application data to a Google Spreadsheet
+        if (process.env.VUE_APP_GOOGLE_SPREADSHEET_ID) {
+          await fetch('/.netlify/functions/recipient', {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+            },
+            body: JSON.stringify(recipient),
+          })
+        }
+        this.$store.commit(RESET_RECIPIENT_DATA)
+      } catch (error) {
+        this.isWaiting = false
+        this.txError = (error as any).message
+        return
+      }
+      this.isWaiting = false
+      this.$router.push({
+        name: 'project-added',
+        params: {
+          hash: this.txHash,
+        },
+      })
+    }
+  }
 }
 </script>
 
@@ -338,4 +471,34 @@ export default class JoinView extends Vue {
 .inputs {
   margin: 1.5rem 0;
 }
+
+.input {
+  border-radius: 16px;
+  border: 2px solid $button-color;
+  background-color: var(--bg-secondary-color);
+  margin: 0.5rem 0;
+  padding: 0.5rem 1rem;
+  font-size: 16px;
+  font-family: Inter;
+  font-weight: 400;
+  line-height: 24px;
+  letter-spacing: 0em;
+  width: 100%;
+  &:valid {
+    border: 2px solid $clr-green;
+  }
+  &:hover {
+    background: var(--bg-primary-color);
+    border: 2px solid $highlight-color;
+    box-shadow: 0px 4px 16px 0px 25, 22, 35, 0.4;
+  }
+  &:optional {
+    border: 2px solid $button-color;
+    background-color: var(--bg-secondary-color);
+  }
+}
+
+.input.invalid {
+  border: 2px solid var(--error-color);
+}
 </style>

From e2aae741c87411aec4eb3e0ddf2f039a5f276dbc Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 20 Jul 2022 10:04:26 -0400
Subject: [PATCH 04/36] update state on navigate next

---
 vue-app/src/views/JoinOptimistic.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vue-app/src/views/JoinOptimistic.vue b/vue-app/src/views/JoinOptimistic.vue
index d2eaa3ddb..c4df24a0d 100644
--- a/vue-app/src/views/JoinOptimistic.vue
+++ b/vue-app/src/views/JoinOptimistic.vue
@@ -974,11 +974,11 @@ export default class JoinView extends mixins(validationMixin) {
     )
   }
 
-  handleStepNav(step): void {
+  handleStepNav(step: number, updateFurthest?: boolean): void {
     // If isNavDisabled => disable quick-links
     if (this.isNavDisabled) return
     // Save form data
-    this.saveFormData()
+    this.saveFormData(updateFurthest)
     // Navigate
     if (this.isStepUnlocked(step)) {
       this.$router.push({

From e9a5ef4dbf5baef43c6cc2f83c851f023a397880 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 20 Jul 2022 10:04:53 -0400
Subject: [PATCH 05/36] fix chain short name

---
 vue-app/src/plugins/Web3/constants/chains.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vue-app/src/plugins/Web3/constants/chains.ts b/vue-app/src/plugins/Web3/constants/chains.ts
index 6e69784ab..7035a8041 100644
--- a/vue-app/src/plugins/Web3/constants/chains.ts
+++ b/vue-app/src/plugins/Web3/constants/chains.ts
@@ -47,8 +47,8 @@ export const CHAIN_INFO: ChainInfo = {
     explorer: 'https://goerli.etherscan.io',
     explorerLogo: 'etherscan.svg',
     explorerLabel: 'Etherscan',
-    shortName: 'rin',
-    name: 'rinkeby',
+    shortName: 'gor',
+    name: 'goerli',
   },
   [ChainId.HARDHAT]: {
     label: 'Arbitrum Hardhat',
@@ -60,7 +60,7 @@ export const CHAIN_INFO: ChainInfo = {
     explorerLabel: 'Arbiscan',
     rpcUrl: 'https://rinkeby.arbitrum.io/rpc',
     bridge: 'https://bridge.arbitrum.io',
-    shortName: 'got',
+    shortName: 'arb-rinkeby',
     name: 'arbitrum-rinkeby',
   },
   [ChainId.ARBITRUM_ONE]: {

From 445228519cc231613c25d4c95d8ba0de1ce4ec48 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 20 Jul 2022 10:05:20 -0400
Subject: [PATCH 06/36] format long error message

---
 vue-app/src/components/RecipientSubmissionWidget.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vue-app/src/components/RecipientSubmissionWidget.vue b/vue-app/src/components/RecipientSubmissionWidget.vue
index 31a767ae7..e9355d087 100644
--- a/vue-app/src/components/RecipientSubmissionWidget.vue
+++ b/vue-app/src/components/RecipientSubmissionWidget.vue
@@ -297,6 +297,8 @@ export default class RecipientSubmissionWidget extends Vue {
 
 .warning-text {
   font-size: 14px;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .warning-text,

From 1ae35ea7fe0f4fa062c18e066f29d2eb47def634 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 20 Jul 2022 10:06:30 -0400
Subject: [PATCH 07/36] refactor to work with new form navigation flow

---
 .../components/MetadataSubmissionWidget.vue   | 100 +++---------------
 1 file changed, 14 insertions(+), 86 deletions(-)

diff --git a/vue-app/src/components/MetadataSubmissionWidget.vue b/vue-app/src/components/MetadataSubmissionWidget.vue
index be2f179d7..d2e8dc871 100644
--- a/vue-app/src/components/MetadataSubmissionWidget.vue
+++ b/vue-app/src/components/MetadataSubmissionWidget.vue
@@ -1,36 +1,24 @@
 <template>
   <div class="tx-container">
-    <div>
-      <loader v-if="isLoading" />
-      <wallet-widget class="m2" v-if="!currentUser" />
-      <div v-if="currentUser">
+    <div v-if="currentUser">
+      <div>
         <div v-if="isWaiting" class="mt2">
           <div v-if="progress">
-            Waiting for block {{ progress.latest }} of {{ progress.total }}...
+            Waiting for block {{ progress.current }} of {{ progress.last }}...
           </div>
           <div v-else>Check your wallet for a prompt...</div>
         </div>
-        <div v-if="hasTxError || isTxRejected" class="warning-icon">⚠️</div>
+        <div v-if="hasTxError" class="warning-icon">⚠️</div>
         <div v-if="hasTxError" class="warning-text">
           Something failed: {{ txError }}<br />
           Check your wallet or {{ blockExplorerLabel }} for more info.
         </div>
-        <div v-if="isTxRejected" class="warning-text">
-          You rejected the transaction in your wallet
-        </div>
       </div>
-      <div class="connected" v-if="currentUser">
+      <div class="connected">
         <div class="cta">
-          <button
-            @click="handleSubmit"
-            class="btn-action"
-            :disabled="!canSubmit || isWaiting"
-          >
-            <div v-if="isWaiting">
-              <loader class="button-loader" />
-            </div>
-            <div v-else>Submit</div>
-          </button>
+          <div v-if="isWaiting">
+            <loader class="button-loader" />
+          </div>
         </div>
       </div>
     </div>
@@ -41,23 +29,16 @@
 import Vue from 'vue'
 import Component from 'vue-class-component'
 import { Prop } from 'vue-property-decorator'
-import { Web3Provider } from '@ethersproject/providers'
-import { MetadataFormData, Metadata } from '@/api/metadata'
+import { MetadataFormData } from '@/api/metadata'
 import { User } from '@/api/user'
-import { chain } from '@/api/core'
+import { chain, TransactionProgress } from '@/api/core'
 
 import Loader from '@/components/Loader.vue'
 import Transaction from '@/components/Transaction.vue'
 import WalletWidget from '@/components/WalletWidget.vue'
 
-import { waitForTransaction } from '@/utils/contracts'
 import { ContractTransaction, ContractReceipt } from '@ethersproject/contracts'
 
-type Progress = {
-  latest: number
-  total: number
-}
-
 @Component({
   components: {
     Loader,
@@ -73,75 +54,22 @@ export default class MetadataSubmissionWidget extends Vue {
     provider: any
   ) => Promise<ContractTransaction>
   @Prop() onSuccess!: (receipt: ContractReceipt, chainId: number) => void
-
-  isLoading = true
-  isWaiting = false
-  isTxRejected = false
-  txHash = ''
-  txError = ''
-  progress: Progress | null = null
-
-  async created() {
-    this.isLoading = false
-  }
+  @Prop() isWaiting!: boolean
+  @Prop({ default: null }) progress!: TransactionProgress | null
+  @Prop({ default: '' }) txHash!: string
+  @Prop({ default: '' }) txError!: string
 
   get currentUser(): User | null {
     return this.$store.state.currentUser
   }
 
-  get walletProvider(): Web3Provider | undefined {
-    return this.$web3.provider
-  }
-
   get blockExplorerLabel(): string {
     return chain.explorerLabel
   }
-  get canSubmit(): boolean {
-    return !!this.currentUser && !!this.walletProvider
-  }
 
   get hasTxError(): boolean {
     return !!this.txError
   }
-
-  updateProgress(latest: number, total: number): void {
-    this.progress = { latest, total }
-  }
-
-  async handleSubmit(): Promise<void> {
-    const { currentUser } = this.$store.state
-
-    // Reset errors when submitting
-    this.txError = ''
-    this.isTxRejected = false
-    if (currentUser) {
-      const { walletProvider } = currentUser
-      try {
-        this.isWaiting = true
-        const transaction = this.onSubmit(this.form, walletProvider)
-        const receipt = await waitForTransaction(
-          transaction,
-          (hash) => (this.txHash = hash)
-        )
-
-        await Metadata.waitForBlock(
-          receipt.blockNumber,
-          chain.name,
-          0,
-          this.updateProgress
-        )
-        this.isWaiting = false
-
-        if (this.onSuccess) {
-          this.onSuccess(receipt, this.$web3.chainId)
-        }
-      } catch (error) {
-        this.isWaiting = false
-        this.txError = error.message
-        return
-      }
-    }
-  }
 }
 </script>
 

From 262b9e82b36dc1fc998ce91f0453c5bf48c6fcbb Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 20 Jul 2022 10:09:22 -0400
Subject: [PATCH 08/36] refactor to work with new submission flow

---
 vue-app/src/api/core.ts                       |  7 +++++++
 vue-app/src/api/metadata.ts                   |  4 ++++
 .../src/api/recipient-registry-universal.ts   | 21 ++++++++++++-------
 vue-app/src/api/recipient-registry.ts         | 18 +++++++++++-----
 4 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/vue-app/src/api/core.ts b/vue-app/src/api/core.ts
index a34ec3a1b..50747ea3b 100644
--- a/vue-app/src/api/core.ts
+++ b/vue-app/src/api/core.ts
@@ -80,3 +80,10 @@ export enum ThemeMode {
   LIGHT = 'light',
   DARK = 'dark',
 }
+
+// transaction progress reported as the current block seen
+// and the last block the transaction is expected to be in
+export type TransactionProgress = {
+  current: number
+  last: number
+}
diff --git a/vue-app/src/api/metadata.ts b/vue-app/src/api/metadata.ts
index 4b772e083..7d05a4e4d 100644
--- a/vue-app/src/api/metadata.ts
+++ b/vue-app/src/api/metadata.ts
@@ -152,6 +152,8 @@ export class Metadata {
   thumbnailImageHash?: string
   imageHash?: string
   deletedAt?: number
+  furthestStep?: number
+  email?: string
 
   constructor(data: any) {
     this.id = data.id
@@ -174,6 +176,8 @@ export class Metadata {
     this.bannerImageHash = data.bannerImageHash
     this.thumbnailImageHash = data.thumbnailImageHash
     this.imageHash = data.imageHash
+    this.furthestStep = data.furthestStep
+    this.email = data.email
   }
 
   /**
diff --git a/vue-app/src/api/recipient-registry-universal.ts b/vue-app/src/api/recipient-registry-universal.ts
index b2f02ffc9..cb98c0a4e 100644
--- a/vue-app/src/api/recipient-registry-universal.ts
+++ b/vue-app/src/api/recipient-registry-universal.ts
@@ -1,6 +1,6 @@
 import { Contract, BigNumber, Signer } from 'ethers'
 import { TransactionResponse } from '@ethersproject/abstract-provider'
-import { UniversalRecipientRegistry } from './abi'
+import { OptimisticRecipientRegistry } from './abi'
 import { RecipientRegistryInterface } from './types'
 import { Metadata } from './metadata'
 import { chain } from './core'
@@ -13,7 +13,7 @@ export async function addRecipient(
 ): Promise<TransactionResponse> {
   const registry = new Contract(
     registryAddress,
-    UniversalRecipientRegistry,
+    OptimisticRecipientRegistry,
     signer
   )
   const metadata = Metadata.fromFormData(recipientData)
@@ -26,9 +26,14 @@ export async function addRecipient(
     throw new Error(`Missing recipient address for the ${chain.name} network`)
   }
 
-  const transaction = await registry.addRecipient(address, id, {
-    value: deposit,
-  })
+  const json = { id }
+  const transaction = await registry.addRecipient(
+    address,
+    JSON.stringify(json),
+    {
+      value: deposit,
+    }
+  )
   return transaction
 }
 
@@ -39,7 +44,7 @@ export async function registerProject(
 ): Promise<TransactionResponse> {
   const registry = new Contract(
     registryAddress,
-    UniversalRecipientRegistry,
+    OptimisticRecipientRegistry,
     signer
   )
   const transaction = await registry.executeRequest(recipientId)
@@ -54,7 +59,7 @@ export async function rejectProject(
 ) {
   const registry = new Contract(
     registryAddress,
-    UniversalRecipientRegistry,
+    OptimisticRecipientRegistry,
     signer
   )
   const transaction = await registry.challengeRequest(
@@ -71,7 +76,7 @@ export async function removeProject(
 ) {
   const registry = new Contract(
     registryAddress,
-    UniversalRecipientRegistry,
+    OptimisticRecipientRegistry,
     signer
   )
 
diff --git a/vue-app/src/api/recipient-registry.ts b/vue-app/src/api/recipient-registry.ts
index ef32c6d2a..a9018b83a 100644
--- a/vue-app/src/api/recipient-registry.ts
+++ b/vue-app/src/api/recipient-registry.ts
@@ -180,11 +180,19 @@ async function buildMetadataMap(
 async function normalizeRecipients(
   recipients: Partial<Recipient>[]
 ): Promise<Partial<Recipient>[]> {
-  const metadataIds = recipients.map(metadataId).filter(Boolean)
-  const metadataMap = await buildMetadataMap(metadataIds)
+  const metadataIds = recipients.map(({ recipientMetadata }) => {
+    try {
+      const json = JSON.parse(recipientMetadata || '')
+      return json.id
+    } catch {
+      return null
+    }
+  })
+
+  const metadataMap = await buildMetadataMap(metadataIds.filter(Boolean))
 
-  return recipients.map((recipient) => {
-    const metadata = metadataMap[metadataId(recipient)]
+  return recipients.map((recipient, index) => {
+    const metadata = metadataMap[metadataIds[index]]
     if (metadata) {
       recipient.recipientMetadata = metadata
     }
@@ -337,7 +345,7 @@ export async function getRequests(
     try {
       metadata = JSON.parse(recipient.recipientMetadata || '{}')
     } catch {
-      // instead of throwing error, let it flow throw so
+      // instead of throwing error, let it flow through so
       // we can investigate the issue from the subgraph
       metadata.name = 'N/A'
     }

From 1dcbb5600b848ecbfa13d30f615b1780dabe48c8 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 20 Jul 2022 10:12:31 -0400
Subject: [PATCH 09/36] remove obsolete code

---
 vue-app/src/api/recipient-registry.ts | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/vue-app/src/api/recipient-registry.ts b/vue-app/src/api/recipient-registry.ts
index a9018b83a..df6b67e7d 100644
--- a/vue-app/src/api/recipient-registry.ts
+++ b/vue-app/src/api/recipient-registry.ts
@@ -131,15 +131,6 @@ function decodeProject(recipient: Partial<Recipient>): Project {
   }
 }
 
-/**
- * Returns the metadata id if available
- * @param recipient a recipient structure
- * @returns metadata id or an empty string
- */
-function metadataId(recipient: Partial<Recipient>): string {
-  return recipient.recipientMetadataId || ''
-}
-
 /**
  * Build a map to lookup metadata by id
  * Retrieve metadata in batches to avoid hitting server too often

From 1113993aaacc8de7ca82f978c4e29baf28707f41 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 20 Jul 2022 11:35:37 -0400
Subject: [PATCH 10/36] remove universal recipient registry

---
 .../UniversalRecipientRegistry.sol            |  204 --
 contracts/scripts/deployRecipientRegistry.ts  |    2 +-
 contracts/scripts/deployTestRound.ts          |    1 -
 contracts/tests/recipientRegistryUniversal.ts |  436 -----
 .../utils/recipient-registry-factory/index.ts |    2 -
 .../recipient-registry-factory/universal.ts   |   31 -
 subgraph/abis/UniversalRecipientRegistry.json |  369 ----
 subgraph/config/arbitrum-rinkeby.json         |    3 +-
 subgraph/config/arbitrum.json                 |    3 +-
 subgraph/config/hardhat.json                  |    3 +-
 subgraph/config/rinkeby.json                  |    3 +-
 .../generated/FundingRoundFactory/MACI.ts     | 1634 -----------------
 .../UniversalRecipientRegistry.ts             |  638 -------
 .../RecipientRegistryFactory.ts               |   25 -
 .../RecipientRegistryTemplate.ts              |    4 -
 .../RecipientRegistryType.ts                  |   16 -
 .../UniversalRecipientRegistryMapping.ts      |   54 -
 subgraph/subgraph.template.yaml               |   25 -
 subgraph/subgraph.yaml                        |   27 +-
 vue-app/.env.xdai                             |    2 +-
 vue-app/src/api/abi.ts                        |    2 -
 vue-app/src/api/core.ts                       |    1 -
 .../src/api/recipient-registry-optimistic.ts  |   23 +-
 .../src/api/recipient-registry-universal.ts   |  100 -
 vue-app/src/api/recipient-registry.ts         |    2 -
 vue-app/src/store/getters.ts                  |    4 +-
 vue-app/src/views/Join.vue                    |   10 +-
 vue-app/src/views/JoinOptimistic.vue          | 1452 +++------------
 vue-app/src/views/JoinUniversal.vue           |  504 -----
 vue-app/src/views/RecipientRegistry.vue       |    5 +-
 30 files changed, 249 insertions(+), 5336 deletions(-)
 delete mode 100644 contracts/contracts/recipientRegistry/UniversalRecipientRegistry.sol
 delete mode 100644 contracts/tests/recipientRegistryUniversal.ts
 delete mode 100644 contracts/utils/recipient-registry-factory/universal.ts
 delete mode 100644 subgraph/abis/UniversalRecipientRegistry.json
 delete mode 100644 subgraph/generated/FundingRoundFactory/MACI.ts
 delete mode 100644 subgraph/generated/UniversalRecipientRegistry/UniversalRecipientRegistry.ts
 delete mode 100644 subgraph/src/recipientRegistry/UniversalRecipientRegistryMapping.ts
 delete mode 100644 vue-app/src/api/recipient-registry-universal.ts
 delete mode 100644 vue-app/src/views/JoinUniversal.vue

diff --git a/contracts/contracts/recipientRegistry/UniversalRecipientRegistry.sol b/contracts/contracts/recipientRegistry/UniversalRecipientRegistry.sol
deleted file mode 100644
index a87ca27c7..000000000
--- a/contracts/contracts/recipientRegistry/UniversalRecipientRegistry.sol
+++ /dev/null
@@ -1,204 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-
-pragma solidity 0.6.12;
-
-import '@openzeppelin/contracts/access/Ownable.sol';
-
-import './BaseRecipientRegistry.sol';
-
-/**
- * @dev Optimistic Recipient registry with recipient metadata stored externally, potentially in a different network.
- */
-contract UniversalRecipientRegistry is Ownable, BaseRecipientRegistry {
-
-  // Enums
-  enum RequestType {
-    Registration,
-    Removal
-  }
-
-  // Structs
-  struct Request {
-    RequestType requestType;
-    address payable requester;
-    uint256 submissionTime;
-    uint256 deposit;
-    address recipientAddress; // Only for registration requests
-  }
-
-  // constant
-  string public registryType = 'universal';
-
-  // State
-  uint256 public baseDeposit;
-  uint256 public challengePeriodDuration;
-  mapping(bytes32 => Request) private requests;
-
-  // Events
-  event RequestSubmitted(
-    bytes32 indexed _recipientId,
-    RequestType indexed _type,
-    address _recipient,
-    uint256 _timestamp
-  );
-  event RequestResolved(
-    bytes32 indexed _recipientId,
-    RequestType indexed _type,
-    bool indexed _rejected,
-    uint256 _recipientIndex, // Only for accepted registration requests
-    uint256 _timestamp
-  );
-
-  /**
-    * @dev Deploy the registry.
-    * @param _baseDeposit Deposit required to add or remove item.
-    * @param _challengePeriodDuration The time owner has to challenge a request (seconds).
-    * @param _controller Controller address. Normally it's a funding round factory contract.
-    */
-  constructor(
-    uint256 _baseDeposit,
-    uint256 _challengePeriodDuration,
-    address _controller
-  )
-    public
-  {
-    baseDeposit = _baseDeposit;
-    challengePeriodDuration = _challengePeriodDuration;
-    controller = _controller;
-  }
-
-  /**
-    * @dev Change base deposit.
-    */
-  function setBaseDeposit(uint256 _baseDeposit)
-    external
-    onlyOwner
-  {
-    baseDeposit = _baseDeposit;
-  }
-
-  /**
-    * @dev Change challenge period duration.
-    */
-  function setChallengePeriodDuration(uint256 _challengePeriodDuration)
-    external
-    onlyOwner
-  {
-    challengePeriodDuration = _challengePeriodDuration;
-  }
-
-  /**
-    * @dev Submit recipient registration request.
-    * @param _recipient The address that receives funds.
-    * @param _metadataId The id of the recipient metadata that is stored externally
-    *                    which is used as the recipient id in this registry
-    */
-  function addRecipient(address _recipient, bytes32 _metadataId)
-    external
-    payable
-  {
-    require(_recipient != address(0), 'RecipientRegistry: Recipient address is zero');
-    require(recipients[_metadataId].index == 0, 'RecipientRegistry: Recipient already registered');
-    require(requests[_metadataId].submissionTime == 0, 'RecipientRegistry: Request already submitted');
-    require(msg.value == baseDeposit, 'RecipientRegistry: Incorrect deposit amount');
-    requests[_metadataId] = Request(
-      RequestType.Registration,
-      msg.sender,
-      block.timestamp,
-      msg.value,
-      _recipient
-    );
-    emit RequestSubmitted(
-      _metadataId,
-      RequestType.Registration,
-      _recipient,
-      block.timestamp
-    );
-  }
-
-  /**
-    * @dev Submit recipient removal request.
-    * @param _recipientId The ID of recipient.
-    */
-  function removeRecipient(bytes32 _recipientId)
-    external
-    payable
-  {
-    require(recipients[_recipientId].index != 0, 'RecipientRegistry: Recipient is not in the registry');
-    require(recipients[_recipientId].removedAt == 0, 'RecipientRegistry: Recipient already removed');
-    require(requests[_recipientId].submissionTime == 0, 'RecipientRegistry: Request already submitted');
-    require(msg.value == baseDeposit, 'RecipientRegistry: Incorrect deposit amount');
-    requests[_recipientId] = Request(
-      RequestType.Removal,
-      msg.sender,
-      block.timestamp,
-      msg.value,
-      address(0)
-    );
-    emit RequestSubmitted(
-      _recipientId,
-      RequestType.Removal,
-      address(0),
-      block.timestamp
-    );
-  }
-
-  /**
-    * @dev Reject request.
-    * @param _recipientId The ID of recipient.
-    * @param _beneficiary Address to which the deposit should be transferred.
-    */
-  function challengeRequest(bytes32 _recipientId, address payable _beneficiary)
-    external
-    onlyOwner
-    returns (bool)
-  {
-    Request memory request = requests[_recipientId];
-    require(request.submissionTime != 0, 'RecipientRegistry: Request does not exist');
-    delete requests[_recipientId];
-    bool isSent = _beneficiary.send(request.deposit);
-    emit RequestResolved(
-      _recipientId,
-      request.requestType,
-      true,
-      0,
-      block.timestamp
-    );
-    return isSent;
-  }
-
-  /**
-    * @dev Execute request.
-    * @param _recipientId The ID of recipient.
-    */
-  function executeRequest(bytes32 _recipientId)
-    external
-    returns (bool)
-  {
-    Request memory request = requests[_recipientId];
-    require(request.submissionTime != 0, 'RecipientRegistry: Request does not exist');
-    if (msg.sender != owner()) {
-      require(
-        block.timestamp - request.submissionTime >= challengePeriodDuration,
-        'RecipientRegistry: Challenge period is not over'
-      );
-    }
-    uint256 recipientIndex = 0;
-    if (request.requestType == RequestType.Removal) {
-      _removeRecipient(_recipientId);
-    } else {
-      // WARNING: Could revert if no slots are available or if recipient limit is not set
-      recipientIndex = _addRecipient(_recipientId, request.recipientAddress);
-    }
-    delete requests[_recipientId];
-    bool isSent = request.requester.send(request.deposit);
-    emit RequestResolved(
-      _recipientId,
-      request.requestType,
-      false,
-      recipientIndex,
-      block.timestamp
-    );
-    return isSent;
-  }
-}
diff --git a/contracts/scripts/deployRecipientRegistry.ts b/contracts/scripts/deployRecipientRegistry.ts
index 233a480b8..0ed29b470 100644
--- a/contracts/scripts/deployRecipientRegistry.ts
+++ b/contracts/scripts/deployRecipientRegistry.ts
@@ -6,7 +6,7 @@ import { RecipientRegistryFactory } from '../utils/recipient-registry-factory'
  * Deploy a new recipient registry.
  * The following environment variables must be set to run the script
  *
- * RECIPIENT_REGISTRY_TYPE - default is simple, values can be simple, optimistic, universal
+ * RECIPIENT_REGISTRY_TYPE - default is simple, values can be simple, optimistic
  * FUNDING_ROUND_FACTORY_ADDRESS - address of the funding round factory
  * WALLET_PRIVATE_KEY - private key of the account that will fund this transaction
  * JSONRPC_HTTP_URL - URL to connect to the node
diff --git a/contracts/scripts/deployTestRound.ts b/contracts/scripts/deployTestRound.ts
index 715674d6b..1c724611d 100644
--- a/contracts/scripts/deployTestRound.ts
+++ b/contracts/scripts/deployTestRound.ts
@@ -113,7 +113,6 @@ async function main() {
   const RecipientRegistryName: Record<string, string> = {
     simple: 'SimpleRecipientRegistry',
     optimistic: 'OptimisticRecipientRegistry',
-    universal: 'UniversalRecipientRegistry',
   }
   const recipientRegistryAddress = await factory.recipientRegistry()
   const recipientRegistryName = RecipientRegistryName[recipientRegistryType]
diff --git a/contracts/tests/recipientRegistryUniversal.ts b/contracts/tests/recipientRegistryUniversal.ts
deleted file mode 100644
index 05ab669da..000000000
--- a/contracts/tests/recipientRegistryUniversal.ts
+++ /dev/null
@@ -1,436 +0,0 @@
-import { ethers, waffle } from 'hardhat'
-import { use, expect } from 'chai'
-import { solidity } from 'ethereum-waffle'
-import { BigNumber, Contract, utils } from 'ethers'
-
-import { UNIT, ZERO_ADDRESS } from '../utils/constants'
-import { getTxFee } from '../utils/contracts'
-import { deployContract } from '../utils/deployment'
-
-use(solidity)
-
-const { provider } = waffle
-
-const MAX_RECIPIENTS = 16
-
-async function getCurrentTime(): Promise<number> {
-  return (await provider.getBlock('latest')).timestamp
-}
-
-describe('Universal recipient registry', () => {
-  const [, deployer, controller, recipient, requester] = provider.getWallets()
-  let registry: Contract
-
-  const baseDeposit = UNIT.div(10) // 0.1 ETH
-  const challengePeriodDuration = BigNumber.from(86400) // Seconds
-
-  enum RequestType {
-    Registration = 0,
-    Removal = 1,
-  }
-
-  beforeEach(async () => {
-    registry = await deployContract(deployer, 'UniversalRecipientRegistry', [
-      baseDeposit,
-      challengePeriodDuration,
-      controller.address,
-    ])
-  })
-
-  it('initializes correctly', async () => {
-    expect(await registry.baseDeposit()).to.equal(baseDeposit)
-    expect(await registry.challengePeriodDuration()).to.equal(
-      challengePeriodDuration
-    )
-    expect(await registry.controller()).to.equal(controller.address)
-    expect(await registry.maxRecipients()).to.equal(0)
-  })
-
-  it('changes base deposit', async () => {
-    const newBaseDeposit = baseDeposit.mul(2)
-    await registry.setBaseDeposit(newBaseDeposit)
-    expect(await registry.baseDeposit()).to.equal(newBaseDeposit)
-  })
-
-  it('changes challenge period duration', async () => {
-    const newChallengePeriodDuration = challengePeriodDuration.mul(2)
-    await registry.setChallengePeriodDuration(newChallengePeriodDuration)
-    expect(await registry.challengePeriodDuration()).to.equal(
-      newChallengePeriodDuration
-    )
-  })
-
-  describe('managing recipients', () => {
-    const recipientIndex = 1
-    let recipientAddress: string
-    let metadata: string
-    let recipientId: string
-
-    function getRecipientId(address: string, metadata: string): string {
-      return utils.id(`${address}${metadata}`)
-    }
-
-    beforeEach(async () => {
-      await registry.connect(controller).setMaxRecipients(MAX_RECIPIENTS)
-      recipientAddress = recipient.address
-      metadata = JSON.stringify({
-        name: 'Recipient',
-        description: 'Description',
-        imageHash: 'Ipfs imageHash',
-      })
-      recipientId = getRecipientId(recipientAddress, metadata)
-    })
-
-    it('allows anyone to submit registration request', async () => {
-      const requestSubmitted = await registry
-        .connect(requester)
-        .addRecipient(recipientAddress, recipientId, { value: baseDeposit })
-      const currentTime = await getCurrentTime()
-      expect(requestSubmitted)
-        .to.emit(registry, 'RequestSubmitted')
-        .withArgs(
-          recipientId,
-          RequestType.Registration,
-          recipientAddress,
-          currentTime
-        )
-      expect(await provider.getBalance(registry.address)).to.equal(baseDeposit)
-    })
-
-    it('should not accept zero-address as recipient address', async () => {
-      recipientAddress = ZERO_ADDRESS
-      await expect(
-        registry.addRecipient(recipientAddress, recipientId, {
-          value: baseDeposit,
-        })
-      ).to.be.revertedWith('RecipientRegistry: Recipient address is zero')
-    })
-
-    it('should not accept registration request if recipient is already registered', async () => {
-      await registry.addRecipient(recipientAddress, recipientId, {
-        value: baseDeposit,
-      })
-      await provider.send('evm_increaseTime', [86400])
-      await registry.executeRequest(recipientId)
-      await expect(
-        registry.addRecipient(recipientAddress, recipientId, {
-          value: baseDeposit,
-        })
-      ).to.be.revertedWith('RecipientRegistry: Recipient already registered')
-    })
-
-    it('should not accept new registration request if previous request is not resolved', async () => {
-      await registry.addRecipient(recipientAddress, recipientId, {
-        value: baseDeposit,
-      })
-      await expect(
-        registry.addRecipient(recipientAddress, recipientId, {
-          value: baseDeposit,
-        })
-      ).to.be.revertedWith('RecipientRegistry: Request already submitted')
-    })
-
-    it('should not accept registration request with incorrect deposit size', async () => {
-      await expect(
-        registry.addRecipient(recipientAddress, recipientId, {
-          value: baseDeposit.div(2),
-        })
-      ).to.be.revertedWith('RecipientRegistry: Incorrect deposit amount')
-    })
-
-    it('allows owner to challenge registration request', async () => {
-      await registry
-        .connect(requester)
-        .addRecipient(recipientAddress, recipientId, { value: baseDeposit })
-      const requesterBalanceBefore = await provider.getBalance(
-        requester.address
-      )
-      const requestRejected = await registry.challengeRequest(
-        recipientId,
-        requester.address
-      )
-      const currentTime = await getCurrentTime()
-      expect(requestRejected)
-        .to.emit(registry, 'RequestResolved')
-        .withArgs(recipientId, RequestType.Registration, true, 0, currentTime)
-      const requesterBalanceAfter = await provider.getBalance(requester.address)
-      expect(requesterBalanceBefore.add(baseDeposit)).to.equal(
-        requesterBalanceAfter
-      )
-    })
-
-    it('allows owner to set beneficiary address when challenging request', async () => {
-      await registry.addRecipient(recipientAddress, recipientId, {
-        value: baseDeposit,
-      })
-      const controllerBalanceBefore = await provider.getBalance(
-        controller.address
-      )
-      await registry.challengeRequest(recipientId, controller.address)
-      const controllerBalanceAfter = await provider.getBalance(
-        controller.address
-      )
-      expect(controllerBalanceBefore.add(baseDeposit)).to.equal(
-        controllerBalanceAfter
-      )
-    })
-
-    it('allows only owner to challenge requests', async () => {
-      await registry
-        .connect(requester)
-        .addRecipient(recipientAddress, recipientId, { value: baseDeposit })
-      await expect(
-        registry
-          .connect(requester)
-          .challengeRequest(recipientId, requester.address)
-      ).to.be.revertedWith('Ownable: caller is not the owner')
-    })
-
-    it('should not allow to challenge resolved request', async () => {
-      await registry
-        .connect(requester)
-        .addRecipient(recipientAddress, recipientId, { value: baseDeposit })
-      await registry.challengeRequest(recipientId, requester.address)
-      await expect(
-        registry.challengeRequest(recipientId, requester.address)
-      ).to.be.revertedWith('RecipientRegistry: Request does not exist')
-    })
-
-    it('allows anyone to execute unchallenged registration request', async () => {
-      await registry
-        .connect(requester)
-        .addRecipient(recipientAddress, recipientId, { value: baseDeposit })
-      await provider.send('evm_increaseTime', [86400])
-
-      const requesterBalanceBefore = await provider.getBalance(
-        requester.address
-      )
-      const requestExecuted = await registry
-        .connect(requester)
-        .executeRequest(recipientId)
-      const currentTime = await getCurrentTime()
-      expect(requestExecuted)
-        .to.emit(registry, 'RequestResolved')
-        .withArgs(
-          recipientId,
-          RequestType.Registration,
-          false,
-          recipientIndex,
-          currentTime
-        )
-      const txFee = await getTxFee(requestExecuted)
-      const requesterBalanceAfter = await provider.getBalance(requester.address)
-      expect(requesterBalanceBefore.sub(txFee).add(baseDeposit)).to.equal(
-        requesterBalanceAfter
-      )
-
-      expect(
-        await registry.getRecipientAddress(
-          recipientIndex,
-          currentTime,
-          currentTime
-        )
-      ).to.equal(recipientAddress)
-    })
-
-    it('should not allow to execute request that does not exist', async () => {
-      await expect(registry.executeRequest(recipientId)).to.be.revertedWith(
-        'RecipientRegistry: Request does not exist'
-      )
-    })
-
-    it('should not allow non-owner to execute request during challenge period', async () => {
-      await registry.addRecipient(recipientAddress, recipientId, {
-        value: baseDeposit,
-      })
-
-      await expect(
-        registry.connect(requester).executeRequest(recipientId)
-      ).to.be.revertedWith('RecipientRegistry: Challenge period is not over')
-    })
-
-    it('should allow owner to execute request during challenge period', async () => {
-      await registry.addRecipient(recipientAddress, recipientId, {
-        value: baseDeposit,
-      })
-
-      let recipientCount = await registry.getRecipientCount()
-      expect(recipientCount.toNumber()).to.equal(0)
-
-      await registry.executeRequest(recipientId)
-
-      recipientCount = await registry.getRecipientCount()
-      expect(recipientCount.toNumber()).to.equal(1)
-    })
-
-    it('should remember initial deposit amount during registration', async () => {
-      await registry
-        .connect(requester)
-        .addRecipient(recipientAddress, recipientId, { value: baseDeposit })
-      await registry.setBaseDeposit(baseDeposit.mul(2))
-      await provider.send('evm_increaseTime', [86400])
-
-      const requesterBalanceBefore = await provider.getBalance(
-        requester.address
-      )
-      const requestExecuted = await registry
-        .connect(requester)
-        .executeRequest(recipientId)
-      const txFee = await getTxFee(requestExecuted)
-      const requesterBalanceAfter = await provider.getBalance(requester.address)
-      expect(requesterBalanceBefore.sub(txFee).add(baseDeposit)).to.equal(
-        requesterBalanceAfter
-      )
-    })
-
-    it('should limit the number of recipients', async () => {
-      let recipientName
-      for (let i = 0; i < MAX_RECIPIENTS + 1; i++) {
-        recipientName = String(i + 1).padStart(4, '0')
-        metadata = JSON.stringify({
-          name: recipientName,
-          description: 'Description',
-          imageHash: 'Ipfs imageHash',
-        })
-        recipientAddress = `0x000000000000000000000000000000000000${recipientName}`
-        recipientId = getRecipientId(recipientAddress, metadata)
-        if (i < MAX_RECIPIENTS) {
-          await registry.addRecipient(recipientAddress, recipientId, {
-            value: baseDeposit,
-          })
-          await provider.send('evm_increaseTime', [86400])
-          await registry.executeRequest(recipientId)
-        } else {
-          await registry.addRecipient(recipientAddress, recipientId, {
-            value: baseDeposit,
-          })
-          await provider.send('evm_increaseTime', [86400])
-          await expect(registry.executeRequest(recipientId)).to.be.revertedWith(
-            'RecipientRegistry: Recipient limit reached'
-          )
-        }
-      }
-    })
-
-    it('allows owner to submit removal request', async () => {
-      await registry.addRecipient(recipientAddress, recipientId, {
-        value: baseDeposit,
-      })
-      await provider.send('evm_increaseTime', [86400])
-      await registry.executeRequest(recipientId)
-
-      const requestSubmitted = await registry.removeRecipient(recipientId, {
-        value: baseDeposit,
-      })
-      const currentTime = await getCurrentTime()
-      expect(requestSubmitted)
-        .to.emit(registry, 'RequestSubmitted')
-        .withArgs(recipientId, RequestType.Removal, ZERO_ADDRESS, currentTime)
-    })
-
-    it('allows only owner to execute removal request during challenge period', async () => {
-      await registry.addRecipient(recipientAddress, recipientId, {
-        value: baseDeposit,
-      })
-      await registry.executeRequest(recipientId)
-
-      const registryAsRequester = registry.connect(requester)
-      await registryAsRequester.removeRecipient(recipientId, {
-        value: baseDeposit,
-      })
-
-      await expect(
-        registryAsRequester.executeRequest(recipientId)
-      ).to.be.revertedWith('RecipientRegistry: Challenge period is not over')
-    })
-
-    it('should not accept removal request if recipient is not in registry', async () => {
-      await expect(registry.removeRecipient(recipientId)).to.be.revertedWith(
-        'RecipientRegistry: Recipient is not in the registry'
-      )
-    })
-
-    it('should not accept removal request if recipient is already removed', async () => {
-      await registry.addRecipient(recipientAddress, recipientId, {
-        value: baseDeposit,
-      })
-      await provider.send('evm_increaseTime', [86400])
-      await registry.executeRequest(recipientId)
-
-      await registry.removeRecipient(recipientId, { value: baseDeposit })
-      await provider.send('evm_increaseTime', [86400])
-      await registry.connect(requester).executeRequest(recipientId)
-
-      await expect(registry.removeRecipient(recipientId)).to.be.revertedWith(
-        'RecipientRegistry: Recipient already removed'
-      )
-    })
-
-    it('should not accept new removal request if previous removal request is not resolved', async () => {
-      await registry.addRecipient(recipientAddress, recipientId, {
-        value: baseDeposit,
-      })
-      await provider.send('evm_increaseTime', [86400])
-      await registry.executeRequest(recipientId)
-
-      await registry.removeRecipient(recipientId, { value: baseDeposit })
-      await expect(registry.removeRecipient(recipientId)).to.be.revertedWith(
-        'RecipientRegistry: Request already submitted'
-      )
-    })
-
-    it('allows owner to challenge removal request', async () => {
-      await registry.addRecipient(recipientAddress, recipientId, {
-        value: baseDeposit,
-      })
-      await provider.send('evm_increaseTime', [86400])
-      await registry.executeRequest(recipientId)
-
-      await registry.removeRecipient(recipientId, { value: baseDeposit })
-      const requestRejected = await registry.challengeRequest(
-        recipientId,
-        requester.address
-      )
-      const currentTime = await getCurrentTime()
-      expect(requestRejected)
-        .to.emit(registry, 'RequestResolved')
-        .withArgs(recipientId, RequestType.Removal, true, 0, currentTime)
-
-      // Recipient is not removed
-      expect(
-        await registry.getRecipientAddress(
-          recipientIndex,
-          currentTime,
-          currentTime
-        )
-      ).to.equal(recipientAddress)
-    })
-
-    it('allows anyone to execute unchallenged removal request', async () => {
-      await registry.addRecipient(recipientAddress, recipientId, {
-        value: baseDeposit,
-      })
-      await provider.send('evm_increaseTime', [86400])
-      await registry.executeRequest(recipientId)
-
-      await registry.removeRecipient(recipientId, { value: baseDeposit })
-      await provider.send('evm_increaseTime', [86400])
-
-      const requestExecuted = await registry
-        .connect(requester)
-        .executeRequest(recipientId)
-      const currentTime = await getCurrentTime()
-      expect(requestExecuted)
-        .to.emit(registry, 'RequestResolved')
-        .withArgs(recipientId, RequestType.Removal, false, 0, currentTime)
-
-      expect(
-        await registry.getRecipientAddress(
-          recipientIndex,
-          currentTime,
-          currentTime
-        )
-      ).to.equal(ZERO_ADDRESS)
-    })
-  })
-})
diff --git a/contracts/utils/recipient-registry-factory/index.ts b/contracts/utils/recipient-registry-factory/index.ts
index 00afa7a66..d65704165 100644
--- a/contracts/utils/recipient-registry-factory/index.ts
+++ b/contracts/utils/recipient-registry-factory/index.ts
@@ -1,14 +1,12 @@
 import { Contract, Signer } from 'ethers'
 import { SimpleRecipientRegistryFactory } from './simple'
 import { OptimisticRecipientRegistryFactory } from './optimistic'
-import { UniversalRecipientRegistryFactory } from './universal'
 import { RecipientRegistryConstructorArgs } from './types'
 
 // Map of recipient registry type to the deployment function
 const RegistryFactoryMap: Record<string, Function> = {
   simple: SimpleRecipientRegistryFactory.deploy,
   optimistic: OptimisticRecipientRegistryFactory.deploy,
-  universal: UniversalRecipientRegistryFactory.deploy,
 }
 
 /**
diff --git a/contracts/utils/recipient-registry-factory/universal.ts b/contracts/utils/recipient-registry-factory/universal.ts
deleted file mode 100644
index 0f1c6f466..000000000
--- a/contracts/utils/recipient-registry-factory/universal.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { ethers } from 'hardhat'
-import { Contract, Signer } from 'ethers'
-import { RecipientRegistryConstructorArgs } from './types'
-
-export class UniversalRecipientRegistryFactory {
-  static async deploy(
-    args: RecipientRegistryConstructorArgs,
-    signer: Signer
-  ): Promise<Contract> {
-    if (args.baseDeposit === undefined) {
-      throw new Error('missing base deposit ')
-    }
-
-    if (args.challengePeriodDuration === undefined) {
-      throw new Error('missing challenge period duration')
-    }
-
-    const UniversalRecipientRegistry = await ethers.getContractFactory(
-      'UniversalRecipientRegistry',
-      signer
-    )
-
-    const recipientRegistry = await UniversalRecipientRegistry.deploy(
-      args.baseDeposit,
-      args.challengePeriodDuration,
-      args.controller
-    )
-
-    return recipientRegistry
-  }
-}
diff --git a/subgraph/abis/UniversalRecipientRegistry.json b/subgraph/abis/UniversalRecipientRegistry.json
deleted file mode 100644
index 8758685a9..000000000
--- a/subgraph/abis/UniversalRecipientRegistry.json
+++ /dev/null
@@ -1,369 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_baseDeposit",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_challengePeriodDuration",
-        "type": "uint256"
-      },
-      {
-        "internalType": "address",
-        "name": "_controller",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "previousOwner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnershipTransferred",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "bytes32",
-        "name": "_recipientId",
-        "type": "bytes32"
-      },
-      {
-        "indexed": true,
-        "internalType": "enum UniversalRecipientRegistry.RequestType",
-        "name": "_type",
-        "type": "uint8"
-      },
-      {
-        "indexed": true,
-        "internalType": "bool",
-        "name": "_rejected",
-        "type": "bool"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "_recipientIndex",
-        "type": "uint256"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "_timestamp",
-        "type": "uint256"
-      }
-    ],
-    "name": "RequestResolved",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "bytes32",
-        "name": "_recipientId",
-        "type": "bytes32"
-      },
-      {
-        "indexed": true,
-        "internalType": "enum UniversalRecipientRegistry.RequestType",
-        "name": "_type",
-        "type": "uint8"
-      },
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "_recipient",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "_timestamp",
-        "type": "uint256"
-      }
-    ],
-    "name": "RequestSubmitted",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_recipient",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_metadataId",
-        "type": "bytes32"
-      }
-    ],
-    "name": "addRecipient",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "baseDeposit",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "challengePeriodDuration",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_recipientId",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "address payable",
-        "name": "_beneficiary",
-        "type": "address"
-      }
-    ],
-    "name": "challengeRequest",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "controller",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_recipientId",
-        "type": "bytes32"
-      }
-    ],
-    "name": "executeRequest",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_index",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_startTime",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_endTime",
-        "type": "uint256"
-      }
-    ],
-    "name": "getRecipientAddress",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "getRecipientCount",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "maxRecipients",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "owner",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "registryType",
-    "outputs": [
-      {
-        "internalType": "string",
-        "name": "",
-        "type": "string"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_recipientId",
-        "type": "bytes32"
-      }
-    ],
-    "name": "removeRecipient",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "renounceOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_baseDeposit",
-        "type": "uint256"
-      }
-    ],
-    "name": "setBaseDeposit",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_challengePeriodDuration",
-        "type": "uint256"
-      }
-    ],
-    "name": "setChallengePeriodDuration",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "_maxRecipients",
-        "type": "uint256"
-      }
-    ],
-    "name": "setMaxRecipients",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "transferOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]
diff --git a/subgraph/config/arbitrum-rinkeby.json b/subgraph/config/arbitrum-rinkeby.json
index 9e4c9c053..c8850d0b0 100644
--- a/subgraph/config/arbitrum-rinkeby.json
+++ b/subgraph/config/arbitrum-rinkeby.json
@@ -2,6 +2,5 @@
   "network": "arbitrum-rinkeby",
   "address": "0xC032e80a413Be959d9a9B6e5CadE53c870074d37",
   "factoryStartBlock": 4806990,
-  "recipientRegistryStartBlock": 4806990,
-  "universalRecipientRegistryStartBlock": 4806990
+  "recipientRegistryStartBlock": 4806990
 }
diff --git a/subgraph/config/arbitrum.json b/subgraph/config/arbitrum.json
index 973ecdf73..8f72d1d1f 100644
--- a/subgraph/config/arbitrum.json
+++ b/subgraph/config/arbitrum.json
@@ -2,6 +2,5 @@
   "network": "arbitrum-one",
   "address": "0x2e89494a8fE02891511a43f7877b726787E0C160",
   "factoryStartBlock": 3461582,
-  "recipientRegistryStartBlock": 3461582,
-  "universalRecipientRegistryStartBlock": 3461582
+  "recipientRegistryStartBlock": 3461582
 }
diff --git a/subgraph/config/hardhat.json b/subgraph/config/hardhat.json
index bff76574a..308788d1d 100644
--- a/subgraph/config/hardhat.json
+++ b/subgraph/config/hardhat.json
@@ -2,6 +2,5 @@
   "network": "hardhat",
   "address": "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707",
   "factoryStartBlock": 0,
-  "recipientRegistryStartBlock": 0,
-  "universalRecipientRegistryStartBlock": 0
+  "recipientRegistryStartBlock": 0
 }
diff --git a/subgraph/config/rinkeby.json b/subgraph/config/rinkeby.json
index b81deae58..434b744c9 100644
--- a/subgraph/config/rinkeby.json
+++ b/subgraph/config/rinkeby.json
@@ -2,6 +2,5 @@
   "network": "rinkeby",
   "address": "0x93A990D939Ca592cD8cCa47b7a0c3F590A598F9d",
   "factoryStartBlock": 9969110,
-  "recipientRegistryStartBlock": 9969130,
-  "universalRecipientRegistryStartBlock": 10255005
+  "recipientRegistryStartBlock": 9969130
 }
diff --git a/subgraph/generated/FundingRoundFactory/MACI.ts b/subgraph/generated/FundingRoundFactory/MACI.ts
deleted file mode 100644
index de37f2956..000000000
--- a/subgraph/generated/FundingRoundFactory/MACI.ts
+++ /dev/null
@@ -1,1634 +0,0 @@
-// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-
-import {
-  ethereum,
-  JSONValue,
-  TypedMap,
-  Entity,
-  Bytes,
-  Address,
-  BigInt
-} from "@graphprotocol/graph-ts";
-
-export class PublishMessage extends ethereum.Event {
-  get params(): PublishMessage__Params {
-    return new PublishMessage__Params(this);
-  }
-}
-
-export class PublishMessage__Params {
-  _event: PublishMessage;
-
-  constructor(event: PublishMessage) {
-    this._event = event;
-  }
-
-  get _message(): PublishMessage_messageStruct {
-    return this._event.parameters[0].value.toTuple() as PublishMessage_messageStruct;
-  }
-
-  get _encPubKey(): PublishMessage_encPubKeyStruct {
-    return this._event.parameters[1].value.toTuple() as PublishMessage_encPubKeyStruct;
-  }
-}
-
-export class PublishMessage_messageStruct extends ethereum.Tuple {
-  get iv(): BigInt {
-    return this[0].toBigInt();
-  }
-
-  get data(): Array<BigInt> {
-    return this[1].toBigIntArray();
-  }
-}
-
-export class PublishMessage_encPubKeyStruct extends ethereum.Tuple {
-  get x(): BigInt {
-    return this[0].toBigInt();
-  }
-
-  get y(): BigInt {
-    return this[1].toBigInt();
-  }
-}
-
-export class SignUp extends ethereum.Event {
-  get params(): SignUp__Params {
-    return new SignUp__Params(this);
-  }
-}
-
-export class SignUp__Params {
-  _event: SignUp;
-
-  constructor(event: SignUp) {
-    this._event = event;
-  }
-
-  get _userPubKey(): SignUp_userPubKeyStruct {
-    return this._event.parameters[0].value.toTuple() as SignUp_userPubKeyStruct;
-  }
-
-  get _stateIndex(): BigInt {
-    return this._event.parameters[1].value.toBigInt();
-  }
-
-  get _voiceCreditBalance(): BigInt {
-    return this._event.parameters[2].value.toBigInt();
-  }
-}
-
-export class SignUp_userPubKeyStruct extends ethereum.Tuple {
-  get x(): BigInt {
-    return this[0].toBigInt();
-  }
-
-  get y(): BigInt {
-    return this[1].toBigInt();
-  }
-}
-
-export class MACI__coordinatorPubKeyResult {
-  value0: BigInt;
-  value1: BigInt;
-
-  constructor(value0: BigInt, value1: BigInt) {
-    this.value0 = value0;
-    this.value1 = value1;
-  }
-
-  toMap(): TypedMap<string, ethereum.Value> {
-    let map = new TypedMap<string, ethereum.Value>();
-    map.set("value0", ethereum.Value.fromUnsignedBigInt(this.value0));
-    map.set("value1", ethereum.Value.fromUnsignedBigInt(this.value1));
-    return map;
-  }
-}
-
-export class MACI__genBatchUstPublicSignalsInput_ecdhPubKeysStruct extends ethereum.Tuple {
-  get x(): BigInt {
-    return this[0].toBigInt();
-  }
-
-  get y(): BigInt {
-    return this[1].toBigInt();
-  }
-}
-
-export class MACI__hashMessageInput_messageStruct extends ethereum.Tuple {
-  get iv(): BigInt {
-    return this[0].toBigInt();
-  }
-
-  get data(): Array<BigInt> {
-    return this[1].toBigIntArray();
-  }
-}
-
-export class MACI__hashStateLeafInput_stateLeafStruct extends ethereum.Tuple {
-  get pubKey(): MACI__hashStateLeafInput_stateLeafPubKeyStruct {
-    return this[0].toTuple() as MACI__hashStateLeafInput_stateLeafPubKeyStruct;
-  }
-
-  get voteOptionTreeRoot(): BigInt {
-    return this[1].toBigInt();
-  }
-
-  get voiceCreditBalance(): BigInt {
-    return this[2].toBigInt();
-  }
-
-  get nonce(): BigInt {
-    return this[3].toBigInt();
-  }
-}
-
-export class MACI__hashStateLeafInput_stateLeafPubKeyStruct extends ethereum.Tuple {
-  get x(): BigInt {
-    return this[0].toBigInt();
-  }
-
-  get y(): BigInt {
-    return this[1].toBigInt();
-  }
-}
-
-export class MACI__treeDepthsResult {
-  value0: i32;
-  value1: i32;
-  value2: i32;
-
-  constructor(value0: i32, value1: i32, value2: i32) {
-    this.value0 = value0;
-    this.value1 = value1;
-    this.value2 = value2;
-  }
-
-  toMap(): TypedMap<string, ethereum.Value> {
-    let map = new TypedMap<string, ethereum.Value>();
-    map.set(
-      "value0",
-      ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value0))
-    );
-    map.set(
-      "value1",
-      ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value1))
-    );
-    map.set(
-      "value2",
-      ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(this.value2))
-    );
-    return map;
-  }
-}
-
-export class MACI extends ethereum.SmartContract {
-  static bind(address: Address): MACI {
-    return new MACI("MACI", address);
-  }
-
-  calcEmptyVoteOptionTreeRoot(_levels: i32): BigInt {
-    let result = super.call(
-      "calcEmptyVoteOptionTreeRoot",
-      "calcEmptyVoteOptionTreeRoot(uint8):(uint256)",
-      [ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(_levels))]
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_calcEmptyVoteOptionTreeRoot(_levels: i32): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "calcEmptyVoteOptionTreeRoot",
-      "calcEmptyVoteOptionTreeRoot(uint8):(uint256)",
-      [ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(_levels))]
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  calcSignUpDeadline(): BigInt {
-    let result = super.call(
-      "calcSignUpDeadline",
-      "calcSignUpDeadline():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_calcSignUpDeadline(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "calcSignUpDeadline",
-      "calcSignUpDeadline():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  calcVotingDeadline(): BigInt {
-    let result = super.call(
-      "calcVotingDeadline",
-      "calcVotingDeadline():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_calcVotingDeadline(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "calcVotingDeadline",
-      "calcVotingDeadline():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  computeEmptyQuinRoot(_treeLevels: i32, _zeroValue: BigInt): BigInt {
-    let result = super.call(
-      "computeEmptyQuinRoot",
-      "computeEmptyQuinRoot(uint8,uint256):(uint256)",
-      [
-        ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(_treeLevels)),
-        ethereum.Value.fromUnsignedBigInt(_zeroValue)
-      ]
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_computeEmptyQuinRoot(
-    _treeLevels: i32,
-    _zeroValue: BigInt
-  ): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "computeEmptyQuinRoot",
-      "computeEmptyQuinRoot(uint8,uint256):(uint256)",
-      [
-        ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(_treeLevels)),
-        ethereum.Value.fromUnsignedBigInt(_zeroValue)
-      ]
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  computeEmptyRoot(_treeLevels: i32, _zeroValue: BigInt): BigInt {
-    let result = super.call(
-      "computeEmptyRoot",
-      "computeEmptyRoot(uint8,uint256):(uint256)",
-      [
-        ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(_treeLevels)),
-        ethereum.Value.fromUnsignedBigInt(_zeroValue)
-      ]
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_computeEmptyRoot(
-    _treeLevels: i32,
-    _zeroValue: BigInt
-  ): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "computeEmptyRoot",
-      "computeEmptyRoot(uint8,uint256):(uint256)",
-      [
-        ethereum.Value.fromUnsignedBigInt(BigInt.fromI32(_treeLevels)),
-        ethereum.Value.fromUnsignedBigInt(_zeroValue)
-      ]
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  coordinatorAddress(): Address {
-    let result = super.call(
-      "coordinatorAddress",
-      "coordinatorAddress():(address)",
-      []
-    );
-
-    return result[0].toAddress();
-  }
-
-  try_coordinatorAddress(): ethereum.CallResult<Address> {
-    let result = super.tryCall(
-      "coordinatorAddress",
-      "coordinatorAddress():(address)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toAddress());
-  }
-
-  coordinatorPubKey(): MACI__coordinatorPubKeyResult {
-    let result = super.call(
-      "coordinatorPubKey",
-      "coordinatorPubKey():(uint256,uint256)",
-      []
-    );
-
-    return new MACI__coordinatorPubKeyResult(
-      result[0].toBigInt(),
-      result[1].toBigInt()
-    );
-  }
-
-  try_coordinatorPubKey(): ethereum.CallResult<MACI__coordinatorPubKeyResult> {
-    let result = super.tryCall(
-      "coordinatorPubKey",
-      "coordinatorPubKey():(uint256,uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(
-      new MACI__coordinatorPubKeyResult(
-        value[0].toBigInt(),
-        value[1].toBigInt()
-      )
-    );
-  }
-
-  currentMessageBatchIndex(): BigInt {
-    let result = super.call(
-      "currentMessageBatchIndex",
-      "currentMessageBatchIndex():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_currentMessageBatchIndex(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "currentMessageBatchIndex",
-      "currentMessageBatchIndex():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  currentPerVOSpentVoiceCreditsCommitment(): BigInt {
-    let result = super.call(
-      "currentPerVOSpentVoiceCreditsCommitment",
-      "currentPerVOSpentVoiceCreditsCommitment():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_currentPerVOSpentVoiceCreditsCommitment(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "currentPerVOSpentVoiceCreditsCommitment",
-      "currentPerVOSpentVoiceCreditsCommitment():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  currentQvtBatchNum(): BigInt {
-    let result = super.call(
-      "currentQvtBatchNum",
-      "currentQvtBatchNum():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_currentQvtBatchNum(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "currentQvtBatchNum",
-      "currentQvtBatchNum():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  currentResultsCommitment(): BigInt {
-    let result = super.call(
-      "currentResultsCommitment",
-      "currentResultsCommitment():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_currentResultsCommitment(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "currentResultsCommitment",
-      "currentResultsCommitment():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  currentSpentVoiceCreditsCommitment(): BigInt {
-    let result = super.call(
-      "currentSpentVoiceCreditsCommitment",
-      "currentSpentVoiceCreditsCommitment():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_currentSpentVoiceCreditsCommitment(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "currentSpentVoiceCreditsCommitment",
-      "currentSpentVoiceCreditsCommitment():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  emptyVoteOptionTreeRoot(): BigInt {
-    let result = super.call(
-      "emptyVoteOptionTreeRoot",
-      "emptyVoteOptionTreeRoot():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_emptyVoteOptionTreeRoot(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "emptyVoteOptionTreeRoot",
-      "emptyVoteOptionTreeRoot():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  genBatchUstPublicSignals(
-    _newStateRoot: BigInt,
-    _ecdhPubKeys: Array<MACI__genBatchUstPublicSignalsInput_ecdhPubKeysStruct>
-  ): Array<BigInt> {
-    let result = super.call(
-      "genBatchUstPublicSignals",
-      "genBatchUstPublicSignals(uint256,(uint256,uint256)[]):(uint256[])",
-      [
-        ethereum.Value.fromUnsignedBigInt(_newStateRoot),
-        ethereum.Value.fromTupleArray(_ecdhPubKeys)
-      ]
-    );
-
-    return result[0].toBigIntArray();
-  }
-
-  try_genBatchUstPublicSignals(
-    _newStateRoot: BigInt,
-    _ecdhPubKeys: Array<MACI__genBatchUstPublicSignalsInput_ecdhPubKeysStruct>
-  ): ethereum.CallResult<Array<BigInt>> {
-    let result = super.tryCall(
-      "genBatchUstPublicSignals",
-      "genBatchUstPublicSignals(uint256,(uint256,uint256)[]):(uint256[])",
-      [
-        ethereum.Value.fromUnsignedBigInt(_newStateRoot),
-        ethereum.Value.fromTupleArray(_ecdhPubKeys)
-      ]
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigIntArray());
-  }
-
-  genQvtPublicSignals(
-    _intermediateStateRoot: BigInt,
-    _newResultsCommitment: BigInt,
-    _newSpentVoiceCreditsCommitment: BigInt,
-    _newPerVOSpentVoiceCreditsCommitment: BigInt,
-    _totalVotes: BigInt
-  ): Array<BigInt> {
-    let result = super.call(
-      "genQvtPublicSignals",
-      "genQvtPublicSignals(uint256,uint256,uint256,uint256,uint256):(uint256[])",
-      [
-        ethereum.Value.fromUnsignedBigInt(_intermediateStateRoot),
-        ethereum.Value.fromUnsignedBigInt(_newResultsCommitment),
-        ethereum.Value.fromUnsignedBigInt(_newSpentVoiceCreditsCommitment),
-        ethereum.Value.fromUnsignedBigInt(_newPerVOSpentVoiceCreditsCommitment),
-        ethereum.Value.fromUnsignedBigInt(_totalVotes)
-      ]
-    );
-
-    return result[0].toBigIntArray();
-  }
-
-  try_genQvtPublicSignals(
-    _intermediateStateRoot: BigInt,
-    _newResultsCommitment: BigInt,
-    _newSpentVoiceCreditsCommitment: BigInt,
-    _newPerVOSpentVoiceCreditsCommitment: BigInt,
-    _totalVotes: BigInt
-  ): ethereum.CallResult<Array<BigInt>> {
-    let result = super.tryCall(
-      "genQvtPublicSignals",
-      "genQvtPublicSignals(uint256,uint256,uint256,uint256,uint256):(uint256[])",
-      [
-        ethereum.Value.fromUnsignedBigInt(_intermediateStateRoot),
-        ethereum.Value.fromUnsignedBigInt(_newResultsCommitment),
-        ethereum.Value.fromUnsignedBigInt(_newSpentVoiceCreditsCommitment),
-        ethereum.Value.fromUnsignedBigInt(_newPerVOSpentVoiceCreditsCommitment),
-        ethereum.Value.fromUnsignedBigInt(_totalVotes)
-      ]
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigIntArray());
-  }
-
-  getMessageTreeRoot(): BigInt {
-    let result = super.call(
-      "getMessageTreeRoot",
-      "getMessageTreeRoot():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_getMessageTreeRoot(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "getMessageTreeRoot",
-      "getMessageTreeRoot():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  getStateTreeRoot(): BigInt {
-    let result = super.call(
-      "getStateTreeRoot",
-      "getStateTreeRoot():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_getStateTreeRoot(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "getStateTreeRoot",
-      "getStateTreeRoot():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  hasUnprocessedMessages(): boolean {
-    let result = super.call(
-      "hasUnprocessedMessages",
-      "hasUnprocessedMessages():(bool)",
-      []
-    );
-
-    return result[0].toBoolean();
-  }
-
-  try_hasUnprocessedMessages(): ethereum.CallResult<boolean> {
-    let result = super.tryCall(
-      "hasUnprocessedMessages",
-      "hasUnprocessedMessages():(bool)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBoolean());
-  }
-
-  hasUntalliedStateLeaves(): boolean {
-    let result = super.call(
-      "hasUntalliedStateLeaves",
-      "hasUntalliedStateLeaves():(bool)",
-      []
-    );
-
-    return result[0].toBoolean();
-  }
-
-  try_hasUntalliedStateLeaves(): ethereum.CallResult<boolean> {
-    let result = super.tryCall(
-      "hasUntalliedStateLeaves",
-      "hasUntalliedStateLeaves():(bool)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBoolean());
-  }
-
-  hash11(array: Array<BigInt>): BigInt {
-    let result = super.call("hash11", "hash11(uint256[]):(uint256)", [
-      ethereum.Value.fromUnsignedBigIntArray(array)
-    ]);
-
-    return result[0].toBigInt();
-  }
-
-  try_hash11(array: Array<BigInt>): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("hash11", "hash11(uint256[]):(uint256)", [
-      ethereum.Value.fromUnsignedBigIntArray(array)
-    ]);
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  hash5(array: Array<BigInt>): BigInt {
-    let result = super.call("hash5", "hash5(uint256[5]):(uint256)", [
-      ethereum.Value.fromUnsignedBigIntArray(array)
-    ]);
-
-    return result[0].toBigInt();
-  }
-
-  try_hash5(array: Array<BigInt>): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("hash5", "hash5(uint256[5]):(uint256)", [
-      ethereum.Value.fromUnsignedBigIntArray(array)
-    ]);
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  hashLeftRight(_left: BigInt, _right: BigInt): BigInt {
-    let result = super.call(
-      "hashLeftRight",
-      "hashLeftRight(uint256,uint256):(uint256)",
-      [
-        ethereum.Value.fromUnsignedBigInt(_left),
-        ethereum.Value.fromUnsignedBigInt(_right)
-      ]
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_hashLeftRight(
-    _left: BigInt,
-    _right: BigInt
-  ): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "hashLeftRight",
-      "hashLeftRight(uint256,uint256):(uint256)",
-      [
-        ethereum.Value.fromUnsignedBigInt(_left),
-        ethereum.Value.fromUnsignedBigInt(_right)
-      ]
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  hashMessage(_message: MACI__hashMessageInput_messageStruct): BigInt {
-    let result = super.call(
-      "hashMessage",
-      "hashMessage((uint256,uint256[10])):(uint256)",
-      [ethereum.Value.fromTuple(_message)]
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_hashMessage(
-    _message: MACI__hashMessageInput_messageStruct
-  ): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "hashMessage",
-      "hashMessage((uint256,uint256[10])):(uint256)",
-      [ethereum.Value.fromTuple(_message)]
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  hashStateLeaf(_stateLeaf: MACI__hashStateLeafInput_stateLeafStruct): BigInt {
-    let result = super.call(
-      "hashStateLeaf",
-      "hashStateLeaf(((uint256,uint256),uint256,uint256,uint256)):(uint256)",
-      [ethereum.Value.fromTuple(_stateLeaf)]
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_hashStateLeaf(
-    _stateLeaf: MACI__hashStateLeafInput_stateLeafStruct
-  ): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "hashStateLeaf",
-      "hashStateLeaf(((uint256,uint256),uint256,uint256,uint256)):(uint256)",
-      [ethereum.Value.fromTuple(_stateLeaf)]
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  hashedBlankStateLeaf(): BigInt {
-    let result = super.call(
-      "hashedBlankStateLeaf",
-      "hashedBlankStateLeaf():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_hashedBlankStateLeaf(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "hashedBlankStateLeaf",
-      "hashedBlankStateLeaf():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  initialVoiceCreditProxy(): Address {
-    let result = super.call(
-      "initialVoiceCreditProxy",
-      "initialVoiceCreditProxy():(address)",
-      []
-    );
-
-    return result[0].toAddress();
-  }
-
-  try_initialVoiceCreditProxy(): ethereum.CallResult<Address> {
-    let result = super.tryCall(
-      "initialVoiceCreditProxy",
-      "initialVoiceCreditProxy():(address)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toAddress());
-  }
-
-  maxMessages(): BigInt {
-    let result = super.call("maxMessages", "maxMessages():(uint256)", []);
-
-    return result[0].toBigInt();
-  }
-
-  try_maxMessages(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("maxMessages", "maxMessages():(uint256)", []);
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  maxUsers(): BigInt {
-    let result = super.call("maxUsers", "maxUsers():(uint256)", []);
-
-    return result[0].toBigInt();
-  }
-
-  try_maxUsers(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("maxUsers", "maxUsers():(uint256)", []);
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  messageBatchSize(): i32 {
-    let result = super.call(
-      "messageBatchSize",
-      "messageBatchSize():(uint8)",
-      []
-    );
-
-    return result[0].toI32();
-  }
-
-  try_messageBatchSize(): ethereum.CallResult<i32> {
-    let result = super.tryCall(
-      "messageBatchSize",
-      "messageBatchSize():(uint8)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toI32());
-  }
-
-  messageTree(): Address {
-    let result = super.call("messageTree", "messageTree():(address)", []);
-
-    return result[0].toAddress();
-  }
-
-  try_messageTree(): ethereum.CallResult<Address> {
-    let result = super.tryCall("messageTree", "messageTree():(address)", []);
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toAddress());
-  }
-
-  messageTreeMaxLeafIndex(): BigInt {
-    let result = super.call(
-      "messageTreeMaxLeafIndex",
-      "messageTreeMaxLeafIndex():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_messageTreeMaxLeafIndex(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "messageTreeMaxLeafIndex",
-      "messageTreeMaxLeafIndex():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  numMessages(): BigInt {
-    let result = super.call("numMessages", "numMessages():(uint256)", []);
-
-    return result[0].toBigInt();
-  }
-
-  try_numMessages(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("numMessages", "numMessages():(uint256)", []);
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  numSignUps(): BigInt {
-    let result = super.call("numSignUps", "numSignUps():(uint256)", []);
-
-    return result[0].toBigInt();
-  }
-
-  try_numSignUps(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("numSignUps", "numSignUps():(uint256)", []);
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  originalCurrentResultsCommitment(): BigInt {
-    let result = super.call(
-      "originalCurrentResultsCommitment",
-      "originalCurrentResultsCommitment():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_originalCurrentResultsCommitment(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "originalCurrentResultsCommitment",
-      "originalCurrentResultsCommitment():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  originalSpentVoiceCreditsCommitment(): BigInt {
-    let result = super.call(
-      "originalSpentVoiceCreditsCommitment",
-      "originalSpentVoiceCreditsCommitment():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_originalSpentVoiceCreditsCommitment(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "originalSpentVoiceCreditsCommitment",
-      "originalSpentVoiceCreditsCommitment():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  signUpDurationSeconds(): BigInt {
-    let result = super.call(
-      "signUpDurationSeconds",
-      "signUpDurationSeconds():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_signUpDurationSeconds(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "signUpDurationSeconds",
-      "signUpDurationSeconds():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  signUpGatekeeper(): Address {
-    let result = super.call(
-      "signUpGatekeeper",
-      "signUpGatekeeper():(address)",
-      []
-    );
-
-    return result[0].toAddress();
-  }
-
-  try_signUpGatekeeper(): ethereum.CallResult<Address> {
-    let result = super.tryCall(
-      "signUpGatekeeper",
-      "signUpGatekeeper():(address)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toAddress());
-  }
-
-  signUpTimestamp(): BigInt {
-    let result = super.call(
-      "signUpTimestamp",
-      "signUpTimestamp():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_signUpTimestamp(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "signUpTimestamp",
-      "signUpTimestamp():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  stateRoot(): BigInt {
-    let result = super.call("stateRoot", "stateRoot():(uint256)", []);
-
-    return result[0].toBigInt();
-  }
-
-  try_stateRoot(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("stateRoot", "stateRoot():(uint256)", []);
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  stateRootBeforeProcessing(): BigInt {
-    let result = super.call(
-      "stateRootBeforeProcessing",
-      "stateRootBeforeProcessing():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_stateRootBeforeProcessing(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "stateRootBeforeProcessing",
-      "stateRootBeforeProcessing():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  stateTree(): Address {
-    let result = super.call("stateTree", "stateTree():(address)", []);
-
-    return result[0].toAddress();
-  }
-
-  try_stateTree(): ethereum.CallResult<Address> {
-    let result = super.tryCall("stateTree", "stateTree():(address)", []);
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toAddress());
-  }
-
-  tallyBatchSize(): i32 {
-    let result = super.call("tallyBatchSize", "tallyBatchSize():(uint8)", []);
-
-    return result[0].toI32();
-  }
-
-  try_tallyBatchSize(): ethereum.CallResult<i32> {
-    let result = super.tryCall(
-      "tallyBatchSize",
-      "tallyBatchSize():(uint8)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toI32());
-  }
-
-  totalVotes(): BigInt {
-    let result = super.call("totalVotes", "totalVotes():(uint256)", []);
-
-    return result[0].toBigInt();
-  }
-
-  try_totalVotes(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("totalVotes", "totalVotes():(uint256)", []);
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  treeDepths(): MACI__treeDepthsResult {
-    let result = super.call(
-      "treeDepths",
-      "treeDepths():(uint8,uint8,uint8)",
-      []
-    );
-
-    return new MACI__treeDepthsResult(
-      result[0].toI32(),
-      result[1].toI32(),
-      result[2].toI32()
-    );
-  }
-
-  try_treeDepths(): ethereum.CallResult<MACI__treeDepthsResult> {
-    let result = super.tryCall(
-      "treeDepths",
-      "treeDepths():(uint8,uint8,uint8)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(
-      new MACI__treeDepthsResult(
-        value[0].toI32(),
-        value[1].toI32(),
-        value[2].toI32()
-      )
-    );
-  }
-
-  verifySpentVoiceCredits(_spent: BigInt, _salt: BigInt): boolean {
-    let result = super.call(
-      "verifySpentVoiceCredits",
-      "verifySpentVoiceCredits(uint256,uint256):(bool)",
-      [
-        ethereum.Value.fromUnsignedBigInt(_spent),
-        ethereum.Value.fromUnsignedBigInt(_salt)
-      ]
-    );
-
-    return result[0].toBoolean();
-  }
-
-  try_verifySpentVoiceCredits(
-    _spent: BigInt,
-    _salt: BigInt
-  ): ethereum.CallResult<boolean> {
-    let result = super.tryCall(
-      "verifySpentVoiceCredits",
-      "verifySpentVoiceCredits(uint256,uint256):(bool)",
-      [
-        ethereum.Value.fromUnsignedBigInt(_spent),
-        ethereum.Value.fromUnsignedBigInt(_salt)
-      ]
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBoolean());
-  }
-
-  voteOptionsMaxLeafIndex(): BigInt {
-    let result = super.call(
-      "voteOptionsMaxLeafIndex",
-      "voteOptionsMaxLeafIndex():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_voteOptionsMaxLeafIndex(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "voteOptionsMaxLeafIndex",
-      "voteOptionsMaxLeafIndex():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  votingDurationSeconds(): BigInt {
-    let result = super.call(
-      "votingDurationSeconds",
-      "votingDurationSeconds():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_votingDurationSeconds(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "votingDurationSeconds",
-      "votingDurationSeconds():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-}
-
-export class ConstructorCall extends ethereum.Call {
-  get inputs(): ConstructorCall__Inputs {
-    return new ConstructorCall__Inputs(this);
-  }
-
-  get outputs(): ConstructorCall__Outputs {
-    return new ConstructorCall__Outputs(this);
-  }
-}
-
-export class ConstructorCall__Inputs {
-  _call: ConstructorCall;
-
-  constructor(call: ConstructorCall) {
-    this._call = call;
-  }
-
-  get _treeDepths(): ConstructorCall_treeDepthsStruct {
-    return this._call.inputValues[0].value.toTuple() as ConstructorCall_treeDepthsStruct;
-  }
-
-  get _batchSizes(): ConstructorCall_batchSizesStruct {
-    return this._call.inputValues[1].value.toTuple() as ConstructorCall_batchSizesStruct;
-  }
-
-  get _maxValues(): ConstructorCall_maxValuesStruct {
-    return this._call.inputValues[2].value.toTuple() as ConstructorCall_maxValuesStruct;
-  }
-
-  get _signUpGatekeeper(): Address {
-    return this._call.inputValues[3].value.toAddress();
-  }
-
-  get _batchUstVerifier(): Address {
-    return this._call.inputValues[4].value.toAddress();
-  }
-
-  get _qvtVerifier(): Address {
-    return this._call.inputValues[5].value.toAddress();
-  }
-
-  get _signUpDurationSeconds(): BigInt {
-    return this._call.inputValues[6].value.toBigInt();
-  }
-
-  get _votingDurationSeconds(): BigInt {
-    return this._call.inputValues[7].value.toBigInt();
-  }
-
-  get _initialVoiceCreditProxy(): Address {
-    return this._call.inputValues[8].value.toAddress();
-  }
-
-  get _coordinatorPubKey(): ConstructorCall_coordinatorPubKeyStruct {
-    return this._call.inputValues[9].value.toTuple() as ConstructorCall_coordinatorPubKeyStruct;
-  }
-
-  get _coordinatorAddress(): Address {
-    return this._call.inputValues[10].value.toAddress();
-  }
-}
-
-export class ConstructorCall__Outputs {
-  _call: ConstructorCall;
-
-  constructor(call: ConstructorCall) {
-    this._call = call;
-  }
-}
-
-export class ConstructorCall_treeDepthsStruct extends ethereum.Tuple {
-  get stateTreeDepth(): i32 {
-    return this[0].toI32();
-  }
-
-  get messageTreeDepth(): i32 {
-    return this[1].toI32();
-  }
-
-  get voteOptionTreeDepth(): i32 {
-    return this[2].toI32();
-  }
-}
-
-export class ConstructorCall_batchSizesStruct extends ethereum.Tuple {
-  get tallyBatchSize(): i32 {
-    return this[0].toI32();
-  }
-
-  get messageBatchSize(): i32 {
-    return this[1].toI32();
-  }
-}
-
-export class ConstructorCall_maxValuesStruct extends ethereum.Tuple {
-  get maxUsers(): BigInt {
-    return this[0].toBigInt();
-  }
-
-  get maxMessages(): BigInt {
-    return this[1].toBigInt();
-  }
-
-  get maxVoteOptions(): BigInt {
-    return this[2].toBigInt();
-  }
-}
-
-export class ConstructorCall_coordinatorPubKeyStruct extends ethereum.Tuple {
-  get x(): BigInt {
-    return this[0].toBigInt();
-  }
-
-  get y(): BigInt {
-    return this[1].toBigInt();
-  }
-}
-
-export class BatchProcessMessageCall extends ethereum.Call {
-  get inputs(): BatchProcessMessageCall__Inputs {
-    return new BatchProcessMessageCall__Inputs(this);
-  }
-
-  get outputs(): BatchProcessMessageCall__Outputs {
-    return new BatchProcessMessageCall__Outputs(this);
-  }
-}
-
-export class BatchProcessMessageCall__Inputs {
-  _call: BatchProcessMessageCall;
-
-  constructor(call: BatchProcessMessageCall) {
-    this._call = call;
-  }
-
-  get _newStateRoot(): BigInt {
-    return this._call.inputValues[0].value.toBigInt();
-  }
-
-  get _ecdhPubKeys(): Array<BatchProcessMessageCall_ecdhPubKeysStruct> {
-    return this._call.inputValues[1].value.toTupleArray<
-      BatchProcessMessageCall_ecdhPubKeysStruct
-    >();
-  }
-
-  get _proof(): Array<BigInt> {
-    return this._call.inputValues[2].value.toBigIntArray();
-  }
-}
-
-export class BatchProcessMessageCall__Outputs {
-  _call: BatchProcessMessageCall;
-
-  constructor(call: BatchProcessMessageCall) {
-    this._call = call;
-  }
-}
-
-export class BatchProcessMessageCall_ecdhPubKeysStruct extends ethereum.Tuple {
-  get x(): BigInt {
-    return this[0].toBigInt();
-  }
-
-  get y(): BigInt {
-    return this[1].toBigInt();
-  }
-}
-
-export class CoordinatorResetCall extends ethereum.Call {
-  get inputs(): CoordinatorResetCall__Inputs {
-    return new CoordinatorResetCall__Inputs(this);
-  }
-
-  get outputs(): CoordinatorResetCall__Outputs {
-    return new CoordinatorResetCall__Outputs(this);
-  }
-}
-
-export class CoordinatorResetCall__Inputs {
-  _call: CoordinatorResetCall;
-
-  constructor(call: CoordinatorResetCall) {
-    this._call = call;
-  }
-}
-
-export class CoordinatorResetCall__Outputs {
-  _call: CoordinatorResetCall;
-
-  constructor(call: CoordinatorResetCall) {
-    this._call = call;
-  }
-}
-
-export class ProveVoteTallyBatchCall extends ethereum.Call {
-  get inputs(): ProveVoteTallyBatchCall__Inputs {
-    return new ProveVoteTallyBatchCall__Inputs(this);
-  }
-
-  get outputs(): ProveVoteTallyBatchCall__Outputs {
-    return new ProveVoteTallyBatchCall__Outputs(this);
-  }
-}
-
-export class ProveVoteTallyBatchCall__Inputs {
-  _call: ProveVoteTallyBatchCall;
-
-  constructor(call: ProveVoteTallyBatchCall) {
-    this._call = call;
-  }
-
-  get _intermediateStateRoot(): BigInt {
-    return this._call.inputValues[0].value.toBigInt();
-  }
-
-  get _newResultsCommitment(): BigInt {
-    return this._call.inputValues[1].value.toBigInt();
-  }
-
-  get _newSpentVoiceCreditsCommitment(): BigInt {
-    return this._call.inputValues[2].value.toBigInt();
-  }
-
-  get _newPerVOSpentVoiceCreditsCommitment(): BigInt {
-    return this._call.inputValues[3].value.toBigInt();
-  }
-
-  get _totalVotes(): BigInt {
-    return this._call.inputValues[4].value.toBigInt();
-  }
-
-  get _proof(): Array<BigInt> {
-    return this._call.inputValues[5].value.toBigIntArray();
-  }
-}
-
-export class ProveVoteTallyBatchCall__Outputs {
-  _call: ProveVoteTallyBatchCall;
-
-  constructor(call: ProveVoteTallyBatchCall) {
-    this._call = call;
-  }
-}
-
-export class PublishMessageCall extends ethereum.Call {
-  get inputs(): PublishMessageCall__Inputs {
-    return new PublishMessageCall__Inputs(this);
-  }
-
-  get outputs(): PublishMessageCall__Outputs {
-    return new PublishMessageCall__Outputs(this);
-  }
-}
-
-export class PublishMessageCall__Inputs {
-  _call: PublishMessageCall;
-
-  constructor(call: PublishMessageCall) {
-    this._call = call;
-  }
-
-  get _message(): PublishMessageCall_messageStruct {
-    return this._call.inputValues[0].value.toTuple() as PublishMessageCall_messageStruct;
-  }
-
-  get _encPubKey(): PublishMessageCall_encPubKeyStruct {
-    return this._call.inputValues[1].value.toTuple() as PublishMessageCall_encPubKeyStruct;
-  }
-}
-
-export class PublishMessageCall__Outputs {
-  _call: PublishMessageCall;
-
-  constructor(call: PublishMessageCall) {
-    this._call = call;
-  }
-}
-
-export class PublishMessageCall_messageStruct extends ethereum.Tuple {
-  get iv(): BigInt {
-    return this[0].toBigInt();
-  }
-
-  get data(): Array<BigInt> {
-    return this[1].toBigIntArray();
-  }
-}
-
-export class PublishMessageCall_encPubKeyStruct extends ethereum.Tuple {
-  get x(): BigInt {
-    return this[0].toBigInt();
-  }
-
-  get y(): BigInt {
-    return this[1].toBigInt();
-  }
-}
-
-export class SignUpCall extends ethereum.Call {
-  get inputs(): SignUpCall__Inputs {
-    return new SignUpCall__Inputs(this);
-  }
-
-  get outputs(): SignUpCall__Outputs {
-    return new SignUpCall__Outputs(this);
-  }
-}
-
-export class SignUpCall__Inputs {
-  _call: SignUpCall;
-
-  constructor(call: SignUpCall) {
-    this._call = call;
-  }
-
-  get _userPubKey(): SignUpCall_userPubKeyStruct {
-    return this._call.inputValues[0].value.toTuple() as SignUpCall_userPubKeyStruct;
-  }
-
-  get _signUpGatekeeperData(): Bytes {
-    return this._call.inputValues[1].value.toBytes();
-  }
-
-  get _initialVoiceCreditProxyData(): Bytes {
-    return this._call.inputValues[2].value.toBytes();
-  }
-}
-
-export class SignUpCall__Outputs {
-  _call: SignUpCall;
-
-  constructor(call: SignUpCall) {
-    this._call = call;
-  }
-}
-
-export class SignUpCall_userPubKeyStruct extends ethereum.Tuple {
-  get x(): BigInt {
-    return this[0].toBigInt();
-  }
-
-  get y(): BigInt {
-    return this[1].toBigInt();
-  }
-}
diff --git a/subgraph/generated/UniversalRecipientRegistry/UniversalRecipientRegistry.ts b/subgraph/generated/UniversalRecipientRegistry/UniversalRecipientRegistry.ts
deleted file mode 100644
index fd3246a96..000000000
--- a/subgraph/generated/UniversalRecipientRegistry/UniversalRecipientRegistry.ts
+++ /dev/null
@@ -1,638 +0,0 @@
-// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
-
-import {
-  ethereum,
-  JSONValue,
-  TypedMap,
-  Entity,
-  Bytes,
-  Address,
-  BigInt
-} from "@graphprotocol/graph-ts";
-
-export class OwnershipTransferred extends ethereum.Event {
-  get params(): OwnershipTransferred__Params {
-    return new OwnershipTransferred__Params(this);
-  }
-}
-
-export class OwnershipTransferred__Params {
-  _event: OwnershipTransferred;
-
-  constructor(event: OwnershipTransferred) {
-    this._event = event;
-  }
-
-  get previousOwner(): Address {
-    return this._event.parameters[0].value.toAddress();
-  }
-
-  get newOwner(): Address {
-    return this._event.parameters[1].value.toAddress();
-  }
-}
-
-export class RequestResolved extends ethereum.Event {
-  get params(): RequestResolved__Params {
-    return new RequestResolved__Params(this);
-  }
-}
-
-export class RequestResolved__Params {
-  _event: RequestResolved;
-
-  constructor(event: RequestResolved) {
-    this._event = event;
-  }
-
-  get _recipientId(): Bytes {
-    return this._event.parameters[0].value.toBytes();
-  }
-
-  get _type(): i32 {
-    return this._event.parameters[1].value.toI32();
-  }
-
-  get _rejected(): boolean {
-    return this._event.parameters[2].value.toBoolean();
-  }
-
-  get _recipientIndex(): BigInt {
-    return this._event.parameters[3].value.toBigInt();
-  }
-
-  get _timestamp(): BigInt {
-    return this._event.parameters[4].value.toBigInt();
-  }
-}
-
-export class RequestSubmitted extends ethereum.Event {
-  get params(): RequestSubmitted__Params {
-    return new RequestSubmitted__Params(this);
-  }
-}
-
-export class RequestSubmitted__Params {
-  _event: RequestSubmitted;
-
-  constructor(event: RequestSubmitted) {
-    this._event = event;
-  }
-
-  get _recipientId(): Bytes {
-    return this._event.parameters[0].value.toBytes();
-  }
-
-  get _type(): i32 {
-    return this._event.parameters[1].value.toI32();
-  }
-
-  get _recipient(): Address {
-    return this._event.parameters[2].value.toAddress();
-  }
-
-  get _metadataId(): string {
-    return this._event.parameters[3].value.toString();
-  }
-
-  get _timestamp(): BigInt {
-    return this._event.parameters[4].value.toBigInt();
-  }
-}
-
-export class UniversalRecipientRegistry extends ethereum.SmartContract {
-  static bind(address: Address): UniversalRecipientRegistry {
-    return new UniversalRecipientRegistry(
-      "UniversalRecipientRegistry",
-      address
-    );
-  }
-
-  baseDeposit(): BigInt {
-    let result = super.call("baseDeposit", "baseDeposit():(uint256)", []);
-
-    return result[0].toBigInt();
-  }
-
-  try_baseDeposit(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall("baseDeposit", "baseDeposit():(uint256)", []);
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  challengePeriodDuration(): BigInt {
-    let result = super.call(
-      "challengePeriodDuration",
-      "challengePeriodDuration():(uint256)",
-      []
-    );
-
-    return result[0].toBigInt();
-  }
-
-  try_challengePeriodDuration(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "challengePeriodDuration",
-      "challengePeriodDuration():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  challengeRequest(_recipientId: Bytes, _beneficiary: Address): boolean {
-    let result = super.call(
-      "challengeRequest",
-      "challengeRequest(bytes32,address):(bool)",
-      [
-        ethereum.Value.fromFixedBytes(_recipientId),
-        ethereum.Value.fromAddress(_beneficiary)
-      ]
-    );
-
-    return result[0].toBoolean();
-  }
-
-  try_challengeRequest(
-    _recipientId: Bytes,
-    _beneficiary: Address
-  ): ethereum.CallResult<boolean> {
-    let result = super.tryCall(
-      "challengeRequest",
-      "challengeRequest(bytes32,address):(bool)",
-      [
-        ethereum.Value.fromFixedBytes(_recipientId),
-        ethereum.Value.fromAddress(_beneficiary)
-      ]
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBoolean());
-  }
-
-  controller(): Address {
-    let result = super.call("controller", "controller():(address)", []);
-
-    return result[0].toAddress();
-  }
-
-  try_controller(): ethereum.CallResult<Address> {
-    let result = super.tryCall("controller", "controller():(address)", []);
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toAddress());
-  }
-
-  executeRequest(_recipientId: Bytes): boolean {
-    let result = super.call(
-      "executeRequest",
-      "executeRequest(bytes32):(bool)",
-      [ethereum.Value.fromFixedBytes(_recipientId)]
-    );
-
-    return result[0].toBoolean();
-  }
-
-  try_executeRequest(_recipientId: Bytes): ethereum.CallResult<boolean> {
-    let result = super.tryCall(
-      "executeRequest",
-      "executeRequest(bytes32):(bool)",
-      [ethereum.Value.fromFixedBytes(_recipientId)]
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBoolean());
-  }
-
-  getRecipientAddress(
-    _index: BigInt,
-    _startTime: BigInt,
-    _endTime: BigInt
-  ): Address {
-    let result = super.call(
-      "getRecipientAddress",
-      "getRecipientAddress(uint256,uint256,uint256):(address)",
-      [
-        ethereum.Value.fromUnsignedBigInt(_index),
-        ethereum.Value.fromUnsignedBigInt(_startTime),
-        ethereum.Value.fromUnsignedBigInt(_endTime)
-      ]
-    );
-
-    return result[0].toAddress();
-  }
-
-  try_getRecipientAddress(
-    _index: BigInt,
-    _startTime: BigInt,
-    _endTime: BigInt
-  ): ethereum.CallResult<Address> {
-    let result = super.tryCall(
-      "getRecipientAddress",
-      "getRecipientAddress(uint256,uint256,uint256):(address)",
-      [
-        ethereum.Value.fromUnsignedBigInt(_index),
-        ethereum.Value.fromUnsignedBigInt(_startTime),
-        ethereum.Value.fromUnsignedBigInt(_endTime)
-      ]
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toAddress());
-  }
-
-  maxRecipients(): BigInt {
-    let result = super.call("maxRecipients", "maxRecipients():(uint256)", []);
-
-    return result[0].toBigInt();
-  }
-
-  try_maxRecipients(): ethereum.CallResult<BigInt> {
-    let result = super.tryCall(
-      "maxRecipients",
-      "maxRecipients():(uint256)",
-      []
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBigInt());
-  }
-
-  owner(): Address {
-    let result = super.call("owner", "owner():(address)", []);
-
-    return result[0].toAddress();
-  }
-
-  try_owner(): ethereum.CallResult<Address> {
-    let result = super.tryCall("owner", "owner():(address)", []);
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toAddress());
-  }
-
-  setMaxRecipients(_maxRecipients: BigInt): boolean {
-    let result = super.call(
-      "setMaxRecipients",
-      "setMaxRecipients(uint256):(bool)",
-      [ethereum.Value.fromUnsignedBigInt(_maxRecipients)]
-    );
-
-    return result[0].toBoolean();
-  }
-
-  try_setMaxRecipients(_maxRecipients: BigInt): ethereum.CallResult<boolean> {
-    let result = super.tryCall(
-      "setMaxRecipients",
-      "setMaxRecipients(uint256):(bool)",
-      [ethereum.Value.fromUnsignedBigInt(_maxRecipients)]
-    );
-    if (result.reverted) {
-      return new ethereum.CallResult();
-    }
-    let value = result.value;
-    return ethereum.CallResult.fromValue(value[0].toBoolean());
-  }
-}
-
-export class ConstructorCall extends ethereum.Call {
-  get inputs(): ConstructorCall__Inputs {
-    return new ConstructorCall__Inputs(this);
-  }
-
-  get outputs(): ConstructorCall__Outputs {
-    return new ConstructorCall__Outputs(this);
-  }
-}
-
-export class ConstructorCall__Inputs {
-  _call: ConstructorCall;
-
-  constructor(call: ConstructorCall) {
-    this._call = call;
-  }
-
-  get _baseDeposit(): BigInt {
-    return this._call.inputValues[0].value.toBigInt();
-  }
-
-  get _challengePeriodDuration(): BigInt {
-    return this._call.inputValues[1].value.toBigInt();
-  }
-
-  get _controller(): Address {
-    return this._call.inputValues[2].value.toAddress();
-  }
-}
-
-export class ConstructorCall__Outputs {
-  _call: ConstructorCall;
-
-  constructor(call: ConstructorCall) {
-    this._call = call;
-  }
-}
-
-export class AddRecipientCall extends ethereum.Call {
-  get inputs(): AddRecipientCall__Inputs {
-    return new AddRecipientCall__Inputs(this);
-  }
-
-  get outputs(): AddRecipientCall__Outputs {
-    return new AddRecipientCall__Outputs(this);
-  }
-}
-
-export class AddRecipientCall__Inputs {
-  _call: AddRecipientCall;
-
-  constructor(call: AddRecipientCall) {
-    this._call = call;
-  }
-
-  get _recipient(): Address {
-    return this._call.inputValues[0].value.toAddress();
-  }
-
-  get _metadataId(): string {
-    return this._call.inputValues[1].value.toString();
-  }
-}
-
-export class AddRecipientCall__Outputs {
-  _call: AddRecipientCall;
-
-  constructor(call: AddRecipientCall) {
-    this._call = call;
-  }
-}
-
-export class ChallengeRequestCall extends ethereum.Call {
-  get inputs(): ChallengeRequestCall__Inputs {
-    return new ChallengeRequestCall__Inputs(this);
-  }
-
-  get outputs(): ChallengeRequestCall__Outputs {
-    return new ChallengeRequestCall__Outputs(this);
-  }
-}
-
-export class ChallengeRequestCall__Inputs {
-  _call: ChallengeRequestCall;
-
-  constructor(call: ChallengeRequestCall) {
-    this._call = call;
-  }
-
-  get _recipientId(): Bytes {
-    return this._call.inputValues[0].value.toBytes();
-  }
-
-  get _beneficiary(): Address {
-    return this._call.inputValues[1].value.toAddress();
-  }
-}
-
-export class ChallengeRequestCall__Outputs {
-  _call: ChallengeRequestCall;
-
-  constructor(call: ChallengeRequestCall) {
-    this._call = call;
-  }
-
-  get value0(): boolean {
-    return this._call.outputValues[0].value.toBoolean();
-  }
-}
-
-export class ExecuteRequestCall extends ethereum.Call {
-  get inputs(): ExecuteRequestCall__Inputs {
-    return new ExecuteRequestCall__Inputs(this);
-  }
-
-  get outputs(): ExecuteRequestCall__Outputs {
-    return new ExecuteRequestCall__Outputs(this);
-  }
-}
-
-export class ExecuteRequestCall__Inputs {
-  _call: ExecuteRequestCall;
-
-  constructor(call: ExecuteRequestCall) {
-    this._call = call;
-  }
-
-  get _recipientId(): Bytes {
-    return this._call.inputValues[0].value.toBytes();
-  }
-}
-
-export class ExecuteRequestCall__Outputs {
-  _call: ExecuteRequestCall;
-
-  constructor(call: ExecuteRequestCall) {
-    this._call = call;
-  }
-
-  get value0(): boolean {
-    return this._call.outputValues[0].value.toBoolean();
-  }
-}
-
-export class RemoveRecipientCall extends ethereum.Call {
-  get inputs(): RemoveRecipientCall__Inputs {
-    return new RemoveRecipientCall__Inputs(this);
-  }
-
-  get outputs(): RemoveRecipientCall__Outputs {
-    return new RemoveRecipientCall__Outputs(this);
-  }
-}
-
-export class RemoveRecipientCall__Inputs {
-  _call: RemoveRecipientCall;
-
-  constructor(call: RemoveRecipientCall) {
-    this._call = call;
-  }
-
-  get _recipientId(): Bytes {
-    return this._call.inputValues[0].value.toBytes();
-  }
-}
-
-export class RemoveRecipientCall__Outputs {
-  _call: RemoveRecipientCall;
-
-  constructor(call: RemoveRecipientCall) {
-    this._call = call;
-  }
-}
-
-export class RenounceOwnershipCall extends ethereum.Call {
-  get inputs(): RenounceOwnershipCall__Inputs {
-    return new RenounceOwnershipCall__Inputs(this);
-  }
-
-  get outputs(): RenounceOwnershipCall__Outputs {
-    return new RenounceOwnershipCall__Outputs(this);
-  }
-}
-
-export class RenounceOwnershipCall__Inputs {
-  _call: RenounceOwnershipCall;
-
-  constructor(call: RenounceOwnershipCall) {
-    this._call = call;
-  }
-}
-
-export class RenounceOwnershipCall__Outputs {
-  _call: RenounceOwnershipCall;
-
-  constructor(call: RenounceOwnershipCall) {
-    this._call = call;
-  }
-}
-
-export class SetBaseDepositCall extends ethereum.Call {
-  get inputs(): SetBaseDepositCall__Inputs {
-    return new SetBaseDepositCall__Inputs(this);
-  }
-
-  get outputs(): SetBaseDepositCall__Outputs {
-    return new SetBaseDepositCall__Outputs(this);
-  }
-}
-
-export class SetBaseDepositCall__Inputs {
-  _call: SetBaseDepositCall;
-
-  constructor(call: SetBaseDepositCall) {
-    this._call = call;
-  }
-
-  get _baseDeposit(): BigInt {
-    return this._call.inputValues[0].value.toBigInt();
-  }
-}
-
-export class SetBaseDepositCall__Outputs {
-  _call: SetBaseDepositCall;
-
-  constructor(call: SetBaseDepositCall) {
-    this._call = call;
-  }
-}
-
-export class SetChallengePeriodDurationCall extends ethereum.Call {
-  get inputs(): SetChallengePeriodDurationCall__Inputs {
-    return new SetChallengePeriodDurationCall__Inputs(this);
-  }
-
-  get outputs(): SetChallengePeriodDurationCall__Outputs {
-    return new SetChallengePeriodDurationCall__Outputs(this);
-  }
-}
-
-export class SetChallengePeriodDurationCall__Inputs {
-  _call: SetChallengePeriodDurationCall;
-
-  constructor(call: SetChallengePeriodDurationCall) {
-    this._call = call;
-  }
-
-  get _challengePeriodDuration(): BigInt {
-    return this._call.inputValues[0].value.toBigInt();
-  }
-}
-
-export class SetChallengePeriodDurationCall__Outputs {
-  _call: SetChallengePeriodDurationCall;
-
-  constructor(call: SetChallengePeriodDurationCall) {
-    this._call = call;
-  }
-}
-
-export class SetMaxRecipientsCall extends ethereum.Call {
-  get inputs(): SetMaxRecipientsCall__Inputs {
-    return new SetMaxRecipientsCall__Inputs(this);
-  }
-
-  get outputs(): SetMaxRecipientsCall__Outputs {
-    return new SetMaxRecipientsCall__Outputs(this);
-  }
-}
-
-export class SetMaxRecipientsCall__Inputs {
-  _call: SetMaxRecipientsCall;
-
-  constructor(call: SetMaxRecipientsCall) {
-    this._call = call;
-  }
-
-  get _maxRecipients(): BigInt {
-    return this._call.inputValues[0].value.toBigInt();
-  }
-}
-
-export class SetMaxRecipientsCall__Outputs {
-  _call: SetMaxRecipientsCall;
-
-  constructor(call: SetMaxRecipientsCall) {
-    this._call = call;
-  }
-
-  get value0(): boolean {
-    return this._call.outputValues[0].value.toBoolean();
-  }
-}
-
-export class TransferOwnershipCall extends ethereum.Call {
-  get inputs(): TransferOwnershipCall__Inputs {
-    return new TransferOwnershipCall__Inputs(this);
-  }
-
-  get outputs(): TransferOwnershipCall__Outputs {
-    return new TransferOwnershipCall__Outputs(this);
-  }
-}
-
-export class TransferOwnershipCall__Inputs {
-  _call: TransferOwnershipCall;
-
-  constructor(call: TransferOwnershipCall) {
-    this._call = call;
-  }
-
-  get newOwner(): Address {
-    return this._call.inputValues[0].value.toAddress();
-  }
-}
-
-export class TransferOwnershipCall__Outputs {
-  _call: TransferOwnershipCall;
-
-  constructor(call: TransferOwnershipCall) {
-    this._call = call;
-  }
-}
diff --git a/subgraph/src/recipientRegistry/RecipientRegistryFactory.ts b/subgraph/src/recipientRegistry/RecipientRegistryFactory.ts
index e4e391538..eb130d90e 100644
--- a/subgraph/src/recipientRegistry/RecipientRegistryFactory.ts
+++ b/subgraph/src/recipientRegistry/RecipientRegistryFactory.ts
@@ -2,7 +2,6 @@ import { Address } from '@graphprotocol/graph-ts'
 import { OptimisticRecipientRegistry as OptimisticRecipientRegistryContract } from '../../generated/FundingRoundFactory/OptimisticRecipientRegistry'
 import { SimpleRecipientRegistry as SimpleRecipientRegistryContract } from '../../generated/FundingRoundFactory/SimpleRecipientRegistry'
 import { KlerosRecipientRegistry as KlerosRecipientRegistryContract } from '../../generated/FundingRoundFactory/KlerosRecipientRegistry'
-import { UniversalRecipientRegistry as UniversalRecipientRegistryContract } from '../../generated/FundingRoundFactory/UniversalRecipientRegistry'
 
 import { RecipientRegistry } from '../../generated/schema'
 import {
@@ -38,28 +37,6 @@ class RecipientRegistryFactoryOptimistic {
   }
 }
 
-class RecipientRegistryFactoryUniversal {
-  static create(params: RecipientRegistryCreateParams): RecipientRegistry {
-    let recipientRegistryId = params.recipientRegistryAddress.toHexString()
-    let recipientRegistry = new RecipientRegistry(recipientRegistryId)
-
-    let registry = UniversalRecipientRegistryContract.bind(
-      params.recipientRegistryAddress
-    )
-    recipientRegistry.baseDeposit = registry.baseDeposit()
-    recipientRegistry.challengePeriodDuration =
-      registry.challengePeriodDuration()
-    recipientRegistry.owner = registry.owner()
-
-    recipientRegistry.controller = registry.controller()
-    recipientRegistry.maxRecipients = registry.maxRecipients()
-    recipientRegistry.fundingRoundFactory = params.fundingRoundFactoryId
-    recipientRegistry.createdAt = params.createdAt
-
-    return recipientRegistry
-  }
-}
-
 class RecipientRegistryFactorySimple {
   static create(params: RecipientRegistryCreateParams): RecipientRegistry {
     let recipientRegistryId = params.recipientRegistryAddress.toHexString()
@@ -105,8 +82,6 @@ export class RecipientRegistryFactory {
         return RecipientRegistryFactoryOptimistic.create(params)
       case RecipientRegistryType.Kleros:
         return RecipientRegistryFactoryKleros.create(params)
-      case RecipientRegistryType.Universal:
-        return RecipientRegistryFactoryUniversal.create(params)
       case RecipientRegistryType.Simple:
         return RecipientRegistryFactorySimple.create(params)
       default:
diff --git a/subgraph/src/recipientRegistry/RecipientRegistryTemplate.ts b/subgraph/src/recipientRegistry/RecipientRegistryTemplate.ts
index 3c1c3c9b6..0c8d4d0fc 100644
--- a/subgraph/src/recipientRegistry/RecipientRegistryTemplate.ts
+++ b/subgraph/src/recipientRegistry/RecipientRegistryTemplate.ts
@@ -7,7 +7,6 @@ import {
   OptimisticRecipientRegistry as OptimisticRecipientRegistryTemplate,
   SimpleRecipientRegistry as SimpleRecipientRegistryTemplate,
   KlerosRecipientRegistry as KlerosRecipientRegistryTemplate,
-  UniversalRecipientRegistry as UniversalRecipientRegistryTemplate,
 } from '../../generated/templates'
 
 export class RecipientRegistryTemplate {
@@ -20,9 +19,6 @@ export class RecipientRegistryTemplate {
       case RecipientRegistryType.Optimistic:
         OptimisticRecipientRegistryTemplate.create(registryAddress)
         break
-      case RecipientRegistryType.Universal:
-        UniversalRecipientRegistryTemplate.create(registryAddress)
-        break
       case RecipientRegistryType.Simple:
         SimpleRecipientRegistryTemplate.create(registryAddress)
         break
diff --git a/subgraph/src/recipientRegistry/RecipientRegistryType.ts b/subgraph/src/recipientRegistry/RecipientRegistryType.ts
index af438676a..40a6a702d 100644
--- a/subgraph/src/recipientRegistry/RecipientRegistryType.ts
+++ b/subgraph/src/recipientRegistry/RecipientRegistryType.ts
@@ -1,21 +1,18 @@
 import { Address, TypedMap, log } from '@graphprotocol/graph-ts'
 import { OptimisticRecipientRegistry as OptimisticRecipientRegistryContract } from '../../generated/FundingRoundFactory/OptimisticRecipientRegistry'
 import { KlerosRecipientRegistry as KlerosRecipientRegistryContract } from '../../generated/FundingRoundFactory/KlerosRecipientRegistry'
-import { UniversalRecipientRegistry as UniversalRecipientRegistryContract } from '../../generated/FundingRoundFactory/UniversalRecipientRegistry'
 
 export enum RecipientRegistryType {
   Unknown,
   Simple,
   Kleros,
   Optimistic,
-  Universal,
 }
 
 let registryTypeMap = new TypedMap<string, RecipientRegistryType>()
 registryTypeMap.set('simple', RecipientRegistryType.Simple)
 registryTypeMap.set('klerso', RecipientRegistryType.Kleros)
 registryTypeMap.set('optimistic', RecipientRegistryType.Optimistic)
-registryTypeMap.set('universal', RecipientRegistryType.Universal)
 
 /**
  * Determine the type of the registry given the registry address
@@ -31,19 +28,6 @@ registryTypeMap.set('universal', RecipientRegistryType.Universal)
 export function getRecipientRegistryType(
   registryAddress: Address
 ): RecipientRegistryType {
-  let universalRegistry =
-    UniversalRecipientRegistryContract.bind(registryAddress)
-  let registryType = universalRegistry.try_registryType()
-  if (!registryType.reverted) {
-    let entry = registryTypeMap.getEntry(registryType.value)
-    if (entry) {
-      return entry.value
-    } else {
-      log.error('Error: unknown registry type {}', [registryType.value])
-      return RecipientRegistryType.Unknown
-    }
-  }
-
   let klerosRegistry = KlerosRecipientRegistryContract.bind(registryAddress)
   let tcr = klerosRegistry.try_tcr()
   if (!tcr.reverted) {
diff --git a/subgraph/src/recipientRegistry/UniversalRecipientRegistryMapping.ts b/subgraph/src/recipientRegistry/UniversalRecipientRegistryMapping.ts
deleted file mode 100644
index ea75880c6..000000000
--- a/subgraph/src/recipientRegistry/UniversalRecipientRegistryMapping.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { BigInt, log } from '@graphprotocol/graph-ts'
-import {
-  OwnershipTransferred,
-  RequestResolved,
-  RequestSubmitted,
-} from '../../generated/templates/UniversalRecipientRegistry/UniversalRecipientRegistry'
-
-import { Recipient } from '../../generated/schema'
-
-export function handleOwnershipTransferred(event: OwnershipTransferred): void {
-  log.info('handleOwnershipTransferred - universal recipient registry', [])
-}
-
-export function handleRequestResolved(event: RequestResolved): void {
-  let recipientRegistryId = event.address.toHexString()
-
-  log.info('handleRequestResolved', [])
-  let recipientId = event.params._recipientId.toHexString()
-  let recipient = new Recipient(recipientId)
-
-  recipient.requestType = BigInt.fromI32(event.params._type).toString()
-  recipient.requester = event.transaction.from.toHexString()
-  recipient.submissionTime = event.params._timestamp.toString()
-  recipient.rejected = event.params._rejected
-  recipient.verified = !event.params._rejected
-  recipient.recipientRegistry = recipientRegistryId
-  recipient.recipientIndex = event.params._recipientIndex
-  recipient.requestResolvedHash = event.transaction.hash
-
-  recipient.save()
-}
-
-export function handleRequestSubmitted(event: RequestSubmitted): void {
-  log.info('handleRequestSubmitted', [])
-  let recipientRegistryId = event.address.toHexString()
-
-  //TODO: create RecipientRegistry entity here if it does not exist.
-
-  let recipientId = event.params._recipientId.toHexString()
-  let recipient = new Recipient(recipientId)
-
-  recipient.recipientRegistry = recipientRegistryId
-  recipient.recipientAddress = event.params._recipient
-  recipient.recipientMetadata = null
-  recipient.recipientMetadataId = recipientId
-  recipient.requestType = BigInt.fromI32(event.params._type).toString()
-  recipient.requester = event.transaction.from.toHexString()
-  recipient.submissionTime = event.params._timestamp.toString()
-  recipient.deposit = event.transaction.value
-  recipient.verified = false
-  recipient.requestSubmittedHash = event.transaction.hash
-
-  recipient.save()
-}
diff --git a/subgraph/subgraph.template.yaml b/subgraph/subgraph.template.yaml
index 9ac2f45d7..3bc4bcd58 100644
--- a/subgraph/subgraph.template.yaml
+++ b/subgraph/subgraph.template.yaml
@@ -33,8 +33,6 @@ dataSources:
           file: ./abis/SimpleRecipientRegistry.json
         - name: KlerosRecipientRegistry
           file: ./abis/KlerosRecipientRegistry.json
-        - name: UniversalRecipientRegistry
-          file: ./abis/UniversalRecipientRegistry.json
         - name: BrightIdUserRegistry
           file: ./abis/BrightIdUserRegistry.json
       eventHandlers:
@@ -181,29 +179,6 @@ templates:
         - event: RecipientRemoved(indexed bytes32,uint256)
           handler: handleRecipientRemoved
       file: ./src/recipientRegistry/KlerosRecipientRegistryMapping.ts
-  - name: UniversalRecipientRegistry
-    kind: ethereum/contract
-    network: {{network}}
-    source:
-      abi: UniversalRecipientRegistry
-    mapping:
-      kind: ethereum/events
-      apiVersion: 0.0.4
-      language: wasm/assemblyscript
-      entities:
-        - RecipientRegistry
-        - Recipient
-      abis:
-        - name: UniversalRecipientRegistry
-          file: ./abis/UniversalRecipientRegistry.json
-      eventHandlers:
-        - event: OwnershipTransferred(indexed address,indexed address)
-          handler: handleOwnershipTransferred
-        - event: RequestResolved(indexed bytes32,indexed uint8,indexed bool,uint256,uint256)
-          handler: handleRequestResolved
-        - event: RequestSubmitted(indexed bytes32,indexed uint8,address,uint256)
-          handler: handleRequestSubmitted
-      file: ./src/recipientRegistry/UniversalRecipientRegistryMapping.ts
   - name: BrightIdUserRegistry
     kind: ethereum/contract
     network: {{network}}
diff --git a/subgraph/subgraph.yaml b/subgraph/subgraph.yaml
index 70236d542..93a19c4da 100644
--- a/subgraph/subgraph.yaml
+++ b/subgraph/subgraph.yaml
@@ -33,8 +33,6 @@ dataSources:
           file: ./abis/SimpleRecipientRegistry.json
         - name: KlerosRecipientRegistry
           file: ./abis/KlerosRecipientRegistry.json
-        - name: UniversalRecipientRegistry
-          file: ./abis/UniversalRecipientRegistry.json
         - name: BrightIdUserRegistry
           file: ./abis/BrightIdUserRegistry.json
       eventHandlers:
@@ -58,7 +56,7 @@ dataSources:
     network: xdai
     source:
       abi: OptimisticRecipientRegistry
-      startBlock: 0
+      startBlock: 15217676
     mapping:
       kind: ethereum/events
       apiVersion: 0.0.4
@@ -181,29 +179,6 @@ templates:
         - event: RecipientRemoved(indexed bytes32,uint256)
           handler: handleRecipientRemoved
       file: ./src/recipientRegistry/KlerosRecipientRegistryMapping.ts
-  - name: UniversalRecipientRegistry
-    kind: ethereum/contract
-    network: xdai
-    source:
-      abi: UniversalRecipientRegistry
-    mapping:
-      kind: ethereum/events
-      apiVersion: 0.0.4
-      language: wasm/assemblyscript
-      entities:
-        - RecipientRegistry
-        - Recipient
-      abis:
-        - name: UniversalRecipientRegistry
-          file: ./abis/UniversalRecipientRegistry.json
-      eventHandlers:
-        - event: OwnershipTransferred(indexed address,indexed address)
-          handler: handleOwnershipTransferred
-        - event: RequestResolved(indexed bytes32,indexed uint8,indexed bool,uint256,uint256)
-          handler: handleRequestResolved
-        - event: RequestSubmitted(indexed bytes32,indexed uint8,address,uint256)
-          handler: handleRequestSubmitted
-      file: ./src/recipientRegistry/UniversalRecipientRegistryMapping.ts
   - name: BrightIdUserRegistry
     kind: ethereum/contract
     network: xdai
diff --git a/vue-app/.env.xdai b/vue-app/.env.xdai
index f92ce255e..06415ba8d 100644
--- a/vue-app/.env.xdai
+++ b/vue-app/.env.xdai
@@ -19,7 +19,7 @@ VUE_APP_USER_REGISTRY_TYPE=brightid
 # Learn more about BrightID and context in /docs/brightid.md
 VUE_APP_BRIGHTID_CONTEXT=clr.fund
 
-# Supported values: simple, optimistic, kleros, universal
+# Supported values: simple, optimistic, kleros
 VUE_APP_RECIPIENT_REGISTRY_TYPE=optimistic
 
 VUE_APP_RECIPIENT_REGISTRY_POLICY=QmeygKjvrpidJeFHv6ywjUrj718nwtFQgCCPPR4r5nL87R
diff --git a/vue-app/src/api/abi.ts b/vue-app/src/api/abi.ts
index bcda861fa..528ad6edd 100644
--- a/vue-app/src/api/abi.ts
+++ b/vue-app/src/api/abi.ts
@@ -7,7 +7,6 @@ import { abi as UserRegistry } from '../../../contracts/build/contracts/contract
 import { abi as BrightIdUserRegistry } from '../../../contracts/build/contracts/contracts/userRegistry/BrightIdUserRegistry.sol/BrightIdUserRegistry.json'
 import { abi as SimpleRecipientRegistry } from '../../../contracts/build/contracts/contracts/recipientRegistry/SimpleRecipientRegistry.sol/SimpleRecipientRegistry.json'
 import { abi as OptimisticRecipientRegistry } from '../../../contracts/build/contracts/contracts/recipientRegistry/OptimisticRecipientRegistry.sol/OptimisticRecipientRegistry.json'
-import { abi as UniversalRecipientRegistry } from '../../../contracts/build/contracts/contracts/recipientRegistry/UniversalRecipientRegistry.sol/UniversalRecipientRegistry.json'
 import { abi as KlerosGTCR } from '../../../contracts/build/contracts/contracts/recipientRegistry/IKlerosGTCR.sol/IKlerosGTCR.json'
 import { abi as KlerosGTCRAdapter } from '../../../contracts/build/contracts/contracts/recipientRegistry/KlerosGTCRAdapter.sol/KlerosGTCRAdapter.json'
 import { abi as BaseRecipientRegistry } from '../../../contracts/build/contracts/contracts/recipientRegistry/BaseRecipientRegistry.sol/BaseRecipientRegistry.json'
@@ -22,7 +21,6 @@ export {
   BrightIdUserRegistry,
   SimpleRecipientRegistry,
   OptimisticRecipientRegistry,
-  UniversalRecipientRegistry,
   KlerosGTCR,
   KlerosGTCRAdapter,
   BaseRecipientRegistry,
diff --git a/vue-app/src/api/core.ts b/vue-app/src/api/core.ts
index 50747ea3b..242335ce3 100644
--- a/vue-app/src/api/core.ts
+++ b/vue-app/src/api/core.ts
@@ -40,7 +40,6 @@ export enum RecipientRegistryType {
   SIMPLE = 'simple',
   OPTIMISTIC = 'optimistic',
   KLEROS = 'kleros',
-  UNIVERSAL = 'universal',
 }
 export const recipientRegistryType =
   process.env.VUE_APP_RECIPIENT_REGISTRY_TYPE || ''
diff --git a/vue-app/src/api/recipient-registry-optimistic.ts b/vue-app/src/api/recipient-registry-optimistic.ts
index da452d4ac..fa9cfe9fa 100644
--- a/vue-app/src/api/recipient-registry-optimistic.ts
+++ b/vue-app/src/api/recipient-registry-optimistic.ts
@@ -8,6 +8,8 @@ import { getEventArg } from '@/utils/contracts'
 import { OptimisticRecipientRegistry } from './abi'
 import { RecipientApplicationData } from './recipient'
 import { RecipientRegistryInterface } from './types'
+import { Metadata } from './metadata'
+import { chain } from './core'
 
 // TODO merge this with `Project` inteface
 export interface RecipientData {
@@ -57,7 +59,7 @@ export function formToRecipientData(
 
 export async function addRecipient(
   registryAddress: string,
-  recipientApplicationData: RecipientApplicationData,
+  recipientData: any,
   deposit: BigNumber,
   signer: Signer
 ): Promise<TransactionResponse> {
@@ -66,12 +68,23 @@ export async function addRecipient(
     OptimisticRecipientRegistry,
     signer
   )
-  const recipientData = formToRecipientData(recipientApplicationData)
-  const { address, ...metadata } = recipientData
+  const metadata = Metadata.fromFormData(recipientData)
+  const { id, address } = metadata.toProject()
+  if (!id) {
+    throw new Error('Missing metadata id')
+  }
+
+  if (!address) {
+    throw new Error(`Missing recipient address for the ${chain.name} network`)
+  }
+
+  const json = { id }
   const transaction = await registry.addRecipient(
     address,
-    JSON.stringify(metadata),
-    { value: deposit }
+    JSON.stringify(json),
+    {
+      value: deposit,
+    }
   )
   return transaction
 }
diff --git a/vue-app/src/api/recipient-registry-universal.ts b/vue-app/src/api/recipient-registry-universal.ts
deleted file mode 100644
index cb98c0a4e..000000000
--- a/vue-app/src/api/recipient-registry-universal.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-import { Contract, BigNumber, Signer } from 'ethers'
-import { TransactionResponse } from '@ethersproject/abstract-provider'
-import { OptimisticRecipientRegistry } from './abi'
-import { RecipientRegistryInterface } from './types'
-import { Metadata } from './metadata'
-import { chain } from './core'
-
-export async function addRecipient(
-  registryAddress: string,
-  recipientData: any,
-  deposit: BigNumber,
-  signer: Signer
-): Promise<TransactionResponse> {
-  const registry = new Contract(
-    registryAddress,
-    OptimisticRecipientRegistry,
-    signer
-  )
-  const metadata = Metadata.fromFormData(recipientData)
-  const { id, address } = metadata.toProject()
-  if (!id) {
-    throw new Error('Missing metadata id')
-  }
-
-  if (!address) {
-    throw new Error(`Missing recipient address for the ${chain.name} network`)
-  }
-
-  const json = { id }
-  const transaction = await registry.addRecipient(
-    address,
-    JSON.stringify(json),
-    {
-      value: deposit,
-    }
-  )
-  return transaction
-}
-
-export async function registerProject(
-  registryAddress: string,
-  recipientId: string,
-  signer: Signer
-): Promise<TransactionResponse> {
-  const registry = new Contract(
-    registryAddress,
-    OptimisticRecipientRegistry,
-    signer
-  )
-  const transaction = await registry.executeRequest(recipientId)
-  return transaction
-}
-
-export async function rejectProject(
-  registryAddress: string,
-  recipientId: string,
-  requesterAddress: string,
-  signer: Signer
-) {
-  const registry = new Contract(
-    registryAddress,
-    OptimisticRecipientRegistry,
-    signer
-  )
-  const transaction = await registry.challengeRequest(
-    recipientId,
-    requesterAddress
-  )
-  return transaction
-}
-
-export async function removeProject(
-  registryAddress: string,
-  recipientId: string,
-  signer: Signer
-) {
-  const registry = new Contract(
-    registryAddress,
-    OptimisticRecipientRegistry,
-    signer
-  )
-
-  await registry.removeRecipient(recipientId)
-  const transaction = await registry.executeRequest(recipientId)
-
-  return transaction
-}
-
-export function create(): RecipientRegistryInterface {
-  return {
-    addRecipient,
-    removeProject,
-    registerProject,
-    rejectProject,
-    isRegistrationOpen: true,
-    requireRegistrationDeposit: true,
-  }
-}
-
-export default { create }
diff --git a/vue-app/src/api/recipient-registry.ts b/vue-app/src/api/recipient-registry.ts
index df6b67e7d..4a27d63e7 100644
--- a/vue-app/src/api/recipient-registry.ts
+++ b/vue-app/src/api/recipient-registry.ts
@@ -19,7 +19,6 @@ import {
 } from '@/api/types'
 import OptimisticRegistry from './recipient-registry-optimistic'
 import SimpleRegistry from './recipient-registry-simple'
-import UniversalRegistry from './recipient-registry-universal'
 import KlerosRegistry from './recipient-registry-kleros'
 import { isHexString } from '@ethersproject/bytes'
 import { Recipient } from '@/graphql/API'
@@ -29,7 +28,6 @@ import { DateTime } from 'luxon'
 
 const registryLookup: Record<RecipientRegistryType, Function> = {
   [RecipientRegistryType.OPTIMISTIC]: OptimisticRegistry.create,
-  [RecipientRegistryType.UNIVERSAL]: UniversalRegistry.create,
   [RecipientRegistryType.SIMPLE]: SimpleRegistry.create,
   [RecipientRegistryType.KLEROS]: KlerosRegistry.create,
 }
diff --git a/vue-app/src/store/getters.ts b/vue-app/src/store/getters.ts
index 9b2f56941..829181509 100644
--- a/vue-app/src/store/getters.ts
+++ b/vue-app/src/store/getters.ts
@@ -236,9 +236,7 @@ const getters = {
     return !!state.recipientRegistryInfo?.requireRegistrationDeposit
   },
   addProjectUrl: (): string => {
-    return recipientRegistryType === RecipientRegistryType.UNIVERSAL
-      ? '/join/metadata'
-      : '/join/project'
+    return '/join/metadata'
   },
   maxRecipients: (state: RootState): number | undefined => {
     const { currentRound, maciFactory } = state
diff --git a/vue-app/src/views/Join.vue b/vue-app/src/views/Join.vue
index 79d6bc0b0..ac5e3f0e6 100644
--- a/vue-app/src/views/Join.vue
+++ b/vue-app/src/views/Join.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
-    <join-universal v-if="isUniversalRegistry" />
-    <join-optimistic v-else-if="isOptimisticRegistry" />
+    <join-optimistic v-if="isOptimisticRegistry" />
     <not-found v-else />
   </div>
 </template>
@@ -9,15 +8,13 @@
 <script lang="ts">
 import Vue from 'vue'
 import Component from 'vue-class-component'
-import JoinOptimistic from '@/views/JoinOptimistic.vue'
-import JoinUniversal from '@/views/JoinUniversal.vue'
 import NotFound from '@/views/NotFound.vue'
+import JoinOptimistic from '@/views/JoinOptimistic.vue'
 import { recipientRegistryType, RecipientRegistryType } from '@/api/core'
 
 @Component({
   components: {
     JoinOptimistic,
-    JoinUniversal,
     NotFound,
   },
 })
@@ -25,8 +22,5 @@ export default class JoinView extends Vue {
   get isOptimisticRegistry(): boolean {
     return recipientRegistryType === RecipientRegistryType.OPTIMISTIC
   }
-  get isUniversalRegistry(): boolean {
-    return recipientRegistryType === RecipientRegistryType.UNIVERSAL
-  }
 }
 </script>
diff --git a/vue-app/src/views/JoinOptimistic.vue b/vue-app/src/views/JoinOptimistic.vue
index c4df24a0d..a9247751c 100644
--- a/vue-app/src/views/JoinOptimistic.vue
+++ b/vue-app/src/views/JoinOptimistic.vue
@@ -15,698 +15,55 @@
       />
       <div class="title-area">
         <h1>Join the round</h1>
-        <div v-if="currentStep === 5">
-          <div class="toggle-tabs-desktop">
-            <p
-              class="tab"
-              id="review"
-              :class="showSummaryPreview ? 'inactive-tab' : 'active-tab'"
-              @click="handleToggleTab"
-            >
-              Review info
-            </p>
-            <p
-              class="tab"
-              id="preview"
-              :class="showSummaryPreview ? 'active-tab' : 'inactive-tab'"
-              @click="handleToggleTab"
-            >
-              Preview project
-            </p>
-          </div>
-        </div>
       </div>
       <div class="cancel-area desktop">
         <links class="cancel-link" to="/join"> Cancel </links>
       </div>
-      <div class="form-area">
+      <loader v-if="loading" />
+      <div v-if="!loading" class="form-area">
         <div class="application">
-          <div v-if="currentStep === 0">
-            <h2 class="step-title">About the project</h2>
-            <div class="inputs">
-              <div class="form-background">
-                <label for="project-name" class="input-label"
-                  >Project name</label
-                >
-                <input
-                  id="project-name"
-                  type="text"
-                  placeholder="ex: clr.fund"
-                  v-model="$v.form.project.name.$model"
-                  :class="{
-                    input: true,
-                    invalid: $v.form.project.name.$error,
-                  }"
-                />
-                <p
-                  :class="{
-                    error: true,
-                    hidden: !$v.form.project.name.$error,
-                  }"
-                >
-                  Your project needs a name
-                </p>
-              </div>
-              <div class="form-background">
-                <label for="project-tagline" class="input-label">Tagline</label>
-                <p class="input-description">
-                  Describe your project in a sentence. Max characters: 140
-                </p>
-                <textarea
-                  id="project-tagline"
-                  placeholder="ex: A quadratic funding protocol"
-                  v-model="$v.form.project.tagline.$model"
-                  :class="{
-                    input: true,
-                    invalid: $v.form.project.tagline.$error,
-                  }"
-                />
-                <p
-                  :class="{
-                    error: true,
-                    hidden:
-                      !$v.form.project.tagline.$error ||
-                      $v.form.project.tagline.maxLength,
-                  }"
-                >
-                  This tagline is too long. Be brief for potential contributors
-                </p>
-                <p
-                  :class="{
-                    error: true,
-                    hidden:
-                      !$v.form.project.tagline.$error ||
-                      !$v.form.project.tagline.maxLength,
-                  }"
-                >
-                  Your project needs a tagline
-                </p>
-              </div>
-              <div class="form-background">
-                <label for="project-description" class="input-label">
-                  Description
-                  <p class="input-description">Markdown supported.</p>
-                </label>
-                <textarea
-                  id="project-description"
-                  placeholder="ex: CLR.fund is a quadratic funding protocol that aims to make it as easy as possible to set up, manage, and participate in quadratic funding rounds..."
-                  v-model="$v.form.project.description.$model"
-                  :class="{
-                    input: true,
-                    invalid: $v.form.project.description.$error,
-                  }"
-                />
-                <p v-if="form.project.description" class="input-label pt-1">
-                  Preview:
-                </p>
-                <markdown :raw="form.project.description" />
-                <p
-                  :class="{
-                    error: true,
-                    hidden: !$v.form.project.description.$error,
-                  }"
-                >
-                  Your project needs a description. What are you raising money
-                  for?
-                </p>
-              </div>
-              <div class="form-background">
-                <label for="project-category" class="input-label"
-                  >Category
-                  <p class="input-description">Choose the best fit.</p>
-                </label>
-                <form class="radio-row" id="category-radio">
-                  <input
-                    id="category-content"
-                    type="radio"
-                    name="project-category"
-                    value="Content"
-                    v-model="$v.form.project.category.$model"
-                    :class="{
-                      input: true,
-                      invalid: $v.form.project.category.$error,
-                    }"
-                  />
-                  <label for="category-content" class="radio-btn"
-                    >Content</label
-                  >
-                  <input
-                    id="research"
-                    type="radio"
-                    name="project-category"
-                    value="Research"
-                    v-model="$v.form.project.category.$model"
-                    :class="{
-                      input: true,
-                      invalid: $v.form.project.category.$error,
-                    }"
-                  />
-                  <label for="research" class="radio-btn">Research</label>
-                  <input
-                    id="tooling"
-                    type="radio"
-                    name="project-category"
-                    value="Tooling"
-                    v-model="$v.form.project.category.$model"
-                    :class="{
-                      input: true,
-                      invalid: $v.form.project.category.$error,
-                    }"
-                  />
-                  <label for="tooling" class="radio-btn">Tooling</label>
-                  <input
-                    id="data"
-                    type="radio"
-                    name="project-category"
-                    value="Data"
-                    v-model="$v.form.project.category.$model"
-                    :class="{
-                      input: true,
-                      invalid: $v.form.project.category.$error,
-                    }"
-                  />
-                  <label for="data" class="radio-btn">Data</label>
-                </form>
-                <p
-                  :class="{
-                    error: true,
-                    hidden: !$v.form.project.category.$error,
-                  }"
-                >
-                  You need to choose a category
-                </p>
-              </div>
-              <div class="form-background">
-                <label for="project-problem-space" class="input-label"
-                  >Problem space</label
-                >
-                <p class="input-description">
-                  Explain the problems you're trying to solve. Markdown
-                  supported.
-                </p>
-                <textarea
-                  id="project-problem-space"
-                  placeholder="ex: there is no way to spin up a quadratic funding round. Right now, you have to collaborate with GitCoin Grants which isn’t a scalable or sustainable model."
-                  v-model="$v.form.project.problemSpace.$model"
-                  :class="{
-                    input: true,
-                    invalid: $v.form.project.problemSpace.$error,
-                  }"
-                />
-                <p
-                  :class="{
-                    error: true,
-                    hidden: !$v.form.project.problemSpace.$error,
-                  }"
-                >
-                  Explain the problem your project solves
-                </p>
-                <p v-if="form.project.description" class="input-label pt-1">
-                  Preview:
-                </p>
-                <markdown :raw="form.project.problemSpace" />
-              </div>
-            </div>
-          </div>
-          <div v-if="currentStep === 1">
-            <h2 class="step-title">Donation details</h2>
-            <div class="inputs">
-              <div class="form-background">
-                <label for="fund-address" class="input-label"
-                  >Ethereum address</label
-                >
-                <p class="input-description">
-                  The destination address for donations, which you'll use to
-                  claim funds. This doesn't have to be the same address as the
-                  one you use to send your application transaction.
-                </p>
-                <input
-                  id="fund-address"
-                  placeholder="example: 0x123..."
-                  v-model.lazy="$v.form.fund.addressName.$model"
-                  @blur="checkEns"
-                  :class="{
-                    input: true,
-                    invalid: $v.form.fund.addressName.$error,
-                  }"
-                />
-                <p
-                  :class="{
-                    error: true,
-                    hidden: !$v.form.fund.addressName.$error,
-                  }"
-                >
-                  Enter a valid ENS or Ethereum 0x address
-                </p>
-                <!-- TODO: only validate after user removes focus on input -->
-              </div>
-              <div class="form-background">
-                <label for="fund-plans" class="input-label"
-                  >How will you spend your funding?</label
-                >
-                <p class="input-description">
-                  Potential contributors might convert based on your specific
-                  funding plans. Markdown supported.
-                </p>
-                <textarea
-                  id="fund-plans"
-                  placeholder="ex: on our roadmap..."
-                  v-model="$v.form.fund.plans.$model"
-                  :class="{
-                    input: true,
-                    invalid: $v.form.fund.plans.$error,
-                  }"
-                />
-                <p
-                  :class="{
-                    error: true,
-                    hidden: !$v.form.fund.plans.$error,
-                  }"
-                >
-                  Let potential contributors know what plans you have for their
-                  donations.
-                </p>
-                <p v-if="form.fund.plans" class="input-label pt-1">Preview:</p>
-                <markdown :raw="form.fund.plans" />
-              </div>
-            </div>
-          </div>
-          <div v-if="currentStep === 2">
-            <h2 class="step-title">Team details</h2>
-            <p>Tell us about the folks behind your project.</p>
-            <div class="inputs">
-              <div v-if="isEmailRequired" class="form-background">
-                <label for="team-email" class="input-label">
-                  Contact email
-                </label>
-                <p class="input-description">
-                  For important updates about your project and the funding
-                  round.
-                </p>
-                <input
-                  id="team-email"
-                  type="email"
-                  placeholder="example: doge@goodboi.com"
-                  v-model.lazy="$v.form.team.email.$model"
-                  :class="{
-                    input: true,
-                    invalid: $v.form.team.email.$error,
-                  }"
-                />
-                <p class="input-notice">
-                  We won't display this publicly or add it to the on-chain
-                  registry.
-                </p>
-                <p
-                  :class="{
-                    error: true,
-                    hidden: !$v.form.team.email.$error,
-                  }"
-                >
-                  This doesn't look like an email.
-                </p>
-              </div>
-              <div class="form-background">
-                <label for="team-name" class="input-label"
-                  >Team name (optional)</label
-                >
-                <p class="input-description">If different to project name.</p>
-                <input
-                  id="team-name"
-                  placeholder="ex: clr.fund"
-                  v-model="$v.form.team.name.$model"
-                  :class="{
-                    input: true,
-                    invalid: $v.form.team.name.$error,
-                  }"
-                />
-              </div>
-              <div class="form-background">
-                <label for="team-desc" class="input-label"
-                  >Team description (optional)</label
-                >
-                <p class="input-description">
-                  If different to project description. Markdown supported.
-                </p>
-                <textarea
-                  id="team-desc"
-                  placeholder="ex: CLR.fund is a quadratic funding protocol that aims to make it as easy as possible to set up, manage, and participate in quadratic funding rounds..."
-                  v-model="$v.form.team.description.$model"
-                  :class="{
-                    input: true,
-                    invalid: $v.form.team.description.$error,
-                  }"
-                />
-                <p v-if="form.team.description" class="input-label pt-1">
-                  Preview:
-                </p>
-                <markdown :raw="form.team.description" />
-              </div>
-            </div>
+          <div v-if="steps[currentStep] === 'metadata'">
+            <metadata-list
+              :onClick="handleMetadataSelected"
+              :excludeRecipients="true"
+            ></metadata-list>
           </div>
-          <div v-if="currentStep === 3">
-            <h2 class="step-title">Links</h2>
-            <p>
-              Give contributors some links to check out to learn more about your
-              project. Provide at least one.
-            </p>
-            <div class="inputs">
-              <div class="form-background">
-                <label for="links-github" class="input-label">GitHub</label>
-                <input
-                  id="links-github"
-                  type="link"
-                  placeholder="example: https://github.com/ethereum/clrfund"
-                  v-model.lazy="$v.form.links.github.$model"
-                  :class="{
-                    input: true,
-                    invalid: $v.form.links.github.$error,
-                  }"
-                />
-                <p
-                  :class="{
-                    error: true,
-                    hidden: !$v.form.links.github.$error,
-                  }"
-                >
-                  This doesn't look like a valid URL
-                </p>
-                <!-- TODO: only validate after user removes focus on input -->
-              </div>
-              <div class="form-background">
-                <label for="links-radicle" class="input-label">Radicle</label>
-                <input
-                  id="links-radicle"
-                  type="link"
-                  placeholder="example: https://radicle.xyz/ethereum/clrfund"
-                  v-model.lazy="$v.form.links.radicle.$model"
-                  :class="{
-                    input: true,
-                    invalid: $v.form.links.radicle.$error,
-                  }"
-                />
-                <p
-                  :class="{
-                    error: true,
-                    hidden: !$v.form.links.radicle.$error,
-                  }"
-                >
-                  This doesn't look like a valid URL
-                </p>
-              </div>
-              <div class="form-background">
-                <label for="links-website" class="input-label">Website</label>
-                <input
-                  id="links-website"
-                  type="link"
-                  placeholder="example: https://clr.fund"
-                  v-model.lazy="$v.form.links.website.$model"
-                  :class="{
-                    input: true,
-                    invalid: $v.form.links.website.$error,
-                  }"
-                />
-                <p
-                  :class="{
-                    error: true,
-                    hidden: !$v.form.links.website.$error,
-                  }"
-                >
-                  This doesn't look like a valid URL
-                </p>
-              </div>
-              <div class="form-background">
-                <label for="links-twitter" class="input-label">Twitter</label>
-                <input
-                  id="links-twitter"
-                  type="link"
-                  placeholder="example: https://twitter.com/ethereum"
-                  v-model.lazy="$v.form.links.twitter.$model"
-                  :class="{
-                    input: true,
-                    invalid: $v.form.links.twitter.$error,
-                  }"
-                />
-                <p
-                  :class="{
-                    error: true,
-                    hidden: !$v.form.links.twitter.$error,
-                  }"
-                >
-                  This doesn't look like a valid URL
-                </p>
-              </div>
-              <div class="form-background">
-                <label for="links-discord" class="input-label">Discord</label>
-                <input
-                  id="links-discord"
-                  type="link"
-                  placeholder="ex: https://discord.gg/5Prub9zbGz"
-                  class="input"
-                  v-model.lazy="$v.form.links.discord.$model"
-                  :class="{
-                    input: true,
-                    invalid: $v.form.links.discord.$error,
-                  }"
-                />
-                <p
-                  :class="{
-                    error: true,
-                    hidden: !$v.form.links.discord.$error,
-                  }"
-                >
-                  This doesn't look like a valid URL
-                </p>
-              </div>
-            </div>
+          <div v-if="steps[currentStep] === 'summary'" id="summary">
+            <metadata-viewer :metadata="metadata"></metadata-viewer>
           </div>
-          <div v-if="currentStep === 4">
-            <h2 class="step-title">Images</h2>
-            <p>
-              We'll upload your images to IPFS, a decentralized storage
-              platform.
-              <links to="https://ipfs.io/#how">More on IPFS</links>
-            </p>
+          <div v-if="steps[currentStep] === 'email'">
             <div class="inputs">
-              <div class="form-background">
-                <ipfs-image-upload
-                  label="Banner image"
-                  description="Recommended aspect ratio: 16x9 • Max file size: 512kB • JPG, PNG, or GIF"
-                  :onUpload="handleUpload"
-                  formProp="bannerHash"
-                  :hash="form.image.bannerHash"
-                />
-              </div>
-              <div class="form-background">
-                <ipfs-image-upload
-                  label="Thumbnail image"
-                  description="Recommended aspect ratio: 1x1 (square) • Max file size: 512kB • JPG, PNG, or GIF"
-                  :onUpload="handleUpload"
-                  formProp="thumbnailHash"
-                  :hash="form.image.thumbnailHash"
-                />
+              <div class="heading">
+                <h2>Contact email</h2>
               </div>
-            </div>
-          </div>
-          <div v-if="currentStep === 5" id="summary">
-            <project-profile
-              v-if="showSummaryPreview"
-              :project="projectInterface"
-              :previewMode="true"
-              class="project-details"
-            />
-            <div v-if="!showSummaryPreview">
-              <h2 class="step-title">Review your information</h2>
-              <warning
-                message="This information will be stored in a smart contract and cannot be edited, so please review carefully."
+              <p class="input-description">
+                For important updates about your project and the funding round.
+              </p>
+              <input
+                id="team-email"
+                type="email"
+                placeholder="example: doge@goodboi.com"
+                v-model.lazy="$v.metadata.email.$model"
+                :class="{
+                  input: true,
+                  invalid: $v.metadata.email.$error,
+                }"
               />
-              <div class="form-background">
-                <div class="summary-section-header">
-                  <h3 class="step-subtitle">About the project</h3>
-                  <links to="/join/project" class="edit-button"
-                    >Edit <img width="16px" src="@/assets/edit.svg"
-                  /></links>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">Name</h4>
-                  <div class="data">{{ form.project.name }}</div>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">Tagline</h4>
-                  <div class="data">{{ form.project.tagline }}</div>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">Description</h4>
-                  <div class="data">{{ form.project.description }}</div>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">Category</h4>
-                  <div class="data">{{ form.project.category }}</div>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">Problem space</h4>
-                  <div class="data">{{ form.project.problemSpace }}</div>
-                </div>
-              </div>
-              <div class="form-background">
-                <div class="summary-section-header">
-                  <h3 class="step-subtitle">Funding details</h3>
-                  <links to="/join/fund" class="edit-button"
-                    >Edit <img width="16px" src="@/assets/edit.svg"
-                  /></links>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">Ethereum address</h4>
-                  <div v-if="form.hasEns" class="data break-all">
-                    {{ form.fund.addressName }}
-                  </div>
-                  <div
-                    class="data"
-                    v-if="form.fund.addressName"
-                    title="Resolved ENS address"
-                  >
-                    <address-widget
-                      :address="form.fund.resolvedAddress"
-                      :chainId="chainId"
-                    />
-                  </div>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">Funding plans</h4>
-                  <div class="data">{{ form.fund.plans }}</div>
-                </div>
-              </div>
-              <div class="form-background">
-                <div class="summary-section-header">
-                  <h3 class="step-subtitle">Team details</h3>
-                  <links to="/join/team" class="edit-button"
-                    >Edit <img width="16px" src="@/assets/edit.svg"
-                  /></links>
-                </div>
-                <div v-if="isEmailRequired" class="summary">
-                  <h4 class="read-only-title">Contact email</h4>
-                  <div class="data">{{ form.team.email }}</div>
-                  <div class="input-notice">
-                    This information won't be added to the smart contract.
-                  </div>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">Team name</h4>
-                  <div class="data">{{ form.team.name }}</div>
-                  <div class="data" v-if="!form.team.name">Not provided</div>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">Team description</h4>
-                  <div class="data">{{ form.team.description }}</div>
-                  <div class="data" v-if="!form.team.description">
-                    Not provided
-                  </div>
-                </div>
-              </div>
-              <div class="form-background">
-                <div class="summary-section-header">
-                  <h3 class="step-subtitle">Links</h3>
-                  <links to="/join/links" class="edit-button"
-                    >Edit <img width="16px" src="@/assets/edit.svg"
-                  /></links>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">GitHub</h4>
-                  <div class="data">
-                    {{ form.links.github }}
-                    <links
-                      v-if="form.links.github"
-                      :to="form.links.github"
-                      :hideArrow="true"
-                      ><img width="16px" src="@/assets/link.svg"
-                    /></links>
-                  </div>
-                  <div class="data" v-if="!form.links.github">Not provided</div>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">Twitter</h4>
-                  <div class="data">
-                    {{ form.links.twitter }}
-                    <links
-                      v-if="form.links.twitter"
-                      :to="form.links.twitter"
-                      :hideArrow="true"
-                      ><img width="16px" src="@/assets/link.svg"
-                    /></links>
-                  </div>
-                  <div class="data" v-if="!form.links.twitter">
-                    Not provided
-                  </div>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">Website</h4>
-                  <div class="data" key="">
-                    {{ form.links.website }}
-                    <links
-                      v-if="form.links.website"
-                      :to="form.links.website"
-                      :hideArrow="true"
-                      ><img width="16px" src="@/assets/link.svg"
-                    /></links>
-                  </div>
-                  <div class="data" v-if="!form.links.website">
-                    Not provided
-                  </div>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">Discord</h4>
-                  <div class="data">
-                    {{ form.links.discord }}
-                    <links
-                      v-if="form.links.discord"
-                      :to="form.links.discord"
-                      :hideArrow="true"
-                      ><img width="16px" src="@/assets/link.svg"
-                    /></links>
-                  </div>
-                  <div class="data" v-if="!form.links.discord">
-                    Not provided
-                  </div>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">Radicle</h4>
-                  <div class="data">
-                    {{ form.links.radicle }}
-                    <links
-                      v-if="form.links.radicle"
-                      :to="form.links.radicle"
-                      :hideArrow="true"
-                      ><img width="16px" src="@/assets/link.svg"
-                    /></links>
-                  </div>
-                  <div class="data" v-if="!form.links.radicle">
-                    Not provided
-                  </div>
-                </div>
-              </div>
-              <div class="form-background">
-                <div class="summary-section-header">
-                  <h3 class="step-subtitle">Images</h3>
-                  <links to="/join/image" class="edit-button"
-                    >Edit <img width="16px" src="@/assets/edit.svg"
-                  /></links>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">Banner</h4>
-                  <div class="data">
-                    <ipfs-copy-widget :hash="form.image.bannerHash" />
-                  </div>
-                </div>
-                <div class="summary">
-                  <h4 class="read-only-title">Thumbnail</h4>
-                  <div class="data">
-                    <ipfs-copy-widget :hash="form.image.thumbnailHash" />
-                  </div>
-                </div>
-              </div>
+              <p class="input-notice">
+                We won't display this publicly or add it to the on-chain
+                registry.
+              </p>
+              <p
+                :class="{
+                  error: true,
+                  hidden: !$v.metadata.email.$error,
+                }"
+              >
+                This doesn't look like an email.
+              </p>
             </div>
           </div>
-          <div v-if="currentStep === 6">
+          <div v-if="steps[currentStep] === 'submit'">
             <h2 class="step-title">Submit project</h2>
             <p>
               This is a blockchain transaction that will add your project
@@ -714,19 +71,20 @@
             </p>
             <div class="inputs">
               <recipient-submission-widget
-                cta="Submit project"
-                pending="Sending deposit..."
+                :isWaiting="isWaiting"
+                :txHash="txHash"
+                :txError="txError"
               />
             </div>
           </div>
         </div>
       </div>
     </div>
-    <div class="mobile nav-bar">
+    <div v-if="!loading" class="mobile nav-bar">
       <form-navigation
         :isStepValid="isStepValid(currentStep)"
         :steps="steps"
-        :finalStep="steps.length - 2"
+        :finalStep="steps.length - 1"
         :currentStep="currentStep"
         :callback="saveFormData"
         :handleStepNav="handleStepNav"
@@ -739,31 +97,27 @@
 <script lang="ts">
 import Component, { mixins } from 'vue-class-component'
 import { validationMixin } from 'vuelidate'
-import { required, maxLength, url, email } from 'vuelidate/lib/validators'
-import * as isIPFS from 'is-ipfs'
-import { isValidEthAddress, resolveEns } from '@/utils/accounts'
+import { required, email } from 'vuelidate/lib/validators'
 import LayoutSteps from '@/components/LayoutSteps.vue'
 import ProgressBar from '@/components/ProgressBar.vue'
 import FormNavigation from '@/components/FormNavigation.vue'
 import FormProgressWidget from '@/components/FormProgressWidget.vue'
-import IpfsImageUpload from '@/components/IpfsImageUpload.vue'
-import IpfsCopyWidget from '@/components/IpfsCopyWidget.vue'
-import AddressWidget from '@/components/AddressWidget.vue'
-import Loader from '@/components/Loader.vue'
-import Markdown from '@/components/Markdown.vue'
-import ProjectProfile from '@/components/ProjectProfile.vue'
 import RecipientSubmissionWidget from '@/components/RecipientSubmissionWidget.vue'
-import Warning from '@/components/Warning.vue'
+import MetadataList from '@/views/MetadataList.vue'
+import MetadataViewer from '@/views/MetadataViewer.vue'
 import Links from '@/components/Links.vue'
+import Loader from '@/components/Loader.vue'
 
-import { SET_RECIPIENT_DATA } from '@/store/mutation-types'
 import {
-  RecipientApplicationData,
-  formToProjectInterface,
-} from '@/api/recipient'
+  SET_RECIPIENT_DATA,
+  RESET_RECIPIENT_DATA,
+} from '@/store/mutation-types'
+
 import { Project } from '@/api/projects'
-import { chain } from '@/api/core'
-import { CHAIN_ID } from '@/plugins/Web3/constants/chains'
+import { Metadata } from '@/api/metadata'
+import { DateTime } from 'luxon'
+import { addRecipient } from '@/api/recipient-registry-optimistic'
+import { waitForTransaction } from '@/utils/contracts'
 
 @Component({
   components: {
@@ -771,200 +125,76 @@ import { CHAIN_ID } from '@/plugins/Web3/constants/chains'
     ProgressBar,
     FormNavigation,
     FormProgressWidget,
-    IpfsImageUpload,
-    IpfsCopyWidget,
-    AddressWidget,
-    Loader,
-    Markdown,
-    ProjectProfile,
     RecipientSubmissionWidget,
-    Warning,
+    MetadataList,
+    MetadataViewer,
     Links,
+    Loader,
   },
   validations: {
-    form: {
-      project: {
-        name: { required },
-        tagline: {
-          required,
-          maxLength: maxLength(140),
-        },
-        description: { required },
-        category: { required },
-        problemSpace: { required },
-      },
-      fund: {
-        addressName: {
-          required,
-          validEthAddress: isValidEthAddress,
-        },
-        resolvedAddress: {},
-        plans: { required },
-      },
-      team: {
-        name: {},
-        description: {},
-        email: {
-          email,
-          required: process.env.VUE_APP_GOOGLE_SPREADSHEET_ID
-            ? required
-            : () => true,
-        },
-      },
-      links: {
-        github: { url },
-        radicle: { url },
-        website: { url },
-        twitter: { url },
-        discord: { url },
-      },
-      image: {
-        bannerHash: {
-          required,
-          validIpfsHash: isIPFS.cid,
-        },
-        thumbnailHash: {
-          required,
-          validIpfsHash: isIPFS.cid,
-        },
+    metadata: {
+      email: {
+        email,
+        required,
       },
     },
   },
 })
 export default class JoinView extends mixins(validationMixin) {
-  form: RecipientApplicationData = {
-    project: {
-      name: '',
-      tagline: '',
-      description: '',
-      category: '',
-      problemSpace: '',
-    },
-    fund: {
-      receivingAddresses: [],
-      addressName: '',
-      resolvedAddress: '',
-      plans: '',
-    },
-    team: {
-      name: '',
-      description: '',
-      email: '',
-    },
-    links: {
-      github: '',
-      radicle: '',
-      website: '',
-      twitter: '',
-      discord: '',
-    },
-    image: {
-      bannerHash: '',
-      thumbnailHash: '',
-    },
-    furthestStep: 0,
-    hasEns: false,
-  }
   currentStep = 0
-  steps: string[] = []
-  stepNames: string[] = []
-  showSummaryPreview = false
-
-  created() {
-    const steps = Object.keys(this.form)
-    steps.splice(steps.length - 1, 1, 'summary', 'submit')
-
-    const currentStep = steps.indexOf(this.$route.params.step)
-    const stepNames = [
-      'About the project',
-      'Donation details',
-      'Team details',
-      'Links',
-      'Images',
-      'Review',
-      'Submit',
-    ]
-    this.steps = steps
+  steps = this.isEmailRequired
+    ? ['metadata', 'summary', 'email', 'submit']
+    : ['metadata', 'summary', 'submit']
+  stepNames = this.isEmailRequired
+    ? ['Select a project metadata', 'Review', 'Email', 'Submit']
+    : ['Select a project metadata', 'Review', 'Submit']
+  metadata = new Metadata({})
+  loading = true
+  isWaiting = false
+  txHash = ''
+  txError = ''
+
+  async created() {
+    const currentStep = this.steps.indexOf(this.$route.params.step)
     this.currentStep = currentStep
-    this.stepNames = stepNames
-    this.form = this.$store.state.recipient || this.form
 
-    // redirect to /join/ if step doesn't exist
+    // redirect to /join if step doesn't exist
     if (this.currentStep < 0) {
       this.$router.push({ name: 'join' })
     }
+
+    await this.loadMetadata()
+    this.loading = false
+
     // "Next" button restricts forward navigation via validation, and
     // eventually updates the `furthestStep` tracker when valid and clicked/tapped.
     // If URL step is ahead of furthest, navigate back to furthest
-    if (this.currentStep > this.form.furthestStep) {
+    if (this.currentStep > this.furthestStep) {
       this.$router.push({
         name: 'join-step',
-        params: { step: steps[this.form.furthestStep] },
+        params: { step: this.steps[this.furthestStep] },
       })
     }
   }
 
-  get isEmailRequired(): boolean {
-    return !!process.env.VUE_APP_GOOGLE_SPREADSHEET_ID
-  }
-
-  handleToggleTab(event): void {
-    const { id } = event.target
-    // Guard clause:
-    if (
-      (!this.showSummaryPreview && id === 'review') ||
-      (this.showSummaryPreview && id === 'preview')
-    )
-      return
-    this.showSummaryPreview = !this.showSummaryPreview
-  }
-
-  // Check that at least one link is not empty && no links are invalid
-  isLinkStepValid(): boolean {
-    let isValid = false
-    const links = Object.keys(this.form.links)
-    for (const link of links) {
-      const linkData = this.$v.form.links?.[link]
-      if (!linkData) return false
-      const isInvalid = linkData.$invalid
-      const isEmpty = linkData.$model.length === 0
-      if (isInvalid) {
-        return false
-      } else if (!isEmpty) {
-        isValid = true
-      }
-    }
-    return isValid
-  }
-
   isStepValid(step: number): boolean {
-    if (step === 3) {
-      return this.isLinkStepValid()
-    }
-    const stepName: string = this.steps[step]
-    return !this.$v.form[stepName]?.$invalid
+    return this.steps[step] === 'metadata'
+      ? this.hasMetadata
+      : this.hasMetadata && this.isMetadataValid
   }
 
   isStepUnlocked(step: number): boolean {
-    return step <= this.form.furthestStep
+    return step <= this.furthestStep
   }
 
-  saveFormData(updateFurthest?: boolean): void {
-    if (updateFurthest && this.currentStep + 1 > this.form.furthestStep) {
-      this.form.furthestStep = this.currentStep + 1
-    }
-    if (typeof this.currentStep !== 'number') return
+  saveFormData(): void {
     this.$store.commit(SET_RECIPIENT_DATA, {
-      updatedData: this.form,
-      step: this.steps[this.currentStep],
-      stepNumber: this.currentStep,
+      updatedData: this.metadata,
     })
   }
 
-  // Callback from IpfsImageUpload component
-  handleUpload(key, value) {
-    this.form.image[key] = value
-    this.saveFormData(false)
+  get isEmailRequired(): boolean {
+    return !!process.env.VUE_APP_GOOGLE_SPREADSHEET_ID
   }
 
   get isNavDisabled(): boolean {
@@ -974,41 +204,145 @@ export default class JoinView extends mixins(validationMixin) {
     )
   }
 
-  handleStepNav(step: number, updateFurthest?: boolean): void {
-    // If isNavDisabled => disable quick-links
-    if (this.isNavDisabled) return
-    // Save form data
-    this.saveFormData(updateFurthest)
-    // Navigate
-    if (this.isStepUnlocked(step)) {
-      this.$router.push({
-        name: 'join-step',
-        params: {
-          step: this.steps[step],
-        },
-      })
+  get hasMetadata(): boolean {
+    return !!this.metadata.id
+  }
+
+  get isMetadataValid(): boolean {
+    // TODO validate metadata
+    return true
+  }
+
+  get furthestStep(): number {
+    let furthest = 0
+    if (this.hasMetadata) {
+      furthest++
+      if (this.isMetadataValid) {
+        furthest++
+        if (
+          process.env.VUE_APP_GOOGLE_SPREADSHEET_ID &&
+          !this.$v.metadata.email?.$invalid
+        ) {
+          furthest++
+        }
+      }
     }
+    return furthest
   }
 
-  get projectInterface(): Project {
-    return formToProjectInterface(this.form)
+  handleMetadataSelected(metadata: Metadata): void {
+    this.metadata = metadata
+    const id = this.metadata.id || ''
+    this.$router.push({
+      name: 'join-step',
+      params: { step: 'summary', id },
+    })
   }
 
-  get furthestStep() {
-    return this.form.furthestStep
+  async handleStepNav(step: number): Promise<void> {
+    // If isNavDisabled => disable quick-links
+    if (this.isNavDisabled) return
+    // Save form data
+    this.saveFormData()
+
+    if (step >= this.steps.length) {
+      await this.addRecipient()
+    } else {
+      // Navigate
+      if (this.isStepUnlocked(step)) {
+        const id = this.metadata.id || ''
+        this.$router.push({
+          name: 'join-step',
+          params: {
+            step: this.steps[step],
+            id,
+          },
+        })
+      }
+    }
   }
 
-  async checkEns(): Promise<void> {
-    const { addressName } = this.form?.fund
-    if (addressName) {
-      const res: string | null = await resolveEns(addressName)
-      this.form.hasEns = !!res
-      this.form.fund.resolvedAddress = res ? res : addressName
+  async loadMetadata(): Promise<void> {
+    const id = this.$route.params.id
+
+    if (id) {
+      if (id === this.$store.state.recipient?.id) {
+        this.metadata = new Metadata(this.$store.state.recipient)
+      } else {
+        try {
+          const metadata = await Metadata.get(id)
+          if (metadata) {
+            this.metadata = metadata
+            this.saveFormData()
+          }
+        } catch (err) {
+          // TODO display the error
+        }
+      }
     }
   }
 
-  get chainId(): number | undefined {
-    return CHAIN_ID[chain.name]
+  get projectInterface(): Project {
+    return this.metadata.toProject()
+  }
+
+  private async addRecipient() {
+    const {
+      currentRound,
+      currentUser,
+      recipient,
+      recipientRegistryAddress,
+      recipientRegistryInfo,
+    } = this.$store.state
+    this.isWaiting = true
+    // Reset errors when submitting
+    this.txError = ''
+    if (
+      recipientRegistryAddress &&
+      recipient &&
+      recipientRegistryInfo &&
+      currentUser
+    ) {
+      try {
+        if (currentRound && DateTime.now() >= currentRound.votingDeadline) {
+          this.$router.push({
+            name: 'join',
+          })
+          throw { message: 'round over' }
+        }
+        await waitForTransaction(
+          addRecipient(
+            recipientRegistryAddress,
+            new Metadata(recipient).toFormData(),
+            recipientRegistryInfo.deposit,
+            currentUser.walletProvider.getSigner()
+          ),
+          (hash) => (this.txHash = hash)
+        )
+        // Send application data to a Google Spreadsheet
+        if (process.env.VUE_APP_GOOGLE_SPREADSHEET_ID) {
+          await fetch('/.netlify/functions/recipient', {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+            },
+            body: JSON.stringify(recipient),
+          })
+        }
+        this.$store.commit(RESET_RECIPIENT_DATA)
+      } catch (error) {
+        this.isWaiting = false
+        this.txError = (error as any).message
+        return
+      }
+      this.isWaiting = false
+      this.$router.push({
+        name: 'project-added',
+        params: {
+          hash: this.txHash,
+        },
+      })
+    }
   }
 }
 </script>
@@ -1103,17 +437,6 @@ export default class JoinView extends mixins(validationMixin) {
   box-shadow: var(--box-shadow);
 }
 
-.layout-steps {
-  display: flex;
-  justify-content: center;
-  align-items: flex-start;
-
-  @media (max-width: $breakpoint-m) {
-    display: block;
-    margin: 0;
-  }
-}
-
 .step-title {
   font-size: 1.5rem;
   margin-top: 1rem;
@@ -1138,12 +461,6 @@ export default class JoinView extends mixins(validationMixin) {
   }
 }
 
-.link {
-  font-family: Inter;
-  font-size: 16px;
-  text-decoration: underline;
-}
-
 .cancel-link {
   position: sticky;
   top: 0px;
@@ -1155,23 +472,6 @@ export default class JoinView extends mixins(validationMixin) {
   margin: 1.5rem 0;
 }
 
-.form-background {
-  border-radius: 0.5rem;
-  padding: 1rem;
-  background: var(--bg-light-color);
-  margin-top: 1.5rem;
-  display: flex;
-  flex-direction: column;
-  &:last-of-type {
-    margin-bottom: 2rem;
-  }
-  @media (max-width: $breakpoint-m) {
-    &:first-of-type {
-      margin-top: 0;
-    }
-  }
-}
-
 .input {
   border-radius: 16px;
   border: 2px solid $button-color;
@@ -1183,6 +483,7 @@ export default class JoinView extends mixins(validationMixin) {
   font-weight: 400;
   line-height: 24px;
   letter-spacing: 0em;
+  width: 100%;
   &:valid {
     border: 2px solid $clr-green;
   }
@@ -1200,317 +501,4 @@ export default class JoinView extends mixins(validationMixin) {
 .input.invalid {
   border: 2px solid var(--error-color);
 }
-
-.input-description {
-  margin-top: 0.25rem;
-  font-size: 14px;
-  font-family: Inter;
-  margin-bottom: 0.5rem;
-  line-height: 150%;
-}
-
-.input-notice {
-  margin-top: 0.25rem;
-  font-size: 12px;
-  font-family: Inter;
-  margin-bottom: 0.5rem;
-  line-height: 150%;
-  color: var(--attention-color);
-  text-transform: uppercase;
-  font-weight: 500;
-}
-
-.input-label {
-  font-family: Inter;
-  font-size: 16px;
-  font-style: normal;
-  font-weight: 500;
-  line-height: 24px;
-  letter-spacing: 0em;
-  text-align: left;
-  margin: 0;
-}
-
-.radio-row {
-  display: flex;
-  margin-top: 1rem;
-  box-sizing: border-box;
-  border: 2px solid $button-color;
-  border-radius: 1rem;
-  overflow: hidden;
-  width: fit-content;
-  input {
-    position: fixed;
-    opacity: 0;
-    pointer-events: none;
-  }
-  input[type='radio']:checked + label {
-    background: $clr-pink;
-    font-weight: 600;
-  }
-  @media (max-width: $breakpoint-m) {
-    width: 100%;
-    flex-direction: column;
-    text-align: center;
-  }
-}
-
-.radio-btn {
-  box-sizing: border-box;
-  color: white;
-  font-size: 16px;
-  line-height: 24px;
-  align-items: center;
-  padding: 0.5rem 1rem;
-  margin-left: -1px;
-
-  border-right: 2px solid $button-color;
-  border-bottom: none;
-  @media (max-width: $breakpoint-m) {
-    border-right: none;
-    border-bottom: 2px solid $button-color;
-  }
-  &:last-of-type {
-    border-right: none;
-    border-bottom: none;
-  }
-
-  &:hover {
-    opacity: 0.8;
-    background: var(--bg-secondary-color);
-    transform: scale(1.04);
-    cursor: pointer;
-  }
-  &:active {
-    background: var(--bg-secondary-color);
-  }
-}
-
-.loader {
-  display: block;
-  height: 40px;
-  margin: $content-space auto;
-  width: 40px;
-}
-
-.loader:after {
-  content: ' ';
-  display: block;
-  width: 32px;
-  height: 32px;
-  margin: 4px;
-  border-radius: 50%;
-  border: 6px solid #fff;
-  border-color: #fff transparent #fff transparent;
-  animation: loader 1.2s linear infinite;
-}
-
-.loader {
-  margin: $modal-space auto;
-}
-
-@keyframes loader {
-  0% {
-    transform: rotate(0deg);
-  }
-  100% {
-    transform: rotate(360deg);
-  }
-}
-
-.read-only-title {
-  line-height: 150%;
-  margin: 0;
-}
-
-.project-details {
-  &:last-child {
-    margin-bottom: 0;
-  }
-}
-
-.summary {
-  margin-bottom: 1rem;
-}
-
-.summary-section-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin-bottom: 1.5rem;
-  border-bottom: 1px solid $highlight-color;
-  padding-bottom: 0.5rem;
-}
-
-.toggle-tabs-desktop {
-  display: flex;
-  gap: 2rem;
-  font-family: 'Inter';
-  @media (max-width: $breakpoint-m) {
-    /* flex-direction: column;
-    gap: 0;
-    margin-left: 0rem; */
-    /* display: none; */
-  }
-  .active-tab {
-    padding-bottom: 0.5rem;
-    border-bottom: 4px solid $clr-green;
-    border-radius: 4px;
-    font-weight: 600;
-    /* text-decoration: underline; */
-  }
-  .inactive-tab {
-    padding-bottom: 0.5rem;
-    cursor: pointer;
-    &:hover {
-      opacity: 0.8;
-      border-bottom: 4px solid #fff7;
-      border-radius: 4px;
-    }
-    /* text-decoration: underline; */
-  }
-}
-
-.toggle-tabs-mobile {
-  display: flex;
-  gap: 2rem;
-  @media (min-width: $breakpoint-m) {
-    /* flex-direction: column;
-    gap: 0;
-    margin-left: 0rem; */
-    display: none;
-  }
-  .active-tab {
-    padding-bottom: 0.5rem;
-    border-bottom: 4px solid $clr-green;
-    border-radius: 4px;
-    font-weight: 600;
-    /* text-decoration: underline; */
-  }
-  .inactive-tab {
-    padding-bottom: 0.5rem;
-    cursor: pointer;
-    &:hover {
-      opacity: 0.8;
-      transform: scale(1.02);
-    }
-    /* text-decoration: underline; */
-  }
-}
-
-.step-subtitle {
-  margin: 0.5rem 0;
-  font-family: 'Glacial Indifference', sans-serif;
-  font-size: 1.5rem;
-}
-
-.edit-button {
-  font-family: 'Inter';
-  font-weight: 500;
-  font-size: 16px;
-  color: $clr-green;
-}
-
-.data {
-  opacity: 0.8;
-  margin-top: 0.25rem;
-  display: flex;
-  align-items: center;
-  gap: 0.5rem;
-}
-
-.data img {
-  padding: 0.25rem;
-  margin-top: 0.25rem;
-  &:hover {
-    background: var(--bg-primary-color);
-    border-radius: 4px;
-  }
-}
-
-.pt-1 {
-  padding-top: 1rem;
-}
-
-.tx-row {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin: 0.5rem 0;
-  font-weight: 500;
-}
-
-.tx-row-total {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  margin: 0.5rem 0;
-  font-weight: 600;
-  font-size: 20px;
-  font-family: 'Glacial Indifference', sans-serif;
-  background: var(--bg-secondary-color);
-  border-radius: 1rem;
-  padding: 1rem;
-  margin-top: 1.5rem;
-}
-
-.tx-item {
-  font-size: 14px;
-  font-family: Inter;
-  line-height: 150%;
-  text-transform: uppercase;
-  font-weight: 500;
-}
-
-/* .hr {
-  opacity: 0.1;
-  height: 1px;
-  margin: 1rem 0;
-} */
-
-.tx-value {
-}
-
-.fiat-value {
-  font-weight: 400;
-  opacity: 0.8;
-}
-
-.tx-progress-area {
-  text-align: center;
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-  margin-bottom: 2rem;
-}
-
-.checkout {
-  margin-bottom: 1rem;
-}
-
-.checkout-desktop {
-  padding-top: 1.5rem;
-  border-top: 1px solid $button-color;
-}
-
-.tx-notice {
-  margin-top: 0.25rem;
-  font-size: 12px;
-  font-family: Inter;
-  margin-bottom: 0.5rem;
-  line-height: 150%;
-  text-transform: uppercase;
-  font-weight: 500;
-}
-
-.break-all {
-  @media (max-width: $breakpoint-s) {
-    display: block;
-  }
-
-  p {
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-}
 </style>
diff --git a/vue-app/src/views/JoinUniversal.vue b/vue-app/src/views/JoinUniversal.vue
deleted file mode 100644
index 247408838..000000000
--- a/vue-app/src/views/JoinUniversal.vue
+++ /dev/null
@@ -1,504 +0,0 @@
-<template>
-  <div class="container">
-    <div class="grid">
-      <form-progress-widget
-        :currentStep="currentStep"
-        :furthestStep="furthestStep"
-        :steps="steps"
-        :stepNames="stepNames"
-        :isNavDisabled="isNavDisabled"
-        :isStepUnlocked="isStepUnlocked"
-        :isStepValid="isStepValid"
-        :handleStepNav="handleStepNav"
-        :saveFormData="saveFormData"
-        cancelRedirectUrl="/join"
-      />
-      <div class="title-area">
-        <h1>Join the round</h1>
-      </div>
-      <div class="cancel-area desktop">
-        <links class="cancel-link" to="/join"> Cancel </links>
-      </div>
-      <loader v-if="loading" />
-      <div v-if="!loading" class="form-area">
-        <div class="application">
-          <div v-if="steps[currentStep] === 'metadata'">
-            <metadata-list
-              :onClick="handleMetadataSelected"
-              :excludeRecipients="true"
-            ></metadata-list>
-          </div>
-          <div v-if="steps[currentStep] === 'summary'" id="summary">
-            <metadata-viewer :metadata="metadata"></metadata-viewer>
-          </div>
-          <div v-if="steps[currentStep] === 'email'">
-            <div class="inputs">
-              <div class="heading">
-                <h2>Contact email</h2>
-              </div>
-              <p class="input-description">
-                For important updates about your project and the funding round.
-              </p>
-              <input
-                id="team-email"
-                type="email"
-                placeholder="example: doge@goodboi.com"
-                v-model.lazy="$v.metadata.email.$model"
-                :class="{
-                  input: true,
-                  invalid: $v.metadata.email.$error,
-                }"
-              />
-              <p class="input-notice">
-                We won't display this publicly or add it to the on-chain
-                registry.
-              </p>
-              <p
-                :class="{
-                  error: true,
-                  hidden: !$v.metadata.email.$error,
-                }"
-              >
-                This doesn't look like an email.
-              </p>
-            </div>
-          </div>
-          <div v-if="steps[currentStep] === 'submit'">
-            <h2 class="step-title">Submit project</h2>
-            <p>
-              This is a blockchain transaction that will add your project
-              information to the funding round.
-            </p>
-            <div class="inputs">
-              <recipient-submission-widget
-                :isWaiting="isWaiting"
-                :txHash="txHash"
-                :txError="txError"
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div v-if="!loading" class="mobile nav-bar">
-      <form-navigation
-        :isStepValid="isStepValid(currentStep)"
-        :steps="steps"
-        :finalStep="steps.length - 1"
-        :currentStep="currentStep"
-        :callback="saveFormData"
-        :handleStepNav="handleStepNav"
-        :isNavDisabled="isNavDisabled"
-      />
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-import Component, { mixins } from 'vue-class-component'
-import { validationMixin } from 'vuelidate'
-import { required, email } from 'vuelidate/lib/validators'
-import LayoutSteps from '@/components/LayoutSteps.vue'
-import ProgressBar from '@/components/ProgressBar.vue'
-import FormNavigation from '@/components/FormNavigation.vue'
-import FormProgressWidget from '@/components/FormProgressWidget.vue'
-import RecipientSubmissionWidget from '@/components/RecipientSubmissionWidget.vue'
-import MetadataList from '@/views/MetadataList.vue'
-import MetadataViewer from '@/views/MetadataViewer.vue'
-import Links from '@/components/Links.vue'
-import Loader from '@/components/Loader.vue'
-
-import {
-  SET_RECIPIENT_DATA,
-  RESET_RECIPIENT_DATA,
-} from '@/store/mutation-types'
-
-import { Project } from '@/api/projects'
-import { Metadata } from '@/api/metadata'
-import { DateTime } from 'luxon'
-import { addRecipient } from '@/api/recipient-registry-universal'
-import { waitForTransaction } from '@/utils/contracts'
-
-@Component({
-  components: {
-    LayoutSteps,
-    ProgressBar,
-    FormNavigation,
-    FormProgressWidget,
-    RecipientSubmissionWidget,
-    MetadataList,
-    MetadataViewer,
-    Links,
-    Loader,
-  },
-  validations: {
-    metadata: {
-      email: {
-        email,
-        required,
-      },
-    },
-  },
-})
-export default class JoinView extends mixins(validationMixin) {
-  currentStep = 0
-  steps = this.isEmailRequired
-    ? ['metadata', 'summary', 'email', 'submit']
-    : ['metadata', 'summary', 'submit']
-  stepNames = this.isEmailRequired
-    ? ['Select a project metadata', 'Review', 'Email', 'Submit']
-    : ['Select a project metadata', 'Review', 'Submit']
-  metadata = new Metadata({})
-  loading = true
-  isWaiting = false
-  txHash = ''
-  txError = ''
-
-  async created() {
-    const currentStep = this.steps.indexOf(this.$route.params.step)
-    this.currentStep = currentStep
-
-    // redirect to /join if step doesn't exist
-    if (this.currentStep < 0) {
-      this.$router.push({ name: 'join' })
-    }
-
-    await this.loadMetadata()
-    this.loading = false
-
-    // "Next" button restricts forward navigation via validation, and
-    // eventually updates the `furthestStep` tracker when valid and clicked/tapped.
-    // If URL step is ahead of furthest, navigate back to furthest
-    if (this.currentStep > this.furthestStep) {
-      this.$router.push({
-        name: 'join-step',
-        params: { step: this.steps[this.furthestStep] },
-      })
-    }
-  }
-
-  isStepValid(step: number): boolean {
-    return this.steps[step] === 'metadata'
-      ? this.hasMetadata
-      : this.hasMetadata && this.isMetadataValid
-  }
-
-  isStepUnlocked(step: number): boolean {
-    return step <= this.furthestStep
-  }
-
-  saveFormData(): void {
-    this.$store.commit(SET_RECIPIENT_DATA, {
-      updatedData: this.metadata,
-    })
-  }
-
-  get isEmailRequired(): boolean {
-    return !!process.env.VUE_APP_GOOGLE_SPREADSHEET_ID
-  }
-
-  get isNavDisabled(): boolean {
-    return (
-      !this.isStepValid(this.currentStep) &&
-      this.currentStep !== this.furthestStep
-    )
-  }
-
-  get hasMetadata(): boolean {
-    return !!this.metadata.id
-  }
-
-  get isMetadataValid(): boolean {
-    // TODO validate metadata
-    return true
-  }
-
-  get furthestStep(): number {
-    let furthest = 0
-    if (this.hasMetadata) {
-      furthest++
-      if (this.isMetadataValid) {
-        furthest++
-        if (
-          process.env.VUE_APP_GOOGLE_SPREADSHEET_ID &&
-          !this.$v.metadata.email?.$invalid
-        ) {
-          furthest++
-        }
-      }
-    }
-    return furthest
-  }
-
-  handleMetadataSelected(metadata: Metadata): void {
-    this.metadata = metadata
-    const id = this.metadata.id || ''
-    this.$router.push({
-      name: 'join-step',
-      params: { step: 'summary', id },
-    })
-  }
-
-  async handleStepNav(step: number): Promise<void> {
-    // If isNavDisabled => disable quick-links
-    if (this.isNavDisabled) return
-    // Save form data
-    this.saveFormData()
-
-    if (step >= this.steps.length) {
-      await this.addRecipient()
-    } else {
-      // Navigate
-      if (this.isStepUnlocked(step)) {
-        const id = this.metadata.id || ''
-        this.$router.push({
-          name: 'join-step',
-          params: {
-            step: this.steps[step],
-            id,
-          },
-        })
-      }
-    }
-  }
-
-  async loadMetadata(): Promise<void> {
-    const id = this.$route.params.id
-
-    if (id) {
-      if (id === this.$store.state.recipient?.id) {
-        this.metadata = new Metadata(this.$store.state.recipient)
-      } else {
-        try {
-          const metadata = await Metadata.get(id)
-          if (metadata) {
-            this.metadata = metadata
-            this.saveFormData()
-          }
-        } catch (err) {
-          // TODO display the error
-        }
-      }
-    }
-  }
-
-  get projectInterface(): Project {
-    return this.metadata.toProject()
-  }
-
-  private async addRecipient() {
-    const {
-      currentRound,
-      currentUser,
-      recipient,
-      recipientRegistryAddress,
-      recipientRegistryInfo,
-    } = this.$store.state
-    this.isWaiting = true
-    // Reset errors when submitting
-    this.txError = ''
-    if (
-      recipientRegistryAddress &&
-      recipient &&
-      recipientRegistryInfo &&
-      currentUser
-    ) {
-      try {
-        if (currentRound && DateTime.now() >= currentRound.votingDeadline) {
-          this.$router.push({
-            name: 'join',
-          })
-          throw { message: 'round over' }
-        }
-        await waitForTransaction(
-          addRecipient(
-            recipientRegistryAddress,
-            new Metadata(recipient).toFormData(),
-            recipientRegistryInfo.deposit,
-            currentUser.walletProvider.getSigner()
-          ),
-          (hash) => (this.txHash = hash)
-        )
-        // Send application data to a Google Spreadsheet
-        if (process.env.VUE_APP_GOOGLE_SPREADSHEET_ID) {
-          await fetch('/.netlify/functions/recipient', {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify(recipient),
-          })
-        }
-        this.$store.commit(RESET_RECIPIENT_DATA)
-      } catch (error) {
-        this.isWaiting = false
-        this.txError = (error as any).message
-        return
-      }
-      this.isWaiting = false
-      this.$router.push({
-        name: 'project-added',
-        params: {
-          hash: this.txHash,
-        },
-      })
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-@import '../styles/vars';
-@import '../styles/theme';
-
-.container {
-  width: clamp(calc(800px - 4rem), calc(100% - 4rem), 1100px);
-  margin: 0 auto;
-  @media (max-width: $breakpoint-m) {
-    width: 100%;
-    background: var(--bg-secondary-color);
-  }
-}
-
-.grid {
-  display: grid;
-  grid-template-columns: 1fr clamp(250px, 25%, 360px);
-  grid-template-rows: auto 1fr;
-  grid-template-areas:
-    'title cancel'
-    'form progress';
-  height: calc(100vh - var($nav-header-height));
-  gap: 0 2rem;
-  @media (max-width: $breakpoint-m) {
-    grid-template-rows: auto auto 1fr auto;
-    grid-template-columns: 1fr;
-    grid-template-areas:
-      'progress'
-      'title'
-      'form';
-    gap: 0;
-  }
-}
-
-.title-area {
-  grid-area: title;
-  display: flex;
-  padding: 1rem;
-  padding-left: 0rem;
-  justify-content: space-between;
-  align-items: flex-start;
-  flex-direction: column;
-
-  h1 {
-    font-family: 'Glacial Indifference', sans-serif;
-  }
-
-  @media (max-width: $breakpoint-m) {
-    margin-top: 6rem;
-    padding-bottom: 0;
-    padding-left: 1rem;
-    font-size: 14px;
-    font-weight: normal;
-  }
-}
-
-.cancel-area {
-  grid-area: cancel;
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-
-  .cancel-link {
-    font-weight: 500;
-  }
-}
-
-.form-area {
-  grid-area: form;
-  overflow: auto;
-  display: flex;
-  flex-direction: column;
-  gap: 1rem;
-  padding: 1rem;
-  height: 100%;
-  @media (min-width: $breakpoint-m) {
-    padding: 0;
-    width: 100%;
-  }
-}
-
-.nav-bar {
-  position: fixed;
-  bottom: 0;
-  right: 0;
-  left: 0;
-  padding: 1.5rem;
-  background: var(--bg-primary-color);
-  box-shadow: var(--box-shadow);
-}
-
-.step-title {
-  font-size: 1.5rem;
-  margin-top: 1rem;
-  font-weight: 600;
-  &:first-of-type {
-    margin-top: 0;
-  }
-}
-
-.application {
-  /* height: 100%; */
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  margin-bottom: 2rem;
-  overflow: none;
-  @media (min-width: $breakpoint-m) {
-    background: var(--bg-secondary-color);
-    padding: 1.5rem;
-    border-radius: 1rem;
-    margin-bottom: 4rem;
-  }
-}
-
-.cancel-link {
-  position: sticky;
-  top: 0px;
-  color: var(--error-color);
-  text-decoration: underline;
-}
-
-.inputs {
-  margin: 1.5rem 0;
-}
-
-.input {
-  border-radius: 16px;
-  border: 2px solid $button-color;
-  background-color: var(--bg-secondary-color);
-  margin: 0.5rem 0;
-  padding: 0.5rem 1rem;
-  font-size: 16px;
-  font-family: Inter;
-  font-weight: 400;
-  line-height: 24px;
-  letter-spacing: 0em;
-  width: 100%;
-  &:valid {
-    border: 2px solid $clr-green;
-  }
-  &:hover {
-    background: var(--bg-primary-color);
-    border: 2px solid $highlight-color;
-    box-shadow: 0px 4px 16px 0px 25, 22, 35, 0.4;
-  }
-  &:optional {
-    border: 2px solid $button-color;
-    background-color: var(--bg-secondary-color);
-  }
-}
-
-.input.invalid {
-  border: 2px solid var(--error-color);
-}
-</style>
diff --git a/vue-app/src/views/RecipientRegistry.vue b/vue-app/src/views/RecipientRegistry.vue
index 5ffce9b67..33252c37c 100644
--- a/vue-app/src/views/RecipientRegistry.vue
+++ b/vue-app/src/views/RecipientRegistry.vue
@@ -154,10 +154,7 @@ import { RegistryInfo } from '@/api/types'
 import TransactionModal from '@/components/TransactionModal.vue'
 
 // currently only show the registry view for these types
-const showList = [
-  RecipientRegistryType.OPTIMISTIC,
-  RecipientRegistryType.UNIVERSAL,
-]
+const showList = [RecipientRegistryType.OPTIMISTIC]
 
 @Component({ components: { CopyButton, Loader, Links } })
 export default class RecipientRegistryView extends Vue {

From 9de0c0e73a518d22e565a92b8f221b6b57131e83 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 20 Jul 2022 11:36:56 -0400
Subject: [PATCH 11/36] fix lint warning

---
 vue-app/src/store/getters.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/vue-app/src/store/getters.ts b/vue-app/src/store/getters.ts
index 829181509..b05b9af23 100644
--- a/vue-app/src/store/getters.ts
+++ b/vue-app/src/store/getters.ts
@@ -4,11 +4,7 @@ import { DateTime } from 'luxon'
 
 // API
 import { CartItem, Contributor } from '@/api/contributions'
-import {
-  recipientRegistryType,
-  RecipientRegistryType,
-  operator,
-} from '@/api/core'
+import { operator } from '@/api/core'
 import { RoundInfo, RoundStatus } from '@/api/round'
 import { Tally } from '@/api/tally'
 import { User } from '@/api/user'

From ad3d4dd78a4d1f52888479b0378cd3abc1b1c9d1 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 20 Jul 2022 21:20:36 -0400
Subject: [PATCH 12/36] add validation rules to recipient submission form

---
 vue-app/src/api/metadata.ts                   |  19 +++
 .../src/api/recipient-registry-optimistic.ts  |   5 +-
 vue-app/src/store/getters.ts                  |   2 +-
 vue-app/src/views/JoinOptimistic.vue          | 117 +++++++++++-------
 vue-app/src/views/MetadataForm.vue            |   2 +-
 5 files changed, 95 insertions(+), 50 deletions(-)

diff --git a/vue-app/src/api/metadata.ts b/vue-app/src/api/metadata.ts
index 7d05a4e4d..fa0563d13 100644
--- a/vue-app/src/api/metadata.ts
+++ b/vue-app/src/api/metadata.ts
@@ -4,6 +4,7 @@ import { METADATA_NETWORKS, METADATA_SUBGRAPH_URL_PREFIX, chain } from './core'
 import { Project } from './projects'
 import { Ipfs } from './ipfs'
 import { MAX_RETRIES } from './core'
+import { required, url } from 'vuelidate/lib/validators'
 
 const subgraphUrl = (network: string): string =>
   `${METADATA_SUBGRAPH_URL_PREFIX}${network}`
@@ -44,6 +45,7 @@ export interface MetadataFormData {
   team: {
     name: string
     description: string
+    email: string
   }
   links: {
     github: string
@@ -63,6 +65,22 @@ export interface MetadataFormData {
   owner?: string
 }
 
+export const MetadataValidations = {
+  id: { required },
+  name: { required },
+  tagline: { required },
+  description: { required },
+  category: { required },
+  problemSpace: { required },
+  githubUrl: { url },
+  radicleUrl: { url },
+  websiteUrl: { url },
+  twitterUrl: { url },
+  discordUrl: { url },
+  bannerImageHash: { required },
+  thumbnailImageHash: { required },
+}
+
 /**
  * Extract address for the given chain
  * @param receivingAddresses array of EIP-3770 addresses, i.e. eth:0x11111...
@@ -299,6 +317,7 @@ export class Metadata {
       team: {
         name: this.teamName || '',
         description: this.teamDescription || '',
+        email: this.email || '',
       },
       links: {
         github: this.githubUrl || '',
diff --git a/vue-app/src/api/recipient-registry-optimistic.ts b/vue-app/src/api/recipient-registry-optimistic.ts
index fa9cfe9fa..671dd56df 100644
--- a/vue-app/src/api/recipient-registry-optimistic.ts
+++ b/vue-app/src/api/recipient-registry-optimistic.ts
@@ -59,7 +59,7 @@ export function formToRecipientData(
 
 export async function addRecipient(
   registryAddress: string,
-  recipientData: any,
+  recipientMetadata: Metadata,
   deposit: BigNumber,
   signer: Signer
 ): Promise<TransactionResponse> {
@@ -68,8 +68,7 @@ export async function addRecipient(
     OptimisticRecipientRegistry,
     signer
   )
-  const metadata = Metadata.fromFormData(recipientData)
-  const { id, address } = metadata.toProject()
+  const { id, address } = recipientMetadata.toProject()
   if (!id) {
     throw new Error('Missing metadata id')
   }
diff --git a/vue-app/src/store/getters.ts b/vue-app/src/store/getters.ts
index b05b9af23..a9bd06562 100644
--- a/vue-app/src/store/getters.ts
+++ b/vue-app/src/store/getters.ts
@@ -232,7 +232,7 @@ const getters = {
     return !!state.recipientRegistryInfo?.requireRegistrationDeposit
   },
   addProjectUrl: (): string => {
-    return '/join/metadata'
+    return '/join/project'
   },
   maxRecipients: (state: RootState): number | undefined => {
     const { currentRound, maciFactory } = state
diff --git a/vue-app/src/views/JoinOptimistic.vue b/vue-app/src/views/JoinOptimistic.vue
index a9247751c..c023de28e 100644
--- a/vue-app/src/views/JoinOptimistic.vue
+++ b/vue-app/src/views/JoinOptimistic.vue
@@ -22,7 +22,7 @@
       <loader v-if="loading" />
       <div v-if="!loading" class="form-area">
         <div class="application">
-          <div v-if="steps[currentStep] === 'metadata'">
+          <div v-if="currentStep === 0">
             <metadata-list
               :onClick="handleMetadataSelected"
               :excludeRecipients="true"
@@ -43,10 +43,10 @@
                 id="team-email"
                 type="email"
                 placeholder="example: doge@goodboi.com"
-                v-model.lazy="$v.metadata.email.$model"
+                v-model.lazy="$v.email.$model"
                 :class="{
                   input: true,
-                  invalid: $v.metadata.email.$error,
+                  invalid: $v.email.$error,
                 }"
               />
               <p class="input-notice">
@@ -56,7 +56,7 @@
               <p
                 :class="{
                   error: true,
-                  hidden: !$v.metadata.email.$error,
+                  hidden: !$v.email.$error,
                 }"
               >
                 This doesn't look like an email.
@@ -97,7 +97,6 @@
 <script lang="ts">
 import Component, { mixins } from 'vue-class-component'
 import { validationMixin } from 'vuelidate'
-import { required, email } from 'vuelidate/lib/validators'
 import LayoutSteps from '@/components/LayoutSteps.vue'
 import ProgressBar from '@/components/ProgressBar.vue'
 import FormNavigation from '@/components/FormNavigation.vue'
@@ -114,10 +113,11 @@ import {
 } from '@/store/mutation-types'
 
 import { Project } from '@/api/projects'
-import { Metadata } from '@/api/metadata'
+import { Metadata, MetadataValidations } from '@/api/metadata'
 import { DateTime } from 'luxon'
 import { addRecipient } from '@/api/recipient-registry-optimistic'
 import { waitForTransaction } from '@/utils/contracts'
+import { required, email } from 'vuelidate/lib/validators'
 
 @Component({
   components: {
@@ -132,23 +132,25 @@ import { waitForTransaction } from '@/utils/contracts'
     Loader,
   },
   validations: {
-    metadata: {
-      email: {
-        email,
-        required,
-      },
+    metadata: MetadataValidations,
+    email: {
+      email,
+      required: process.env.VUE_APP_GOOGLE_SPREADSHEET_ID
+        ? required
+        : () => true,
     },
   },
 })
 export default class JoinView extends mixins(validationMixin) {
   currentStep = 0
   steps = this.isEmailRequired
-    ? ['metadata', 'summary', 'email', 'submit']
-    : ['metadata', 'summary', 'submit']
+    ? ['project', 'summary', 'email', 'submit']
+    : ['project', 'summary', 'submit']
   stepNames = this.isEmailRequired
     ? ['Select a project metadata', 'Review', 'Email', 'Submit']
     : ['Select a project metadata', 'Review', 'Submit']
-  metadata = new Metadata({})
+  metadata = new Metadata({ furtherstep: 0 })
+  email = ''
   loading = true
   isWaiting = false
   txHash = ''
@@ -177,22 +179,57 @@ export default class JoinView extends mixins(validationMixin) {
     }
   }
 
+  isLinkStepValid(): boolean {
+    let isValid = false
+    const links = [
+      this.$v.metadata.githubUrl,
+      this.$v.metadata.radicleUrl,
+      this.$v.metadata.websiteUrl,
+      this.$v.metadata.twitterUrl,
+      this.$v.metadata.discordUrl,
+    ]
+
+    for (const link of links.filter(Boolean)) {
+      const isInvalid = link?.$invalid
+      const isEmpty = link?.$model && link?.$model.length === 0
+      if (isInvalid) {
+        return false
+      } else if (!isEmpty) {
+        isValid = true
+      }
+    }
+    return isValid
+  }
+
   isStepValid(step: number): boolean {
-    return this.steps[step] === 'metadata'
-      ? this.hasMetadata
-      : this.hasMetadata && this.isMetadataValid
+    let isValid = true
+    const stepName = this.steps[step]
+    if (stepName === 'summary') {
+      isValid = this.isLinkStepValid() && !this.$v.metadata.$invalid
+    } else if (stepName === 'email') {
+      isValid = !this.$v.email.$invalid
+    }
+
+    return isValid
   }
 
   isStepUnlocked(step: number): boolean {
     return step <= this.furthestStep
   }
 
-  saveFormData(): void {
+  saveFormData(updateFurthest?: boolean): void {
+    if (updateFurthest && this.currentStep + 1 > this.furthestStep) {
+      this.metadata.furthestStep = this.currentStep + 1
+    }
     this.$store.commit(SET_RECIPIENT_DATA, {
       updatedData: this.metadata,
     })
   }
 
+  get furthestStep(): number {
+    return this.metadata.furthestStep || 0
+  }
+
   get isEmailRequired(): boolean {
     return !!process.env.VUE_APP_GOOGLE_SPREADSHEET_ID
   }
@@ -200,7 +237,7 @@ export default class JoinView extends mixins(validationMixin) {
   get isNavDisabled(): boolean {
     return (
       !this.isStepValid(this.currentStep) &&
-      this.currentStep !== this.furthestStep
+      this.currentStep !== this.metadata.furthestStep
     )
   }
 
@@ -208,42 +245,28 @@ export default class JoinView extends mixins(validationMixin) {
     return !!this.metadata.id
   }
 
-  get isMetadataValid(): boolean {
-    // TODO validate metadata
-    return true
-  }
-
-  get furthestStep(): number {
-    let furthest = 0
-    if (this.hasMetadata) {
-      furthest++
-      if (this.isMetadataValid) {
-        furthest++
-        if (
-          process.env.VUE_APP_GOOGLE_SPREADSHEET_ID &&
-          !this.$v.metadata.email?.$invalid
-        ) {
-          furthest++
-        }
-      }
-    }
-    return furthest
-  }
-
   handleMetadataSelected(metadata: Metadata): void {
     this.metadata = metadata
     const id = this.metadata.id || ''
+    this.saveFormData(true)
     this.$router.push({
       name: 'join-step',
       params: { step: 'summary', id },
     })
   }
 
-  async handleStepNav(step: number): Promise<void> {
+  async handleStepNav(step: number, updateFurthest?: boolean): Promise<void> {
     // If isNavDisabled => disable quick-links
     if (this.isNavDisabled) return
+
+    if (this.steps[step] === 'email') {
+      // save the email in metadata for later use
+      this.metadata.email = this.email
+      this.$v.metadata.$touch()
+    }
+
     // Save form data
-    this.saveFormData()
+    this.saveFormData(updateFurthest)
 
     if (step >= this.steps.length) {
       await this.addRecipient()
@@ -268,6 +291,10 @@ export default class JoinView extends mixins(validationMixin) {
     if (id) {
       if (id === this.$store.state.recipient?.id) {
         this.metadata = new Metadata(this.$store.state.recipient)
+        if (this.metadata.email) {
+          this.email = this.metadata.email
+          this.$v.email.$touch()
+        }
       } else {
         try {
           const metadata = await Metadata.get(id)
@@ -313,7 +340,7 @@ export default class JoinView extends mixins(validationMixin) {
         await waitForTransaction(
           addRecipient(
             recipientRegistryAddress,
-            new Metadata(recipient).toFormData(),
+            recipient,
             recipientRegistryInfo.deposit,
             currentUser.walletProvider.getSigner()
           ),
@@ -326,7 +353,7 @@ export default class JoinView extends mixins(validationMixin) {
             headers: {
               'Content-Type': 'application/json',
             },
-            body: JSON.stringify(recipient),
+            body: JSON.stringify(recipient.toFormData()),
           })
         }
         this.$store.commit(RESET_RECIPIENT_DATA)
diff --git a/vue-app/src/views/MetadataForm.vue b/vue-app/src/views/MetadataForm.vue
index 86b0e8d3d..bd8299951 100644
--- a/vue-app/src/views/MetadataForm.vue
+++ b/vue-app/src/views/MetadataForm.vue
@@ -849,7 +849,7 @@ export default class MetadataForm extends mixins(validationMixin) {
       return
     }
     for (const field of Object.keys(this.form[stepName])) {
-      if (this.$v.form[stepName]?.[field].$dirty) {
+      if (this.$v.form[stepName]?.[field]?.$dirty) {
         this.form.dirtyFields.add(`${stepName}.${field}`)
       }
     }

From 85a862aabba6fb43d67c30a50d19bab7d2518e73 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Thu, 21 Jul 2022 11:03:27 -0400
Subject: [PATCH 13/36] update steps for form navigation

---
 vue-app/src/views/JoinOptimistic.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vue-app/src/views/JoinOptimistic.vue b/vue-app/src/views/JoinOptimistic.vue
index c023de28e..38a641cc8 100644
--- a/vue-app/src/views/JoinOptimistic.vue
+++ b/vue-app/src/views/JoinOptimistic.vue
@@ -300,7 +300,7 @@ export default class JoinView extends mixins(validationMixin) {
           const metadata = await Metadata.get(id)
           if (metadata) {
             this.metadata = metadata
-            this.saveFormData()
+            this.saveFormData(true)
           }
         } catch (err) {
           // TODO display the error

From c58b15cb805b7ca1351025e12f7beaa69bae01d2 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Thu, 21 Jul 2022 11:21:26 -0400
Subject: [PATCH 14/36] move  button to drop down menu

---
 vue-app/src/components/NavBar.vue | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/vue-app/src/components/NavBar.vue b/vue-app/src/components/NavBar.vue
index 45f3e288b..d9bee75a9 100644
--- a/vue-app/src/components/NavBar.vue
+++ b/vue-app/src/components/NavBar.vue
@@ -8,13 +8,6 @@
       />
     </links>
     <div class="btn-row">
-      <a
-        href="/#/recipients"
-        v-if="$store.getters.isRecipientRegistryOwner"
-        class="btn-primary margin-right"
-      >
-        Manage Recipients
-      </a>
       <div>
         <img
           @click="toggleTheme()"
@@ -83,9 +76,14 @@ export default class NavBar extends Vue {
       text: 'Code',
       emoji: '👾',
     },
+    {
+      to: '/recipients',
+      text: 'Recipients',
+      emoji: '🚀',
+    },
     {
       to: '/metadata',
-      text: 'Manage metadata',
+      text: 'Metadata',
       emoji: '📃',
     },
   ]

From da5a299e3407b7ebd98a5f6d8214db0d6bec3ef5 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Fri, 22 Jul 2022 12:38:21 -0400
Subject: [PATCH 15/36] allow update fund receiving address on the current
 chain only

---
 vue-app/src/views/MetadataForm.vue | 115 ++++++++---------------------
 1 file changed, 32 insertions(+), 83 deletions(-)

diff --git a/vue-app/src/views/MetadataForm.vue b/vue-app/src/views/MetadataForm.vue
index bd8299951..eee61046c 100644
--- a/vue-app/src/views/MetadataForm.vue
+++ b/vue-app/src/views/MetadataForm.vue
@@ -221,60 +221,26 @@
                   claim funds. This doesn't have to be the same address as the
                   one you use to send your metadata transaction.
                 </p>
-                <div
-                  v-for="(address, index) in form.fund.receivingAddresses"
-                  :key="index"
-                >
-                  <div key="index" class="address-container">
-                    <img
-                      src="@/assets/remove.svg"
-                      alt="remove"
-                      class="remove-icon"
-                      @click="removeAddress(index)"
-                    />
-                    <span class="input-description">
-                      {{ address }}
-                    </span>
-                  </div>
-                </div>
                 <div class="input-row">
-                  <dropdown
-                    :options="sortedNetworks"
-                    :selected="selectedNetwork"
-                    @change="handleDropdownClick"
-                  />
                   <input
                     id="fund-address"
                     placeholder="address, ex: 0x123456789..."
-                    v-model.lazy="$v.addressName.$model"
-                    @focus="$v.addressName.$reset"
+                    v-model.lazy="$v.receivingAddress.$model"
+                    @focus="$v.receivingAddress.$reset"
                     :class="{
                       input: true,
-                      invalid: $v.addressName.$error,
+                      invalid: $v.receivingAddress.$error,
                     }"
                   />
-                  <button
-                    @click="
-                      addAddress({
-                        network: selectedNetwork,
-                        address: addressName,
-                      })
-                    "
-                    class="btn-secondary"
-                    :disabled="$v.addressName.$invalid || !selectedNetwork"
-                  >
-                    Add
-                  </button>
                 </div>
                 <p
                   :class="{
                     error: true,
-                    hidden: !$v.addressName.$error,
+                    hidden: !$v.receivingAddress.$error,
                   }"
                 >
                   Enter a valid Ethereum 0x address
                 </p>
-                <!-- TODO: only validate after user removes focus on input -->
               </div>
               <div class="form-background">
                 <label for="fund-plans" class="input-label"
@@ -573,20 +539,15 @@ import MetadataViewer from '@/views/MetadataViewer.vue'
 import Dropdown from '@/components/Dropdown.vue'
 import { Metadata, MetadataFormData } from '@/api/metadata'
 import { LinkInfo } from '@/api/types'
+import { ReceivingAddress } from '@/api/receiving-address'
 import { Prop, Watch } from 'vue-property-decorator'
 import { chain, TransactionProgress } from '@/api/core'
 
 import { SET_METADATA } from '@/store/mutation-types'
 import { Project, projectExists } from '@/api/projects'
-import { CHAIN_INFO } from '@/plugins/Web3/constants/chains'
 import { ContractReceipt, ContractTransaction } from 'ethers'
 import { waitForTransaction } from '@/utils/contracts'
 
-type RecievingAddress = {
-  network: string
-  address: string
-}
-
 @Component({
   components: {
     LayoutSteps,
@@ -607,7 +568,7 @@ type RecievingAddress = {
     TransactionResult,
   },
   validations: {
-    addressName: { required, validEthAddress: isAddress },
+    receivingAddress: { required, validEthAddress: isAddress },
     form: {
       project: {
         name: { required },
@@ -663,14 +624,12 @@ export default class MetadataForm extends mixins(validationMixin) {
 
   form: MetadataFormData = new Metadata({}).toFormData()
   projectExists = false
-  addressName = ''
+  receivingAddress = ''
   currentStep = 0
   steps: string[] = []
   stepNames: string[] = []
   showSummaryPreview = false
   loading = true
-  networks: string[] = []
-  selectedNetwork = ''
   receipt: { hash: string; chainId: number; id: string } | null = null
 
   progress: TransactionProgress | null = null
@@ -703,8 +662,8 @@ export default class MetadataForm extends mixins(validationMixin) {
     this.currentStep = currentStep
     await this.loadFormData()
     this.form = this.$store.state.metadata
+    this.loadReceivingAddress(this.form)
     this.loading = false
-    this.loadNetworks()
 
     // check if project exists so we can display add/view
     // project button after successfully submitting the metadata transaction
@@ -729,50 +688,38 @@ export default class MetadataForm extends mixins(validationMixin) {
     }
   }
 
-  get sortedNetworks(): string[] {
-    return this.networks.sort()
-  }
-
   @Watch('$web3.user')
   resetError(): void {
     this.txError = ''
   }
 
-  handleDropdownClick(selection: string): void {
-    this.selectedNetwork = selection
-  }
-
-  addAddress({ network, address }: RecievingAddress): void {
-    this.$v.addressName.$touch()
-
-    if (!this.$v.addressName.$invalid && this.selectedNetwork) {
-      this.form.fund.receivingAddresses.push(`${network}:${address}`)
+  updateFundReceivingAddress(): void {
+    if (!this.$v.receivingAddress.$invalid) {
+      const addresses = ReceivingAddress.fromArray(
+        this.form.fund.receivingAddresses
+      )
+      addresses[chain.shortName] = this.receivingAddress
+      this.form.fund.receivingAddresses = ReceivingAddress.toArray(addresses)
       this.$v.form.fund?.receivingAddresses.$touch()
-      this.networks = this.networks.filter((net) => net !== network)
-      this.selectedNetwork = this.networks[0]
     }
   }
 
-  loadNetworks(): void {
-    const exclusion = new Set(
-      this.form.fund.receivingAddresses.map((addr) => {
-        const [network] = addr.split(':')
-        return network
-      })
+  loadReceivingAddress(formData: MetadataFormData): void {
+    const fundingAddresses = formData.fund.receivingAddresses.reduce(
+      (addresses, chainAddressString) => {
+        const chainAddress = chainAddressString.split(':')
+        if (chainAddress.length == 2) {
+          addresses[chainAddress[0]] = chainAddress[1]
+        }
+        return addresses
+      },
+      {}
     )
-    // filter out the networks already in the receiving list
-    this.networks = Object.values(CHAIN_INFO)
-      .map(({ shortName }) => shortName)
-      .filter((name) => {
-        return !exclusion.has(name)
-      })
-    this.selectedNetwork = this.networks[0] || ''
-  }
 
-  removeAddress(index): void {
-    this.form.fund.receivingAddresses.splice(index, 1)
-    this.$v.form.fund?.receivingAddresses.$touch()
-    this.loadNetworks()
+    if (fundingAddresses[chain.shortName]) {
+      this.receivingAddress = fundingAddresses[chain.shortName]
+      this.$v.receivingAddress.$touch()
+    }
   }
 
   initFurthestStep(): void {
@@ -833,6 +780,8 @@ export default class MetadataForm extends mixins(validationMixin) {
     }
     if (typeof this.currentStep !== 'number') return
 
+    this.updateFundReceivingAddress()
+
     this.updateDirtyFlags()
 
     this.$store.commit(SET_METADATA, {
@@ -1004,7 +953,7 @@ export default class MetadataForm extends mixins(validationMixin) {
 
 .input-row {
   display: grid;
-  grid-template-columns: 130px 2fr auto;
+  grid-template-columns: 2fr auto;
   column-gap: 10px;
   & > * {
     margin: 8px 0;

From ba0dd135b91b4fa1bec7c3401b7c86c079b045a2 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Tue, 26 Jul 2022 00:47:25 -0400
Subject: [PATCH 16/36] add metadata validation and code cleanup

---
 vue-app/src/App.vue                           |   1 +
 vue-app/src/api/metadata.ts                   | 123 ++++----
 vue-app/src/api/receiving-address.ts          |  36 +++
 .../src/api/recipient-registry-optimistic.ts  |  32 +-
 vue-app/src/api/recipient.ts                  |  31 --
 .../components/MetadataSubmissionWidget.vue   |  43 ++-
 vue-app/src/components/TransactionResult.vue  |   6 +-
 vue-app/src/router/index.ts                   |   9 +
 vue-app/src/views/JoinOptimistic.vue          |  64 ++--
 vue-app/src/views/MetadataForm.vue            | 146 +++------
 .../src/views/MetadataTransactionSuccess.vue  | 174 +++++++++++
 vue-app/src/views/MetadataViewer.vue          | 277 +++++++++++-------
 12 files changed, 554 insertions(+), 388 deletions(-)
 create mode 100644 vue-app/src/api/receiving-address.ts
 create mode 100644 vue-app/src/views/MetadataTransactionSuccess.vue

diff --git a/vue-app/src/App.vue b/vue-app/src/App.vue
index a4ba66248..4c2d1a60f 100644
--- a/vue-app/src/App.vue
+++ b/vue-app/src/App.vue
@@ -177,6 +177,7 @@ export default class App extends Vue {
       'join-step',
       'round-information',
       'transaction-success',
+      'metadata-success',
       'verify',
       'verify-step',
       'verified',
diff --git a/vue-app/src/api/metadata.ts b/vue-app/src/api/metadata.ts
index fa0563d13..c99bf3d3e 100644
--- a/vue-app/src/api/metadata.ts
+++ b/vue-app/src/api/metadata.ts
@@ -4,7 +4,9 @@ import { METADATA_NETWORKS, METADATA_SUBGRAPH_URL_PREFIX, chain } from './core'
 import { Project } from './projects'
 import { Ipfs } from './ipfs'
 import { MAX_RETRIES } from './core'
-import { required, url } from 'vuelidate/lib/validators'
+import { required, url, maxLength } from 'vuelidate/lib/validators'
+import * as isIPFS from 'is-ipfs'
+import { ReceivingAddress } from '@/api/receiving-address'
 
 const subgraphUrl = (network: string): string =>
   `${METADATA_SUBGRAPH_URL_PREFIX}${network}`
@@ -40,6 +42,7 @@ export interface MetadataFormData {
   }
   fund: {
     receivingAddresses: string[]
+    currentChainReceivingAddress: string
     plans: string
   }
   team: {
@@ -65,39 +68,56 @@ export interface MetadataFormData {
   owner?: string
 }
 
-export const MetadataValidations = {
-  id: { required },
-  name: { required },
-  tagline: { required },
-  description: { required },
-  category: { required },
-  problemSpace: { required },
-  githubUrl: { url },
-  radicleUrl: { url },
-  websiteUrl: { url },
-  twitterUrl: { url },
-  discordUrl: { url },
-  bannerImageHash: { required },
-  thumbnailImageHash: { required },
+export const MetadataFormValidations = {
+  project: {
+    name: { required },
+    tagline: {
+      required,
+      maxLength: maxLength(140),
+    },
+    description: { required },
+    category: { required },
+    problemSpace: { required },
+  },
+  fund: {
+    receivingAddresses: {},
+    currentChainReceivingAddress: {
+      required,
+      validEthAddress: utils.isAddress,
+    },
+    plans: { required },
+  },
+  team: {
+    name: {},
+    description: {},
+  },
+  links: {
+    github: { url },
+    radicle: { url },
+    website: { url },
+    twitter: { url },
+    discord: { url },
+  },
+  image: {
+    bannerHash: {
+      required,
+      validIpfsHash: isIPFS.cid,
+    },
+    thumbnailHash: {
+      required,
+      validIpfsHash: isIPFS.cid,
+    },
+  },
 }
 
 /**
- * Extract address for the given chain
+ * Extract address for the current chain from the fund receiving addresses
  * @param receivingAddresses array of EIP-3770 addresses, i.e. eth:0x11111...
- * @param chainShortName chain short name
- * @returns address for the chain
+ * @returns address for the current chain
  */
-function getAddressForChain(
-  receivingAddresses: string[] = [],
-  chainShortName: string
-): string {
-  const chainAddresses = receivingAddresses.reduce((addresses, data) => {
-    const [chainName, address] = data.split(':')
-    addresses[chainName] = address
-    return addresses
-  }, {})
-
-  return chainAddresses[chainShortName]
+function getAddressForCurrentChain(receivingAddresses: string[] = []): string {
+  const addresses = ReceivingAddress.fromArray(receivingAddresses)
+  return addresses[chain.shortName]
 }
 
 /**
@@ -121,23 +141,6 @@ async function getLatestBlock(network: string): Promise<number> {
   return meta.block.number
 }
 
-/**
- * Parse and populate receiving addresses
- * @param data data containing receivingAddresses
- * @returns metadata populated with resolvedAddress and addressName
- */
-async function populateAddresses(data: any): Promise<Metadata> {
-  const addressName = getAddressForChain(
-    data.receivingAddresses,
-    chain.shortName
-  )
-
-  return {
-    ...data,
-    addressName,
-  }
-}
-
 function sleep(factor: number): Promise<void> {
   const timeout = factor ** 2 * 1000
   return new Promise((resolve) => setTimeout(resolve, timeout))
@@ -152,8 +155,7 @@ export class Metadata {
   owner?: string
   network?: string
   receivingAddresses?: string[]
-  addressName?: string
-  resolvedAddress?: string
+  currentChainReceivingAddress?: string
   tagline?: string
   description?: string
   category?: string
@@ -179,6 +181,9 @@ export class Metadata {
     this.owner = data.owner
     this.network = data.network
     this.receivingAddresses = data.receivingAddresses
+    this.currentChainReceivingAddress = getAddressForCurrentChain(
+      data.receivingAddresses
+    )
     this.tagline = data.tagline
     this.description = data.description
     this.category = data.category
@@ -233,8 +238,7 @@ export class Metadata {
       return null
     }
 
-    const arg = await populateAddresses(data)
-    return new Metadata({ ...arg })
+    return new Metadata({ ...data })
   }
 
   /**
@@ -252,29 +256,14 @@ export class Metadata {
     return result.data?.metadataEntries || []
   }
 
-  /**
-   * get the receiving address of the current chain
-   * @param addresses list of EIP3770 addresses
-   * @returns the address of the current chain
-   */
-  getCurrentChainAddress(addresses: string[] = []): string {
-    const chainPrefix = chain.shortName + ':'
-    const chainAddress = addresses.find((addr) => {
-      return addr.startsWith(chainPrefix)
-    })
-
-    return chainAddress ? chainAddress.substring(chainPrefix.length) : ''
-  }
-
   /**
    * Convert metadata to project interface
    * @returns project
    */
   toProject(): Project {
-    const address = this.getCurrentChainAddress(this.receivingAddresses)
     return {
       id: this.id || '',
-      address,
+      address: this.currentChainReceivingAddress || '',
       name: this.name || '',
       tagline: this.tagline,
       description: this.description || '',
@@ -312,6 +301,8 @@ export class Metadata {
       },
       fund: {
         receivingAddresses: this.receivingAddresses || [],
+        currentChainReceivingAddress:
+          getAddressForCurrentChain(this.receivingAddresses) || '',
         plans: this.plans || '',
       },
       team: {
diff --git a/vue-app/src/api/receiving-address.ts b/vue-app/src/api/receiving-address.ts
new file mode 100644
index 000000000..6f12d0424
--- /dev/null
+++ b/vue-app/src/api/receiving-address.ts
@@ -0,0 +1,36 @@
+/**
+ * Fund Receiving Address
+ */
+export class ReceivingAddress {
+  /**
+   * Convert the receiving addresses from string to a lookup dictionary
+   * @param addresses array of EIP3770 addresses (e.g. eth:0x1234...)
+   * @returns a dictionary of chain short name to address
+   */
+  static fromArray(addresses: string[]): Record<string, string> {
+    const result: Record<string, string> = addresses.reduce(
+      (addresses, item) => {
+        const chainAddress = item.split(':')
+
+        if (chainAddress.length === 2) {
+          addresses[chainAddress[0]] = chainAddress[1]
+        }
+        return addresses
+      },
+      {}
+    )
+
+    return result
+  }
+
+  /**
+   * Convert a chain-address dictionary to an array of EIP3770 addresses
+   * @param addresses a dictionary with chain short name to address
+   * @returns an array of EIP3770 addresses
+   */
+  static toArray(addresses: Record<string, string>): string[] {
+    return Object.entries(addresses).map(
+      ([chain, address]) => `${chain}:${address}`
+    )
+  }
+}
diff --git a/vue-app/src/api/recipient-registry-optimistic.ts b/vue-app/src/api/recipient-registry-optimistic.ts
index 671dd56df..0499caf2c 100644
--- a/vue-app/src/api/recipient-registry-optimistic.ts
+++ b/vue-app/src/api/recipient-registry-optimistic.ts
@@ -6,9 +6,8 @@ import {
 import { getEventArg } from '@/utils/contracts'
 
 import { OptimisticRecipientRegistry } from './abi'
-import { RecipientApplicationData } from './recipient'
 import { RecipientRegistryInterface } from './types'
-import { Metadata } from './metadata'
+import { MetadataFormData } from './metadata'
 import { chain } from './core'
 
 // TODO merge this with `Project` inteface
@@ -33,33 +32,9 @@ export interface RecipientData {
   thumbnailImageHash?: string
 }
 
-export function formToRecipientData(
-  data: RecipientApplicationData
-): RecipientData {
-  const { project, fund, team, links, image } = data
-  return {
-    address: fund.resolvedAddress,
-    name: project.name,
-    tagline: project.tagline,
-    description: project.description,
-    category: project.category,
-    problemSpace: project.problemSpace,
-    plans: fund.plans,
-    teamName: team.name,
-    teamDescription: team.description,
-    githubUrl: links.github,
-    radicleUrl: links.radicle,
-    websiteUrl: links.website,
-    twitterUrl: links.twitter,
-    discordUrl: links.discord,
-    bannerImageHash: image.bannerHash,
-    thumbnailImageHash: image.thumbnailHash,
-  }
-}
-
 export async function addRecipient(
   registryAddress: string,
-  recipientMetadata: Metadata,
+  recipientMetadata: MetadataFormData,
   deposit: BigNumber,
   signer: Signer
 ): Promise<TransactionResponse> {
@@ -68,11 +43,12 @@ export async function addRecipient(
     OptimisticRecipientRegistry,
     signer
   )
-  const { id, address } = recipientMetadata.toProject()
+  const { id, fund } = recipientMetadata
   if (!id) {
     throw new Error('Missing metadata id')
   }
 
+  const { currentChainReceivingAddress: address } = fund
   if (!address) {
     throw new Error(`Missing recipient address for the ${chain.name} network`)
   }
diff --git a/vue-app/src/api/recipient.ts b/vue-app/src/api/recipient.ts
index 951e5893b..d001923b2 100644
--- a/vue-app/src/api/recipient.ts
+++ b/vue-app/src/api/recipient.ts
@@ -1,6 +1,3 @@
-import { Project } from './projects'
-import { ipfsGatewayUrl } from './core'
-
 export interface RecipientApplicationData {
   project: {
     name: string
@@ -35,31 +32,3 @@ export interface RecipientApplicationData {
   hasEns: boolean
   id?: string
 }
-
-export function formToProjectInterface(
-  data: RecipientApplicationData
-): Project {
-  const { project, fund, team, links, image } = data
-  return {
-    id: fund.resolvedAddress,
-    address: fund.resolvedAddress,
-    name: project.name,
-    tagline: project.tagline,
-    description: project.description,
-    category: project.category,
-    problemSpace: project.problemSpace,
-    plans: fund.plans,
-    teamName: team.name,
-    teamDescription: team.description,
-    githubUrl: links.github,
-    radicleUrl: links.radicle,
-    websiteUrl: links.website,
-    twitterUrl: links.twitter,
-    discordUrl: links.discord,
-    bannerImageUrl: `${ipfsGatewayUrl}/ipfs/${image.bannerHash}`,
-    thumbnailImageUrl: `${ipfsGatewayUrl}/ipfs/${image.thumbnailHash}`,
-    index: 0,
-    isHidden: false,
-    isLocked: true,
-  }
-}
diff --git a/vue-app/src/components/MetadataSubmissionWidget.vue b/vue-app/src/components/MetadataSubmissionWidget.vue
index d2e8dc871..f06117839 100644
--- a/vue-app/src/components/MetadataSubmissionWidget.vue
+++ b/vue-app/src/components/MetadataSubmissionWidget.vue
@@ -3,8 +3,11 @@
     <div v-if="currentUser">
       <div>
         <div v-if="isWaiting" class="mt2">
-          <div v-if="progress">
-            Waiting for block {{ progress.current }} of {{ progress.last }}...
+          <div v-if="txHash">
+            <template v-if="progress">
+              Waiting for block {{ progress.current }} of {{ progress.last }}...
+            </template>
+            <template v-else> Waiting for transaction to be mined... </template>
           </div>
           <div v-else>Check your wallet for a prompt...</div>
         </div>
@@ -16,12 +19,27 @@
       </div>
       <div class="connected">
         <div class="cta">
-          <div v-if="isWaiting">
-            <loader class="button-loader" />
-          </div>
+          <template v-if="showButton">
+            <button
+              @click="buttonHandler()"
+              class="btn-action"
+              :disabled="isWaiting"
+            >
+              <div v-if="isWaiting">
+                <loader class="button-loader" />
+              </div>
+              <div v-else>Submit</div>
+            </button>
+          </template>
+          <template v-else>
+            <div v-if="isWaiting">
+              <loader class="button-loader" />
+            </div>
+          </template>
         </div>
       </div>
     </div>
+    <wallet-widget class="m2" v-if="!currentUser && showButton" />
   </div>
 </template>
 
@@ -29,7 +47,6 @@
 import Vue from 'vue'
 import Component from 'vue-class-component'
 import { Prop } from 'vue-property-decorator'
-import { MetadataFormData } from '@/api/metadata'
 import { User } from '@/api/user'
 import { chain, TransactionProgress } from '@/api/core'
 
@@ -37,8 +54,6 @@ import Loader from '@/components/Loader.vue'
 import Transaction from '@/components/Transaction.vue'
 import WalletWidget from '@/components/WalletWidget.vue'
 
-import { ContractTransaction, ContractReceipt } from '@ethersproject/contracts'
-
 @Component({
   components: {
     Loader,
@@ -47,17 +62,12 @@ import { ContractTransaction, ContractReceipt } from '@ethersproject/contracts'
   },
 })
 export default class MetadataSubmissionWidget extends Vue {
-  @Prop() buttonLabel!: string
-  @Prop() form!: MetadataFormData
-  @Prop() onSubmit!: (
-    form: MetadataFormData,
-    provider: any
-  ) => Promise<ContractTransaction>
-  @Prop() onSuccess!: (receipt: ContractReceipt, chainId: number) => void
   @Prop() isWaiting!: boolean
   @Prop({ default: null }) progress!: TransactionProgress | null
   @Prop({ default: '' }) txHash!: string
   @Prop({ default: '' }) txError!: string
+  @Prop({ default: null }) buttonHandler!: () => void
+  @Prop({ default: false }) disableButton!: boolean
 
   get currentUser(): User | null {
     return this.$store.state.currentUser
@@ -70,6 +80,9 @@ export default class MetadataSubmissionWidget extends Vue {
   get hasTxError(): boolean {
     return !!this.txError
   }
+  get showButton(): boolean {
+    return !!this.buttonHandler
+  }
 }
 </script>
 
diff --git a/vue-app/src/components/TransactionResult.vue b/vue-app/src/components/TransactionResult.vue
index 6a94933c3..0800ddab4 100644
--- a/vue-app/src/components/TransactionResult.vue
+++ b/vue-app/src/components/TransactionResult.vue
@@ -20,8 +20,9 @@ import Vue from 'vue'
 import Component from 'vue-class-component'
 import { Prop } from 'vue-property-decorator'
 
-import { ChainInfo, CHAIN_INFO, ChainId } from '@/plugins/Web3/constants/chains'
+import { ChainInfo } from '@/plugins/Web3/constants/chains'
 import { LinkInfo } from '@/api/types'
+import { chain } from '@/api/core'
 import TransactionReceipt from '@/components/TransactionReceipt.vue'
 import Links from '@/components/Links.vue'
 import ImageResponsive from '@/components/ImageResponsive.vue'
@@ -35,11 +36,10 @@ import ImageResponsive from '@/components/ImageResponsive.vue'
 })
 export default class TransactionResult extends Vue {
   @Prop() hash!: string
-  @Prop() chainId!: ChainId
   @Prop() buttons!: LinkInfo[]
 
   get chain(): ChainInfo {
-    return CHAIN_INFO[this.chainId]
+    return chain
   }
 }
 </script>
diff --git a/vue-app/src/router/index.ts b/vue-app/src/router/index.ts
index 124b763f2..3573a74b9 100644
--- a/vue-app/src/router/index.ts
+++ b/vue-app/src/router/index.ts
@@ -29,6 +29,7 @@ import MetadataDetail from '@/views/Metadata.vue'
 import MetadataRegistry from '@/views/MetadataRegistry.vue'
 import MetadataFormAdd from '@/views/MetadataFormAdd.vue'
 import MetadataFormEdit from '@/views/MetadataFormEdit.vue'
+import MetadataTransactionSuccess from '@/views/MetadataTransactionSuccess.vue'
 import NotFound from '@/views/NotFound.vue'
 
 Vue.use(VueRouter)
@@ -237,6 +238,14 @@ const routes = [
       title: 'Transaction Success',
     },
   },
+  {
+    path: '/metadata-success/:hash/:id',
+    name: 'metadata-success',
+    component: MetadataTransactionSuccess,
+    meta: {
+      title: 'Metadata Transaction Success',
+    },
+  },
   {
     path: '/metadata',
     name: 'metadata-registry',
diff --git a/vue-app/src/views/JoinOptimistic.vue b/vue-app/src/views/JoinOptimistic.vue
index 38a641cc8..b54beb437 100644
--- a/vue-app/src/views/JoinOptimistic.vue
+++ b/vue-app/src/views/JoinOptimistic.vue
@@ -113,7 +113,7 @@ import {
 } from '@/store/mutation-types'
 
 import { Project } from '@/api/projects'
-import { Metadata, MetadataValidations } from '@/api/metadata'
+import { Metadata, MetadataFormValidations } from '@/api/metadata'
 import { DateTime } from 'luxon'
 import { addRecipient } from '@/api/recipient-registry-optimistic'
 import { waitForTransaction } from '@/utils/contracts'
@@ -132,7 +132,7 @@ import { required, email } from 'vuelidate/lib/validators'
     Loader,
   },
   validations: {
-    metadata: MetadataValidations,
+    form: MetadataFormValidations,
     email: {
       email,
       required: process.env.VUE_APP_GOOGLE_SPREADSHEET_ID
@@ -149,7 +149,7 @@ export default class JoinView extends mixins(validationMixin) {
   stepNames = this.isEmailRequired
     ? ['Select a project metadata', 'Review', 'Email', 'Submit']
     : ['Select a project metadata', 'Review', 'Submit']
-  metadata = new Metadata({ furtherstep: 0 })
+  form = new Metadata({ furtherstep: 0 }).toFormData()
   email = ''
   loading = true
   isWaiting = false
@@ -179,19 +179,19 @@ export default class JoinView extends mixins(validationMixin) {
     }
   }
 
+  get metadata(): Metadata {
+    return Metadata.fromFormData(this.form)
+  }
+
+  // Check that at least one link is not empty && no links are invalid
   isLinkStepValid(): boolean {
     let isValid = false
-    const links = [
-      this.$v.metadata.githubUrl,
-      this.$v.metadata.radicleUrl,
-      this.$v.metadata.websiteUrl,
-      this.$v.metadata.twitterUrl,
-      this.$v.metadata.discordUrl,
-    ]
-
-    for (const link of links.filter(Boolean)) {
-      const isInvalid = link?.$invalid
-      const isEmpty = link?.$model && link?.$model.length === 0
+    const links = Object.keys(this.form.links)
+    for (const link of links) {
+      const linkData = this.$v.form.links?.[link]
+      if (!linkData) return false
+      const isInvalid = linkData.$invalid
+      const isEmpty = linkData.$model.length === 0
       if (isInvalid) {
         return false
       } else if (!isEmpty) {
@@ -202,10 +202,14 @@ export default class JoinView extends mixins(validationMixin) {
   }
 
   isStepValid(step: number): boolean {
+    if (this.isWaiting) {
+      return false
+    }
+
     let isValid = true
     const stepName = this.steps[step]
     if (stepName === 'summary') {
-      isValid = this.isLinkStepValid() && !this.$v.metadata.$invalid
+      isValid = this.isLinkStepValid() && !this.$v.form.$invalid
     } else if (stepName === 'email') {
       isValid = !this.$v.email.$invalid
     }
@@ -219,15 +223,15 @@ export default class JoinView extends mixins(validationMixin) {
 
   saveFormData(updateFurthest?: boolean): void {
     if (updateFurthest && this.currentStep + 1 > this.furthestStep) {
-      this.metadata.furthestStep = this.currentStep + 1
+      this.form.furthestStep = this.currentStep + 1
     }
     this.$store.commit(SET_RECIPIENT_DATA, {
-      updatedData: this.metadata,
+      updatedData: this.form,
     })
   }
 
   get furthestStep(): number {
-    return this.metadata.furthestStep || 0
+    return this.form.furthestStep || 0
   }
 
   get isEmailRequired(): boolean {
@@ -237,17 +241,17 @@ export default class JoinView extends mixins(validationMixin) {
   get isNavDisabled(): boolean {
     return (
       !this.isStepValid(this.currentStep) &&
-      this.currentStep !== this.metadata.furthestStep
+      this.currentStep !== this.form.furthestStep
     )
   }
 
   get hasMetadata(): boolean {
-    return !!this.metadata.id
+    return !!this.form.id
   }
 
   handleMetadataSelected(metadata: Metadata): void {
-    this.metadata = metadata
-    const id = this.metadata.id || ''
+    this.form = metadata.toFormData()
+    const id = metadata.id || ''
     this.saveFormData(true)
     this.$router.push({
       name: 'join-step',
@@ -261,8 +265,8 @@ export default class JoinView extends mixins(validationMixin) {
 
     if (this.steps[step] === 'email') {
       // save the email in metadata for later use
-      this.metadata.email = this.email
-      this.$v.metadata.$touch()
+      this.form.team.email = this.email
+      this.$v.form.$touch()
     }
 
     // Save form data
@@ -273,7 +277,7 @@ export default class JoinView extends mixins(validationMixin) {
     } else {
       // Navigate
       if (this.isStepUnlocked(step)) {
-        const id = this.metadata.id || ''
+        const id = this.form.id || ''
         this.$router.push({
           name: 'join-step',
           params: {
@@ -290,16 +294,16 @@ export default class JoinView extends mixins(validationMixin) {
 
     if (id) {
       if (id === this.$store.state.recipient?.id) {
-        this.metadata = new Metadata(this.$store.state.recipient)
-        if (this.metadata.email) {
-          this.email = this.metadata.email
+        this.form = this.$store.state.recipient
+        if (this.form.team.email) {
+          this.email = this.form.team.email
           this.$v.email.$touch()
         }
       } else {
         try {
           const metadata = await Metadata.get(id)
           if (metadata) {
-            this.metadata = metadata
+            this.form = metadata.toFormData()
             this.saveFormData(true)
           }
         } catch (err) {
@@ -353,7 +357,7 @@ export default class JoinView extends mixins(validationMixin) {
             headers: {
               'Content-Type': 'application/json',
             },
-            body: JSON.stringify(recipient.toFormData()),
+            body: JSON.stringify(recipient),
           })
         }
         this.$store.commit(RESET_RECIPIENT_DATA)
diff --git a/vue-app/src/views/MetadataForm.vue b/vue-app/src/views/MetadataForm.vue
index eee61046c..0ed4d443c 100644
--- a/vue-app/src/views/MetadataForm.vue
+++ b/vue-app/src/views/MetadataForm.vue
@@ -225,18 +225,20 @@
                   <input
                     id="fund-address"
                     placeholder="address, ex: 0x123456789..."
-                    v-model.lazy="$v.receivingAddress.$model"
-                    @focus="$v.receivingAddress.$reset"
+                    v-model.lazy="
+                      $v.form.fund.currentChainReceivingAddress.$model
+                    "
+                    @focus="$v.form.fund.currentChainReceivingAddress.$reset"
                     :class="{
                       input: true,
-                      invalid: $v.receivingAddress.$error,
+                      invalid: $v.form.fund.currentChainReceivingAddress.$error,
                     }"
                   />
                 </div>
                 <p
                   :class="{
                     error: true,
-                    hidden: !$v.receivingAddress.$error,
+                    hidden: !$v.form.fund.currentChainReceivingAddress.$error,
                   }"
                 >
                   Enter a valid Ethereum 0x address
@@ -480,17 +482,7 @@
               blockchain.
             </p>
             <div class="inputs">
-              <transaction-result
-                v-if="receipt"
-                :hash="receipt.hash"
-                :chainId="receipt.chainId"
-                :buttons="redirectButtons"
-              />
               <metadata-submission-widget
-                v-else
-                :form="form"
-                :onSuccess="onSuccess"
-                :onSubmit="onSubmit"
                 :txHash="txHash"
                 :isWaiting="isWaiting"
                 :progress="progress"
@@ -518,9 +510,6 @@
 <script lang="ts">
 import Component, { mixins } from 'vue-class-component'
 import { validationMixin } from 'vuelidate'
-import { required, minLength, maxLength, url } from 'vuelidate/lib/validators'
-import * as isIPFS from 'is-ipfs'
-import { isAddress } from '@ethersproject/address'
 import LayoutSteps from '@/components/LayoutSteps.vue'
 import ProgressBar from '@/components/ProgressBar.vue'
 import FormNavigation from '@/components/FormNavigation.vue'
@@ -537,15 +526,19 @@ import TransactionResult from '@/components/TransactionResult.vue'
 import MetadataList from '@/views/MetadataList.vue'
 import MetadataViewer from '@/views/MetadataViewer.vue'
 import Dropdown from '@/components/Dropdown.vue'
-import { Metadata, MetadataFormData } from '@/api/metadata'
+import {
+  Metadata,
+  MetadataFormData,
+  MetadataFormValidations,
+} from '@/api/metadata'
 import { LinkInfo } from '@/api/types'
 import { ReceivingAddress } from '@/api/receiving-address'
 import { Prop, Watch } from 'vue-property-decorator'
 import { chain, TransactionProgress } from '@/api/core'
 
-import { SET_METADATA } from '@/store/mutation-types'
+import { SET_METADATA, RESET_RECIPIENT_DATA } from '@/store/mutation-types'
 import { Project, projectExists } from '@/api/projects'
-import { ContractReceipt, ContractTransaction } from 'ethers'
+import { ContractTransaction } from 'ethers'
 import { waitForTransaction } from '@/utils/contracts'
 
 @Component({
@@ -568,48 +561,7 @@ import { waitForTransaction } from '@/utils/contracts'
     TransactionResult,
   },
   validations: {
-    receivingAddress: { required, validEthAddress: isAddress },
-    form: {
-      project: {
-        name: { required },
-        tagline: {
-          required,
-          maxLength: maxLength(140),
-        },
-        description: { required },
-        category: { required },
-        problemSpace: { required },
-      },
-      fund: {
-        receivingAddresses: {
-          required,
-          minLength: minLength(1),
-        },
-        resolvedAddress: {},
-        plans: { required },
-      },
-      team: {
-        name: {},
-        description: {},
-      },
-      links: {
-        github: { url },
-        radicle: { url },
-        website: { url },
-        twitter: { url },
-        discord: { url },
-      },
-      image: {
-        bannerHash: {
-          required,
-          validIpfsHash: isIPFS.cid,
-        },
-        thumbnailHash: {
-          required,
-          validIpfsHash: isIPFS.cid,
-        },
-      },
-    },
+    form: MetadataFormValidations,
   },
 })
 export default class MetadataForm extends mixins(validationMixin) {
@@ -622,7 +574,7 @@ export default class MetadataForm extends mixins(validationMixin) {
     provider: any
   ) => Promise<ContractTransaction>
 
-  form: MetadataFormData = new Metadata({}).toFormData()
+  form = new Metadata({}).toFormData()
   projectExists = false
   receivingAddress = ''
   currentStep = 0
@@ -660,9 +612,7 @@ export default class MetadataForm extends mixins(validationMixin) {
     this.steps = steps
     this.stepNames = stepNames
     this.currentStep = currentStep
-    await this.loadFormData()
-    this.form = this.$store.state.metadata
-    this.loadReceivingAddress(this.form)
+    await this.populateForm()
     this.loading = false
 
     // check if project exists so we can display add/view
@@ -693,35 +643,22 @@ export default class MetadataForm extends mixins(validationMixin) {
     this.txError = ''
   }
 
+  async populateForm(): Promise<void> {
+    await this.loadFormData()
+    this.form = this.$store.state.metadata
+  }
+
   updateFundReceivingAddress(): void {
-    if (!this.$v.receivingAddress.$invalid) {
+    if (!this.$v.form.fund?.$invalid) {
       const addresses = ReceivingAddress.fromArray(
         this.form.fund.receivingAddresses
       )
-      addresses[chain.shortName] = this.receivingAddress
+      addresses[chain.shortName] = this.form.fund.currentChainReceivingAddress
       this.form.fund.receivingAddresses = ReceivingAddress.toArray(addresses)
       this.$v.form.fund?.receivingAddresses.$touch()
     }
   }
 
-  loadReceivingAddress(formData: MetadataFormData): void {
-    const fundingAddresses = formData.fund.receivingAddresses.reduce(
-      (addresses, chainAddressString) => {
-        const chainAddress = chainAddressString.split(':')
-        if (chainAddress.length == 2) {
-          addresses[chainAddress[0]] = chainAddress[1]
-        }
-        return addresses
-      },
-      {}
-    )
-
-    if (fundingAddresses[chain.shortName]) {
-      this.receivingAddress = fundingAddresses[chain.shortName]
-      this.$v.receivingAddress.$touch()
-    }
-  }
-
   initFurthestStep(): void {
     let step = 0
     const validations = Object.keys(this.$v.form.$params)
@@ -763,6 +700,10 @@ export default class MetadataForm extends mixins(validationMixin) {
   }
 
   isStepValid(step: number): boolean {
+    if (this.isWaiting) {
+      return false
+    }
+
     const stepName: string = this.steps[step]
     if (stepName === 'links') {
       return this.isLinkStepValid()
@@ -832,25 +773,29 @@ export default class MetadataForm extends mixins(validationMixin) {
       try {
         this.isWaiting = true
         const transaction = this.onSubmit(this.form, walletProvider)
-        const receipt = await waitForTransaction(
-          transaction,
-          (hash) => (this.txHash = hash)
-        )
+        this.txHash = (await transaction).hash
+        const receipt = await waitForTransaction(transaction)
 
+        this.updateProgress(0, receipt.blockNumber)
         await Metadata.waitForBlock(
           receipt.blockNumber,
           chain.name,
           0,
           this.updateProgress
         )
+
         this.isWaiting = false
 
-        if (this.onSuccess) {
-          this.onSuccess(receipt, this.$web3.chainId)
-        }
+        // reset so that add project will pick up the latest metadata
+        this.$store.commit(RESET_RECIPIENT_DATA)
+
+        this.$router.push({
+          name: 'metadata-success',
+          params: { hash: this.txHash, id: this.metadataId },
+        })
       } catch (error) {
         this.isWaiting = false
-        this.txError = error.message
+        this.txError = (error as Error).message
         return
       }
     }
@@ -874,15 +819,10 @@ export default class MetadataForm extends mixins(validationMixin) {
     }
   }
 
-  onSuccess(txReceipt: ContractReceipt, chainId: number): void {
-    const { transactionHash: hash, from: owner } = txReceipt
-    let id = this.form.id
-    if (!id) {
-      const name = this.form.project.name || ''
-      id = Metadata.makeMetadataId(name, owner)
-    }
-
-    this.receipt = { hash, id, chainId }
+  get metadataId(): string {
+    const projectName = this.form.project.name || ''
+    const owner = this.form.owner || ''
+    return this.form.id || Metadata.makeMetadataId(projectName, owner)
   }
 
   get metadataInterface(): Metadata {
diff --git a/vue-app/src/views/MetadataTransactionSuccess.vue b/vue-app/src/views/MetadataTransactionSuccess.vue
new file mode 100644
index 000000000..2398e2d93
--- /dev/null
+++ b/vue-app/src/views/MetadataTransactionSuccess.vue
@@ -0,0 +1,174 @@
+@ -0,0 +1,36 @@
+<template>
+  <div>
+    <round-status-banner v-if="$store.state.currentRound" />
+    <div class="gradient">
+      <img src="@/assets/moon.png" class="moon" />
+      <div class="hero">
+        <image-responsive title="newrings" />
+        <div class="content">
+          <span class="emoji">🎉</span>
+          <div class="flex-title">
+            <h1>Ready to add project!</h1>
+            <transaction-receipt
+              v-if="$route.params.hash"
+              :hash="$route.params.hash"
+            />
+          </div>
+          <div class="subtitle">
+            Your project metadata has been added successfully.
+          </div>
+          <p>You can now add your project as a grant recipient.</p>
+          <div class="mt2 button-spacing">
+            <links :to="addProjectUrl" class="btn-primary">Add project</links>
+            <links :to="metadataUrl" class="btn-secondary">View metadata</links>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import Vue from 'vue'
+import Component from 'vue-class-component'
+import ProgressBar from '@/components/ProgressBar.vue'
+import RoundStatusBanner from '@/components/RoundStatusBanner.vue'
+import Links from '@/components/Links.vue'
+import TransactionReceipt from '@/components/TransactionReceipt.vue'
+import ImageResponsive from '@/components/ImageResponsive.vue'
+
+@Component({
+  components: {
+    ProgressBar,
+    RoundStatusBanner,
+    Links,
+    TransactionReceipt,
+    ImageResponsive,
+  },
+})
+export default class Verified extends Vue {
+  get metadataUrl(): string {
+    return `/metadata/${this.$route.params.id}`
+  }
+
+  get addProjectUrl(): string {
+    return this.$route.params.id
+      ? `/join/summary/${this.$route.params.id}`
+      : '/join/project'
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import '../styles/vars';
+@import '../styles/theme';
+
+.emoji {
+  font-size: 40px;
+}
+
+h1 {
+  font-family: Glacial Indifference;
+  font-style: normal;
+  font-weight: bold;
+  font-size: 40px;
+  line-height: 150%;
+  margin: 0;
+}
+
+h2 {
+  font-family: 'Glacial Indifference', sans-serif;
+  font-weight: bold;
+  font-size: 24px;
+  letter-spacing: -0.015em;
+}
+
+p {
+  font-size: 16px;
+  line-height: 30px;
+}
+
+li {
+  font-size: 16px;
+  line-height: 30px;
+}
+
+ul {
+  padding-left: 1.5rem;
+}
+
+.gradient {
+  background: var(--bg-gradient);
+  position: relative;
+
+  .moon {
+    position: absolute;
+    top: 1rem;
+    right: 1rem;
+    mix-blend-mode: exclusion;
+  }
+  .hero {
+    bottom: 0;
+    display: flex;
+    background: var(--bg-gradient-hero);
+    height: calc(100vh - 113px);
+    @media (max-width: $breakpoint-m) {
+      padding: 2rem 0rem;
+      padding-bottom: 16rem;
+    }
+
+    img {
+      position: absolute;
+      bottom: 0;
+      right: 0;
+      mix-blend-mode: exclusion;
+      width: 66%;
+      @media (max-width: $breakpoint-m) {
+        right: 0;
+        width: 100%;
+      }
+    }
+
+    .content {
+      position: relative;
+      z-index: 1;
+      padding: $content-space;
+      width: min(100%, 512px);
+      margin-left: 2rem;
+      margin-top: 3rem;
+      @media (max-width: $breakpoint-m) {
+        width: 100%;
+        margin: 0;
+      }
+
+      .flex-title {
+        display: flex;
+        gap: 0.5rem;
+        align-items: center;
+        margin-bottom: 3rem;
+        margin-top: 1.5rem;
+        flex-wrap: wrap;
+        max-width: 600px; // Max width to allow for flex wrap
+      }
+    }
+  }
+}
+
+.subtitle {
+  font-size: 1.25rem;
+}
+
+.icon {
+  width: 1rem;
+  height: 1rem;
+  position: relative;
+}
+
+.button-spacing {
+  height: 6.5rem;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+</style>
diff --git a/vue-app/src/views/MetadataViewer.vue b/vue-app/src/views/MetadataViewer.vue
index 385d49000..2fa05fabf 100644
--- a/vue-app/src/views/MetadataViewer.vue
+++ b/vue-app/src/views/MetadataViewer.vue
@@ -31,7 +31,7 @@
         <div v-if="!showSummaryPreview">
           <div class="form-background">
             <div class="summary-section-header">
-              <h3 class="step-subtitle">About the metadata</h3>
+              <h3 class="step-subtitle">About the project</h3>
               <links
                 v-if="isAuthorized"
                 :to="editLink('project')"
@@ -41,7 +41,10 @@
             </div>
             <div class="summary">
               <h4 class="read-only-title">Name</h4>
-              <div class="data">{{ metadata.name }}</div>
+              <div class="data">{{ form.project.name }}</div>
+              <div v-if="$v.form.project.name.$invalid" class="error">
+                Project name is required.
+              </div>
             </div>
             <div class="summary" v-if="isDeleted">
               <h4 class="read-only-title">Deleted</h4>
@@ -53,7 +56,7 @@
                 <address-widget
                   v-if="metadata.owner"
                   :address="metadata.owner"
-                  :chainId="getChainId(metadata.network)"
+                  :chainId="currentChainId"
                 />
                 <div class="data" v-else>Not provided</div>
               </div>
@@ -64,19 +67,36 @@
             </div>
             <div class="summary">
               <h4 class="read-only-title">Tagline</h4>
-              <div class="data">{{ metadata.tagline }}</div>
+              <div class="data">{{ form.project.tagline }}</div>
+              <div v-if="$v.form.project.tagline.$invalid">
+                <div v-if="!$v.form.project.tagline.required" class="error">
+                  Tagline is required.
+                </div>
+                <div v-else class="error">
+                  Project tagline must be less than 140 characters.
+                </div>
+              </div>
             </div>
             <div class="summary">
               <h4 class="read-only-title">Description</h4>
-              <div class="data">{{ metadata.description }}</div>
+              <div class="data">{{ form.project.description }}</div>
+              <div v-if="!$v.form.project.description.required" class="error">
+                Description is required.
+              </div>
             </div>
             <div class="summary">
               <h4 class="read-only-title">Category</h4>
-              <div class="data">{{ metadata.category }}</div>
+              <div class="data">{{ form.project.category }}</div>
+              <div v-if="!$v.form.project.category.required" class="error">
+                Category is required.
+              </div>
             </div>
             <div class="summary">
               <h4 class="read-only-title">Problem space</h4>
-              <div class="data">{{ metadata.problemSpace }}</div>
+              <div class="data">{{ form.project.problemSpace }}</div>
+              <div v-if="!$v.form.project.problemSpace.required" class="error">
+                Problem space is required.
+              </div>
             </div>
           </div>
           <div class="form-background">
@@ -90,19 +110,29 @@
               /></links>
             </div>
             <div class="summary">
-              <h4 class="read-only-title">Ethereum addresses</h4>
-              <div
-                v-for="({ address, chainId }, index) in receivingAddresses"
-                :key="index"
-              >
-                <div key="index" class="data">
-                  <address-widget :address="address" :chainId="chainId" />
+              <h4 class="read-only-title">Receiving address</h4>
+              <div key="index" class="data">
+                <address-widget
+                  :address="form.fund.currentChainReceivingAddress"
+                  :chainId="currentChainId"
+                />
+              </div>
+              <div v-if="$v.form.fund.currentChainReceivingAddress.$invalid">
+                <div
+                  v-if="!$v.form.fund.currentChainReceivingAddress.required"
+                  class="error"
+                >
+                  Receiving address is required.
                 </div>
+                <div v-else class="error">Invalid Ethereum 0x address</div>
               </div>
             </div>
             <div class="summary">
               <h4 class="read-only-title">Funding plans</h4>
-              <div class="data">{{ metadata.plans }}</div>
+              <div class="data">{{ form.fund.plans }}</div>
+              <div v-if="!$v.form.fund.plans.required" class="error">
+                Funding plans is required.
+              </div>
             </div>
           </div>
           <div class="form-background">
@@ -117,15 +147,13 @@
             </div>
             <div class="summary">
               <h4 class="read-only-title">Team name</h4>
-              <div class="data">{{ metadata.teamName }}</div>
-              <div class="data" v-if="!metadata.teamName">Not provided</div>
+              <div class="data">{{ form.team.name }}</div>
+              <div class="data" v-if="!form.team.name">Not provided</div>
             </div>
             <div class="summary">
               <h4 class="read-only-title">Team description</h4>
-              <div class="data">{{ metadata.teamDescription }}</div>
-              <div class="data" v-if="!metadata.teamDescription">
-                Not provided
-              </div>
+              <div class="data">{{ form.team.description }}</div>
+              <div class="data" v-if="!form.team.description">Not provided</div>
             </div>
           </div>
           <div class="form-background">
@@ -138,70 +166,88 @@
                 >Edit <img width="16px" src="@/assets/edit.svg"
               /></links>
             </div>
+            <div class="error" v-if="noLinkProvided">
+              At least one link is required.
+            </div>
             <div class="summary">
               <h4 class="read-only-title">GitHub</h4>
               <div class="data">
-                {{ metadata.githubUrl }}
+                {{ form.links.github }}
                 <links
-                  v-if="metadata.githubUrl"
-                  :to="metadata.githubUrl"
+                  v-if="form.links.github"
+                  :to="form.links.github"
                   :hideArrow="true"
                   ><img width="16px" src="@/assets/link.svg"
                 /></links>
               </div>
-              <div class="data" v-if="!metadata.githubUrl">Not provided</div>
+              <div class="data" v-if="!form.links.github">Not provided</div>
+              <div class="error" v-if="$v.form.links.github.$invalid">
+                This doesn't look like a valid URL.
+              </div>
             </div>
             <div class="summary">
               <h4 class="read-only-title">Twitter</h4>
               <div class="data">
-                {{ metadata.twitterUrl }}
+                {{ form.links.twitter }}
                 <links
-                  v-if="metadata.twitterUrl"
-                  :to="metadata.twitterUrl"
+                  v-if="form.links.twitter"
+                  :to="form.links.twitter"
                   :hideArrow="true"
                   ><img width="16px" src="@/assets/link.svg"
                 /></links>
               </div>
-              <div class="data" v-if="!metadata.twitterUrl">Not provided</div>
+              <div class="data" v-if="!form.links.twitter">Not provided</div>
+              <div class="error" v-if="$v.form.links.twitter.$invalid">
+                This doesn't look like a valid URL.
+              </div>
             </div>
             <div class="summary">
               <h4 class="read-only-title">Website</h4>
               <div class="data" key="">
-                {{ metadata.websiteUrl }}
+                {{ form.links.website }}
                 <links
-                  v-if="metadata.websiteUrl"
-                  :to="metadata.websiteUrl"
+                  v-if="form.links.website"
+                  :to="form.links.website"
                   :hideArrow="true"
                   ><img width="16px" src="@/assets/link.svg"
                 /></links>
               </div>
-              <div class="data" v-if="!metadata.websiteUrl">Not provided</div>
+              <div class="data" v-if="!form.links.website">Not provided</div>
+              <div class="error" v-if="$v.form.links.twitter.$invalid">
+                This doesn't look like a valid URL.
+              </div>
             </div>
             <div class="summary">
               <h4 class="read-only-title">Discord</h4>
               <div class="data">
-                {{ metadata.discordUrl }}
+                {{ form.links.discord }}
                 <links
-                  v-if="metadata.discordUrl"
-                  :to="metadata.discordUrl"
+                  v-if="form.links.discord"
+                  :to="form.links.discord"
                   :hideArrow="true"
                   ><img width="16px" src="@/assets/link.svg"
                 /></links>
               </div>
-              <div class="data" v-if="!metadata.discordUrl">Not provided</div>
+              <div class="data" v-if="!form.links.discord">Not provided</div>
+              <div class="error" v-if="$v.form.links.discord.$invalid">
+                This doesn't look like a valid URL.
+              </div>
             </div>
             <div class="summary">
               <h4 class="read-only-title">Radicle</h4>
               <div class="data">
-                {{ metadata.radicleUrl }}
+                {{ form.links.radicle }}
                 <links
-                  v-if="metadata.radicleUrl"
-                  :to="metadata.radicleUrl"
+                  v-if="form.links.radicle"
+                  :to="form.links.radicle"
                   :hideArrow="true"
                   ><img width="16px" src="@/assets/link.svg"
                 /></links>
               </div>
               <div class="data" v-if="!metadata.radicleUrl">Not provided</div>
+              <div class="error" v-if="$v.form.links.radicle.$invalid">
+                This doesn't look like a valid URL.
+              </div>
             </div>
           </div>
           <div class="form-background">
@@ -218,37 +264,55 @@
               <h4 class="read-only-title">Banner</h4>
               <div class="data">
                 <ipfs-copy-widget
-                  v-if="metadata.bannerImageHash"
-                  :hash="metadata.bannerImageHash"
+                  v-if="form.image.bannerHash"
+                  :hash="form.image.bannerHash"
                 />
                 <div class="data" v-else>Not provided</div>
               </div>
+              <div v-if="$v.form.image.bannerHash.$invalid">
+                <div class="error" v-if="!$v.form.image.bannerHash.required">
+                  Banner image is required.
+                </div>
+                <div class="error" v-else>
+                  This doesn't look like a valid IPFS hash.
+                </div>
+              </div>
             </div>
             <div class="summary">
               <h4 class="read-only-title">Thumbnail</h4>
               <div class="data">
                 <ipfs-copy-widget
-                  v-if="metadata.thumbnailImageHash"
-                  :hash="metadata.thumbnailImageHash"
+                  v-if="form.image.thumbnailHash"
+                  :hash="form.image.thumbnailHash"
                 />
                 <div class="data" v-else>Not provided</div>
               </div>
+              <div v-if="$v.form.image.thumbnailHash.$invalid">
+                <div class="error" v-if="!$v.form.image.thumbnailHash.required">
+                  Thumbnail image is required.
+                </div>
+                <div class="error" v-else>
+                  This doesn't look like a valid IPFS hash.
+                </div>
+              </div>
             </div>
           </div>
           <div v-if="displayDeleteBtn && isAuthorized && !isDeleted">
             <box>
               <div class="delete-title">Delete metadata</div>
               <transaction-result
-                v-if="deleteHash"
-                :hash="deleteHash"
-                :chainId="deleteChainId"
+                v-if="!!txHash && !isWaiting"
+                :hash="txHash"
                 :buttons="metadataRegistryButton"
               />
               <metadata-submission-widget
                 v-else
-                :form="formData"
-                :onSubmit="onDeleteSubmit"
-                :onSuccess="onDeleteSuccess"
+                :buttonHandler="handleDelete"
+                :txHash="txHash"
+                :isWaiting="isWaiting"
+                :progress="progress"
+                :txError="txError"
+                :disableButton="isWaiting"
               />
             </box>
           </div>
@@ -271,14 +335,18 @@ import Links from '@/components/Links.vue'
 import MetadataSubmissionWidget from '@/components/MetadataSubmissionWidget.vue'
 import Box from '@/components/Box.vue'
 import TransactionResult from '@/components/TransactionResult.vue'
-import { Metadata, MetadataFormData } from '@/api/metadata'
+import {
+  Metadata,
+  MetadataFormData,
+  MetadataFormValidations,
+} from '@/api/metadata'
 import { Project } from '@/api/projects'
-import { chain } from '@/api/core'
+import { chain, TransactionProgress } from '@/api/core'
 import { LinkInfo } from '@/api/types'
 import { isSameAddress } from '@/utils/accounts'
+import { waitForTransaction } from '@/utils/contracts'
 
 import { CHAIN_INFO, CHAIN_ID } from '@/plugins/Web3/constants/chains'
-import { ContractTransaction, ContractReceipt } from 'ethers'
 import { SET_METADATA } from '@/store/mutation-types'
 
 @Component({
@@ -293,19 +361,27 @@ import { SET_METADATA } from '@/store/mutation-types'
     TransactionResult,
     Box,
   },
+  validations: {
+    form: MetadataFormValidations,
+  },
 })
 export default class MetadataViewer extends mixins(validationMixin) {
   @Prop() metadata!: Metadata
   @Prop() displayDeleteBtn!: boolean
   showSummaryPreview = false
-  deleteHash = ''
   deleteChainId = 0
+  txHash = ''
+  isWaiting = false
+  progress: TransactionProgress | null = null
+  txError = ''
+  form: MetadataFormData = new Metadata({}).toFormData()
 
   created() {
     // make sure the edit form display the same data as the viewer
-    const updatedData = this.metadata?.toFormData()
+    this.form = this.metadata.toFormData()
+    this.$v.form.$touch()
     this.$store.commit(SET_METADATA, {
-      updatedData,
+      updatedData: this.form,
     })
   }
 
@@ -318,13 +394,17 @@ export default class MetadataViewer extends mixins(validationMixin) {
   }
 
   editLink(step: string): string {
-    const { id } = this.metadata || {}
+    const { id } = this.form || {}
     return `/metadata/${id}/edit/${step}`
   }
 
+  get noLinkProvided(): boolean {
+    return !Object.values(this.form?.links || []).some(Boolean)
+  }
+
   get isAuthorized(): boolean {
     const { currentUser } = this.$store.state
-    const { owner, network } = this.metadata || {}
+    const { owner, network } = this.form || {}
     const walletAddress = currentUser?.walletAddress
 
     if (!currentUser || !owner || !walletAddress) {
@@ -347,29 +427,37 @@ export default class MetadataViewer extends mixins(validationMixin) {
     this.showSummaryPreview = !this.showSummaryPreview
   }
 
-  get formData(): MetadataFormData {
-    const form = this.metadata.toFormData()
-    return form
-  }
-
-  onDeleteSubmit(
-    form: MetadataFormData,
-    provider: any
-  ): Promise<ContractTransaction> {
-    const { network } = form
+  async handleDelete(): Promise<void> {
+    const { network, id } = this.form
     const { chainId } = this.$web3
+    const { walletProvider } = this.$store.state.currentUser
+
+    this.txError = ''
 
     if (CHAIN_INFO[chainId].name !== network) {
       throw new Error(`Deleting metadata on ${network} is not supported.`)
     }
 
-    const metadata = new Metadata({ id: form.id })
-    return metadata.delete(provider)
-  }
-
-  onDeleteSuccess(receipt: ContractReceipt, chainId: number): void {
-    this.deleteHash = receipt.transactionHash
-    this.deleteChainId = chainId
+    const metadata = new Metadata({ id })
+    try {
+      this.isWaiting = true
+      const transaction = metadata.delete(walletProvider)
+      const receipt = await waitForTransaction(
+        transaction,
+        (hash) => (this.txHash = hash)
+      )
+
+      await Metadata.waitForBlock(
+        receipt.blockNumber,
+        chain.name,
+        0,
+        (current, last) => (this.progress = { current, last })
+      )
+      this.isWaiting = false
+    } catch (error) {
+      this.txError = (error as Error).message
+      this.isWaiting = false
+    }
   }
 
   get metadataRegistryButton(): LinkInfo[] {
@@ -381,26 +469,8 @@ export default class MetadataViewer extends mixins(validationMixin) {
     ]
   }
 
-  getChainId(network: string): number | undefined {
-    return CHAIN_ID[network]
-  }
-
-  get receivingAddresses(): { address: string; chainId: number }[] {
-    const addresses = this.metadata.receivingAddresses || []
-
-    return addresses.map((addr) => {
-      const [shortName, address] = addr.split(':')
-      const chainId = CHAIN_ID[shortName]
-
-      return {
-        address,
-        chainId,
-      }
-    })
-  }
-
-  get isEmailRequired(): boolean {
-    return !!process.env.VUE_APP_GOOGLE_SPREADSHEET_ID
+  get currentChainId(): number {
+    return CHAIN_ID[chain.name]
   }
 }
 </script>
@@ -550,21 +620,4 @@ export default class MetadataViewer extends mixins(validationMixin) {
     text-overflow: ellipsis;
   }
 }
-
-.no-break {
-  white-space: nowrap;
-}
-
-.resolved-address {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  opacity: 0.5;
-  word-break: keep-all;
-  font-size: 0.875rem;
-  margin-top: 0.25rem;
-}
-
-.delete-title {
-  font-size: 1.5rem;
-}
 </style>

From 5adbf8241ec7fe838a18dbb9cea5c352e459579a Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 27 Jul 2022 17:10:26 -0400
Subject: [PATCH 17/36] allow owner to add recipient for simple recipient type

---
 vue-app/src/components/CriteriaModal.vue      |  2 +-
 vue-app/src/store/getters.ts                  | 10 +++++++--
 vue-app/src/views/Join.vue                    |  9 ++------
 vue-app/src/views/JoinLanding.vue             | 14 ++++++++++---
 vue-app/src/views/JoinOptimistic.vue          |  4 ++--
 vue-app/src/views/Landing.vue                 |  3 ++-
 vue-app/src/views/MetadataForm.vue            | 19 -----------------
 .../src/views/MetadataTransactionSuccess.vue  | 21 ++++++++++---------
 vue-app/src/views/ProjectList.vue             | 15 +++++++++++--
 vue-app/src/views/RecipientRegistry.vue       |  8 -------
 10 files changed, 50 insertions(+), 55 deletions(-)

diff --git a/vue-app/src/components/CriteriaModal.vue b/vue-app/src/components/CriteriaModal.vue
index f903d132b..9662a47a4 100644
--- a/vue-app/src/components/CriteriaModal.vue
+++ b/vue-app/src/components/CriteriaModal.vue
@@ -35,7 +35,7 @@
       </div>
       <links
         v-if="$store.getters.isRecipientRegistrationOpen"
-        :to="$store.getters.addProjectUrl"
+        :to="$store.getters.joinFormUrl()"
         class="btn-primary fit-content"
         >Add project</links
       >
diff --git a/vue-app/src/store/getters.ts b/vue-app/src/store/getters.ts
index a9bd06562..97f494017 100644
--- a/vue-app/src/store/getters.ts
+++ b/vue-app/src/store/getters.ts
@@ -231,9 +231,15 @@ const getters = {
   requireRegistrationDeposit: (state: RootState): boolean => {
     return !!state.recipientRegistryInfo?.requireRegistrationDeposit
   },
-  addProjectUrl: (): string => {
-    return '/join/project'
+  canAddProject: (_, getters): boolean => {
+    const { requireRegistrationDeposit, isRecipientRegistryOwner } = getters
+    return requireRegistrationDeposit || isRecipientRegistryOwner
   },
+  joinFormUrl:
+    () =>
+    (metadataId?: string): string => {
+      return metadataId ? `/join/metadata/${metadataId}` : '/join/project'
+    },
   maxRecipients: (state: RootState): number | undefined => {
     const { currentRound, maciFactory } = state
     if (currentRound) {
diff --git a/vue-app/src/views/Join.vue b/vue-app/src/views/Join.vue
index ac5e3f0e6..86163733c 100644
--- a/vue-app/src/views/Join.vue
+++ b/vue-app/src/views/Join.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <join-optimistic v-if="isOptimisticRegistry" />
+    <join-optimistic v-if="$store.getters.canAddProject" />
     <not-found v-else />
   </div>
 </template>
@@ -10,7 +10,6 @@ import Vue from 'vue'
 import Component from 'vue-class-component'
 import NotFound from '@/views/NotFound.vue'
 import JoinOptimistic from '@/views/JoinOptimistic.vue'
-import { recipientRegistryType, RecipientRegistryType } from '@/api/core'
 
 @Component({
   components: {
@@ -18,9 +17,5 @@ import { recipientRegistryType, RecipientRegistryType } from '@/api/core'
     NotFound,
   },
 })
-export default class JoinView extends Vue {
-  get isOptimisticRegistry(): boolean {
-    return recipientRegistryType === RecipientRegistryType.OPTIMISTIC
-  }
-}
+export default class JoinView extends Vue {}
 </script>
diff --git a/vue-app/src/views/JoinLanding.vue b/vue-app/src/views/JoinLanding.vue
index bf57e6f04..2375a7504 100644
--- a/vue-app/src/views/JoinLanding.vue
+++ b/vue-app/src/views/JoinLanding.vue
@@ -1,5 +1,6 @@
 <template>
-  <div id="join-landing">
+  <not-found id="not-found" v-if="!$store.getters.canAddProject" />
+  <div v-else id="join-landing">
     <div class="gradient">
       <div class="hero">
         <image-responsive title="core" />
@@ -11,6 +12,7 @@
     <div class="breadcrumbs">
       <breadcrumbs />
     </div>
+
     <div class="content" v-if="loading">
       <h1>Fetching round data...</h1>
       <loader />
@@ -111,7 +113,7 @@
         </button>
         <links
           v-if="$store.getters.isRecipientRegistrationOpen"
-          :to="$store.getters.addProjectUrl"
+          :to="$store.getters.joinFormUrl()"
           class="btn-primary"
           >Add project</links
         >
@@ -145,7 +147,7 @@
         </button>
         <links
           v-if="$store.getters.isRecipientRegistrationOpen"
-          :to="$store.getters.addProjectUrl"
+          :to="$store.getters.joinFormUrl()"
           class="btn-primary"
           >Add project</links
         >
@@ -173,6 +175,7 @@ import ImageResponsive from '@/components/ImageResponsive.vue'
 
 import { getCurrentRound } from '@/api/round'
 import { formatAmount } from '@/utils/amounts'
+import NotFound from '@/views/NotFound.vue'
 
 @Component({
   components: {
@@ -183,6 +186,7 @@ import { formatAmount } from '@/utils/amounts'
     TimeLeft,
     ImageResponsive,
     Breadcrumbs,
+    NotFound,
   },
 })
 export default class JoinLanding extends Vue {
@@ -433,4 +437,8 @@ h1 {
 .btn-container {
   margin-top: 2.5rem;
 }
+
+#not-found {
+  width: 100%;
+}
 </style>
diff --git a/vue-app/src/views/JoinOptimistic.vue b/vue-app/src/views/JoinOptimistic.vue
index b54beb437..e0bcecd77 100644
--- a/vue-app/src/views/JoinOptimistic.vue
+++ b/vue-app/src/views/JoinOptimistic.vue
@@ -11,13 +11,13 @@
         :isStepValid="isStepValid"
         :handleStepNav="handleStepNav"
         :saveFormData="saveFormData"
-        cancelRedirectUrl="/join"
+        cancelRedirectUrl="/projects"
       />
       <div class="title-area">
         <h1>Join the round</h1>
       </div>
       <div class="cancel-area desktop">
-        <links class="cancel-link" to="/join"> Cancel </links>
+        <links class="cancel-link" to="/projects"> Cancel </links>
       </div>
       <loader v-if="loading" />
       <div v-if="!loading" class="form-area">
diff --git a/vue-app/src/views/Landing.vue b/vue-app/src/views/Landing.vue
index e03c66064..1c23832f5 100644
--- a/vue-app/src/views/Landing.vue
+++ b/vue-app/src/views/Landing.vue
@@ -24,7 +24,8 @@
             class="apply-callout"
             v-if="
               $store.getters.isRoundJoinPhase &&
-              !$store.getters.isRecipientRegistryFull
+              !$store.getters.isRecipientRegistryFull &&
+              $store.getters.requireRegistrationDeposit
             "
           >
             <div class="column">
diff --git a/vue-app/src/views/MetadataForm.vue b/vue-app/src/views/MetadataForm.vue
index 0ed4d443c..41ac17992 100644
--- a/vue-app/src/views/MetadataForm.vue
+++ b/vue-app/src/views/MetadataForm.vue
@@ -829,25 +829,6 @@ export default class MetadataForm extends mixins(validationMixin) {
     return this.toMetadata(this.form)
   }
 
-  get redirectButtons(): LinkInfo[] {
-    const id = this.receipt?.id || ''
-    const links: Array<{ url: string; text: string }> = []
-
-    if (!this.projectExists) {
-      links.push({
-        url: `/join/summary/${id}`,
-        text: 'Add project',
-      })
-    }
-
-    links.push({
-      url: `/metadata/${id}`,
-      text: 'View metadata',
-    })
-
-    return links
-  }
-
   get projectInterface(): Project {
     return this.metadataInterface.toProject()
   }
diff --git a/vue-app/src/views/MetadataTransactionSuccess.vue b/vue-app/src/views/MetadataTransactionSuccess.vue
index 2398e2d93..19c308477 100644
--- a/vue-app/src/views/MetadataTransactionSuccess.vue
+++ b/vue-app/src/views/MetadataTransactionSuccess.vue
@@ -9,18 +9,25 @@
         <div class="content">
           <span class="emoji">🎉</span>
           <div class="flex-title">
-            <h1>Ready to add project!</h1>
+            <h1>Congratulations!</h1>
             <transaction-receipt
               v-if="$route.params.hash"
               :hash="$route.params.hash"
             />
           </div>
           <div class="subtitle">
-            Your project metadata has been added successfully.
+            The project metadata has been added successfully.
           </div>
-          <p>You can now add your project as a grant recipient.</p>
+          <p v-if="$store.getters.canAddProject">
+            The project can now be added as a grant recipient.
+          </p>
           <div class="mt2 button-spacing">
-            <links :to="addProjectUrl" class="btn-primary">Add project</links>
+            <links
+              v-if="$store.getters.canAddProject"
+              :to="$store.getters.joinFormUrl($route.params.id)"
+              class="btn-primary"
+              >Add project</links
+            >
             <links :to="metadataUrl" class="btn-secondary">View metadata</links>
           </div>
         </div>
@@ -51,12 +58,6 @@ export default class Verified extends Vue {
   get metadataUrl(): string {
     return `/metadata/${this.$route.params.id}`
   }
-
-  get addProjectUrl(): string {
-    return this.$route.params.id
-      ? `/join/summary/${this.$route.params.id}`
-      : '/join/project'
-  }
 }
 </script>
 
diff --git a/vue-app/src/views/ProjectList.vue b/vue-app/src/views/ProjectList.vue
index 4b19a953f..633d67f76 100644
--- a/vue-app/src/views/ProjectList.vue
+++ b/vue-app/src/views/ProjectList.vue
@@ -38,8 +38,8 @@
             class="pointer"
           />
         </div>
-        <div class="add-project">
-          <links to="/join" class="btn-primary">Add project</links>
+        <div v-if="$store.getters.canAddProject" class="add-project">
+          <links :to="addProjectUrl" class="btn-primary">Add project</links>
         </div>
         <div class="hr" />
       </div>
@@ -201,6 +201,17 @@ export default class ProjectList extends Vue {
   clearSearch(): void {
     this.search = ''
   }
+
+  get showAddProjectButton(): boolean {
+    const { requireRegistrationDeposit, isRecipientRegistryOwner } =
+      this.$store.getters
+    return requireRegistrationDeposit || isRecipientRegistryOwner
+  }
+
+  get addProjectUrl(): string {
+    const { requireRegistrationDeposit } = this.$store.getters
+    return requireRegistrationDeposit ? '/join' : '/join/project'
+  }
 }
 </script>
 
diff --git a/vue-app/src/views/RecipientRegistry.vue b/vue-app/src/views/RecipientRegistry.vue
index 33252c37c..7853ae18c 100644
--- a/vue-app/src/views/RecipientRegistry.vue
+++ b/vue-app/src/views/RecipientRegistry.vue
@@ -153,20 +153,12 @@ import { LOAD_RECIPIENT_REGISTRY_INFO } from '@/store/action-types'
 import { RegistryInfo } from '@/api/types'
 import TransactionModal from '@/components/TransactionModal.vue'
 
-// currently only show the registry view for these types
-const showList = [RecipientRegistryType.OPTIMISTIC]
-
 @Component({ components: { CopyButton, Loader, Links } })
 export default class RecipientRegistryView extends Vue {
   requests: Request[] = []
   isLoading = true
 
   async created() {
-    if (!showList.includes(recipientRegistryType as RecipientRegistryType)) {
-      this.$router.push({ name: 'not-found' })
-      return
-    }
-
     await this.$store.dispatch(LOAD_RECIPIENT_REGISTRY_INFO)
     await this.loadRequests()
     this.isLoading = false

From 5667a5ea70a85c1fe0dc37b8705d15bbe93e632a Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 27 Jul 2022 17:12:01 -0400
Subject: [PATCH 18/36] fix lint warning

---
 vue-app/src/views/MetadataForm.vue      | 1 -
 vue-app/src/views/RecipientRegistry.vue | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/vue-app/src/views/MetadataForm.vue b/vue-app/src/views/MetadataForm.vue
index 41ac17992..1a0bd150b 100644
--- a/vue-app/src/views/MetadataForm.vue
+++ b/vue-app/src/views/MetadataForm.vue
@@ -531,7 +531,6 @@ import {
   MetadataFormData,
   MetadataFormValidations,
 } from '@/api/metadata'
-import { LinkInfo } from '@/api/types'
 import { ReceivingAddress } from '@/api/receiving-address'
 import { Prop, Watch } from 'vue-property-decorator'
 import { chain, TransactionProgress } from '@/api/core'
diff --git a/vue-app/src/views/RecipientRegistry.vue b/vue-app/src/views/RecipientRegistry.vue
index 7853ae18c..46b778b0a 100644
--- a/vue-app/src/views/RecipientRegistry.vue
+++ b/vue-app/src/views/RecipientRegistry.vue
@@ -138,7 +138,7 @@ import * as humanizeDuration from 'humanize-duration'
 import { DateTime } from 'luxon'
 import CopyButton from '@/components/CopyButton.vue'
 
-import { recipientRegistryType, RecipientRegistryType } from '@/api/core'
+import { recipientRegistryType } from '@/api/core'
 import {
   RecipientRegistryRequestType as RequestType,
   RecipientRegistryRequestStatus as RequestStatus,

From 9ab7c5a44041a1ef5a00ed21010abc87b25d139d Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Tue, 2 Aug 2022 01:00:41 -0400
Subject: [PATCH 19/36] fix typo

---
 subgraph/src/recipientRegistry/RecipientRegistryType.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/subgraph/src/recipientRegistry/RecipientRegistryType.ts b/subgraph/src/recipientRegistry/RecipientRegistryType.ts
index 40a6a702d..29cc86204 100644
--- a/subgraph/src/recipientRegistry/RecipientRegistryType.ts
+++ b/subgraph/src/recipientRegistry/RecipientRegistryType.ts
@@ -11,7 +11,7 @@ export enum RecipientRegistryType {
 
 let registryTypeMap = new TypedMap<string, RecipientRegistryType>()
 registryTypeMap.set('simple', RecipientRegistryType.Simple)
-registryTypeMap.set('klerso', RecipientRegistryType.Kleros)
+registryTypeMap.set('kleros', RecipientRegistryType.Kleros)
 registryTypeMap.set('optimistic', RecipientRegistryType.Optimistic)
 
 /**

From 4673419892704e9ba8d63f2036d4c9beda92045e Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Tue, 2 Aug 2022 01:01:34 -0400
Subject: [PATCH 20/36] fix subgraph build warning

---
 subgraph/src/MACIMapping.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/subgraph/src/MACIMapping.ts b/subgraph/src/MACIMapping.ts
index fa76a8ef3..bf84663c3 100644
--- a/subgraph/src/MACIMapping.ts
+++ b/subgraph/src/MACIMapping.ts
@@ -20,7 +20,7 @@ import { FundingRound, Message, PublicKey } from '../generated/schema'
 // - contract.verifier(...)
 
 export function handlePublishMessage(event: PublishMessage): void {
-  const fundingRoundId = event.transaction.to.toHexString()
+  let fundingRoundId = event.transaction.to.toHexString()
   if (fundingRoundId == null) {
     log.error(
       'Error: handlePublishMessage failed fundingRound not registered',
@@ -28,7 +28,7 @@ export function handlePublishMessage(event: PublishMessage): void {
     )
     return
   }
-  const fundingRound = FundingRound.load(fundingRoundId)
+  let fundingRound = FundingRound.load(fundingRoundId)
   if (fundingRound == null) {
     log.error(
       'Error: handlePublishMessage failed fundingRound not registered',
@@ -37,23 +37,23 @@ export function handlePublishMessage(event: PublishMessage): void {
     return
   }
 
-  const messageID = event.transaction.hash.toHexString()
+  let messageID = event.transaction.hash.toHexString()
 
-  const timestamp = event.block.timestamp.toString()
-  const message = new Message(messageID)
+  let timestamp = event.block.timestamp.toString()
+  let message = new Message(messageID)
   message.data = event.params._message.data
   message.iv = event.params._message.iv
 
-  const publicKeyId = event.transaction.from.toHexString()
-  const publicKey = PublicKey.load(publicKeyId)
+  let publicKeyId = event.transaction.from.toHexString()
+  let publicKey = PublicKey.load(publicKeyId)
 
   //NOTE: If the public keys aren't being tracked initialize them
   if (publicKey == null) {
-    const publicKey = new PublicKey(publicKeyId)
+    let publicKey = new PublicKey(publicKeyId)
     publicKey.x = event.params._encPubKey.x
     publicKey.y = event.params._encPubKey.y
 
-    const _messages = [messageID] as string[]
+    let _messages = [messageID] as string[]
     publicKey.messages = _messages
     publicKey.fundingRound = fundingRoundId
 
@@ -68,12 +68,12 @@ export function handlePublishMessage(event: PublishMessage): void {
 }
 
 export function handleSignUp(event: SignUp): void {
-  const publicKeyId = event.transaction.from.toHexString()
-  const publicKey = PublicKey.load(publicKeyId)
+  let publicKeyId = event.transaction.from.toHexString()
+  let publicKey = PublicKey.load(publicKeyId)
 
   //NOTE: If the public keys aren't being tracked initialize them
   if (publicKey == null) {
-    const publicKey = new PublicKey(publicKeyId)
+    let publicKey = new PublicKey(publicKeyId)
     publicKey.x = event.params._userPubKey.x
     publicKey.y = event.params._userPubKey.y
     publicKey.stateIndex = event.params._stateIndex

From efae44cec2277b93ac78781a339378f1f644eb22 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Tue, 2 Aug 2022 01:02:06 -0400
Subject: [PATCH 21/36] allow coordinator to add recipient for simple recipient
 registry

---
 subgraph/src/RecipientMapping.ts              |  6 ++++--
 .../KlerosRecipientRegistryMapping.ts         |  8 ++++++-
 .../SimpleRecipientRegistryMapping.ts         |  8 ++++++-
 vue-app/src/api/projects.ts                   |  8 ++-----
 vue-app/src/api/recipient-registry-simple.ts  | 16 +++++++++++---
 vue-app/src/api/recipient-registry.ts         | 21 ++++++++++++++++---
 vue-app/src/views/JoinLanding.vue             | 10 ++-------
 vue-app/src/views/JoinOptimistic.vue          | 14 ++++++-------
 vue-app/src/views/MetadataList.vue            |  2 +-
 vue-app/src/views/ProjectAdded.vue            |  9 ++++++--
 10 files changed, 68 insertions(+), 34 deletions(-)

diff --git a/subgraph/src/RecipientMapping.ts b/subgraph/src/RecipientMapping.ts
index 64b48ef0e..614bdb305 100644
--- a/subgraph/src/RecipientMapping.ts
+++ b/subgraph/src/RecipientMapping.ts
@@ -1,10 +1,12 @@
 import { Recipient } from '../generated/schema'
 
+export const RECIPIENT_REQUEST_TYPE_REGISTRATION = '0'
+export const RECIPIENT_REQUEST_TYPE_REMOVAL = '1'
+
 export function removeRecipient(id: string, timestamp: string): void {
   let recipient = Recipient.load(id)
   if (recipient) {
-    // TODO: should we hard delete the recipient record?
-    recipient.rejected = true
+    recipient.requestType = RECIPIENT_REQUEST_TYPE_REMOVAL
     recipient.lastUpdatedAt = timestamp
     recipient.save()
   }
diff --git a/subgraph/src/recipientRegistry/KlerosRecipientRegistryMapping.ts b/subgraph/src/recipientRegistry/KlerosRecipientRegistryMapping.ts
index 6f04d3792..b09b88964 100644
--- a/subgraph/src/recipientRegistry/KlerosRecipientRegistryMapping.ts
+++ b/subgraph/src/recipientRegistry/KlerosRecipientRegistryMapping.ts
@@ -4,13 +4,19 @@ import {
 } from '../../generated/templates/KlerosRecipientRegistry/KlerosRecipientRegistry'
 
 import { Recipient } from '../../generated/schema'
-import { removeRecipient } from '../RecipientMapping'
+import {
+  removeRecipient,
+  RECIPIENT_REQUEST_TYPE_REGISTRATION,
+} from '../RecipientMapping'
 
 export function handleRecipientAdded(event: RecipientAdded): void {
   let recipientRegistryId = event.address.toHexString()
 
   let recipientId = event.params._tcrItemId.toHexString()
   let recipient = new Recipient(recipientId)
+  recipient.requestType = RECIPIENT_REQUEST_TYPE_REGISTRATION
+  // recipient was verified by kleros
+  recipient.verified = true
   recipient.recipientRegistry = recipientRegistryId
   recipient.createdAt = event.block.timestamp.toString()
   recipient.recipientIndex = event.params._index
diff --git a/subgraph/src/recipientRegistry/SimpleRecipientRegistryMapping.ts b/subgraph/src/recipientRegistry/SimpleRecipientRegistryMapping.ts
index 583f0826c..9bbc6e9e9 100644
--- a/subgraph/src/recipientRegistry/SimpleRecipientRegistryMapping.ts
+++ b/subgraph/src/recipientRegistry/SimpleRecipientRegistryMapping.ts
@@ -4,7 +4,10 @@ import {
 } from '../../generated/templates/SimpleRecipientRegistry/SimpleRecipientRegistry'
 
 import { Recipient } from '../../generated/schema'
-import { removeRecipient } from '../RecipientMapping'
+import {
+  removeRecipient,
+  RECIPIENT_REQUEST_TYPE_REGISTRATION,
+} from '../RecipientMapping'
 
 export function handleRecipientAdded(event: RecipientAdded): void {
   let recipientRegistryId = event.address.toHexString()
@@ -13,12 +16,15 @@ export function handleRecipientAdded(event: RecipientAdded): void {
   let recipient = new Recipient(recipientId)
 
   recipient.requester = event.transaction.from.toHexString()
+  recipient.requestType = RECIPIENT_REQUEST_TYPE_REGISTRATION
   recipient.recipientRegistry = recipientRegistryId
   recipient.recipientMetadata = event.params._metadata
   recipient.recipientIndex = event.params._index
   recipient.recipientAddress = event.params._recipient
   recipient.submissionTime = event.params._timestamp.toString()
   recipient.requestResolvedHash = event.transaction.hash
+  // recipients are verified as they are added by the admin
+  recipient.verified = true
   recipient.createdAt = event.block.timestamp.toString()
 
   recipient.save()
diff --git a/vue-app/src/api/projects.ts b/vue-app/src/api/projects.ts
index 358e0a944..b86684a3e 100644
--- a/vue-app/src/api/projects.ts
+++ b/vue-app/src/api/projects.ts
@@ -57,9 +57,7 @@ export async function getProjects(
   startTime?: number,
   endTime?: number
 ): Promise<Project[]> {
-  if (recipientRegistryType === 'simple') {
-    return await SimpleRegistry.getProjects(registryAddress, startTime, endTime)
-  } else if (recipientRegistryType === 'kleros') {
+  if (recipientRegistryType === 'kleros') {
     return await KlerosRegistry.getProjects(registryAddress, startTime, endTime)
   } else {
     return await RecipientRegistry.getProjects(
@@ -74,9 +72,7 @@ export async function getProject(
   registryAddress: string,
   recipientId: string
 ): Promise<Project | null> {
-  if (recipientRegistryType === 'simple') {
-    return await SimpleRegistry.getProject(registryAddress, recipientId)
-  } else if (recipientRegistryType === 'kleros') {
+  if (recipientRegistryType === 'kleros') {
     return await KlerosRegistry.getProject(registryAddress, recipientId)
   } else {
     return await RecipientRegistry.getProject(recipientId)
diff --git a/vue-app/src/api/recipient-registry-simple.ts b/vue-app/src/api/recipient-registry-simple.ts
index 0e12dd0fa..6ea353309 100644
--- a/vue-app/src/api/recipient-registry-simple.ts
+++ b/vue-app/src/api/recipient-registry-simple.ts
@@ -3,7 +3,7 @@ import { TransactionResponse } from '@ethersproject/abstract-provider'
 import { isHexString } from '@ethersproject/bytes'
 
 import { SimpleRecipientRegistry } from './abi'
-import { provider, ipfsGatewayUrl } from './core'
+import { provider, ipfsGatewayUrl, chain } from './core'
 import { RecipientRegistryInterface } from './types'
 import { Project, toProjectInterface } from './projects'
 
@@ -128,8 +128,18 @@ export function addRecipient(
     SimpleRecipientRegistry,
     signer
   )
-  const { address, ...metadata } = recipientData
-  return registry.addRecipient(address, JSON.stringify(metadata))
+  const { id, fund } = recipientData
+  if (!id) {
+    throw new Error('Missing metadata id')
+  }
+
+  const { currentChainReceivingAddress: address } = fund
+  if (!address) {
+    throw new Error(`Missing recipient address for the ${chain.name} network`)
+  }
+
+  const json = { id }
+  return registry.addRecipient(address, JSON.stringify(json))
 }
 
 function removeProject() {
diff --git a/vue-app/src/api/recipient-registry.ts b/vue-app/src/api/recipient-registry.ts
index 4a27d63e7..9c447053f 100644
--- a/vue-app/src/api/recipient-registry.ts
+++ b/vue-app/src/api/recipient-registry.ts
@@ -1,4 +1,4 @@
-import { BigNumber, Contract } from 'ethers'
+import { BigNumber, Contract, Signer } from 'ethers'
 import sdk from '@/graphql/sdk'
 import { BaseRecipientRegistry } from './abi'
 import {
@@ -23,7 +23,7 @@ import KlerosRegistry from './recipient-registry-kleros'
 import { isHexString } from '@ethersproject/bytes'
 import { Recipient } from '@/graphql/API'
 import { Project } from './projects'
-import { Metadata } from './metadata'
+import { Metadata, MetadataFormData } from './metadata'
 import { DateTime } from 'luxon'
 
 const registryLookup: Record<RecipientRegistryType, Function> = {
@@ -393,4 +393,19 @@ export async function getRequests(
   return Object.keys(requests).map((recipientId) => requests[recipientId])
 }
 
-export default { getProject, getProjects, projectExists }
+export async function addRecipient(
+  registryAddress: string,
+  recipientMetadata: MetadataFormData,
+  deposit: BigNumber,
+  signer: Signer
+) {
+  const registry = RecipientRegistry.create(recipientRegistryType)
+  return registry.addRecipient(
+    registryAddress,
+    recipientMetadata,
+    deposit,
+    signer
+  )
+}
+
+export default { addRecipient, getProject, getProjects, projectExists }
diff --git a/vue-app/src/views/JoinLanding.vue b/vue-app/src/views/JoinLanding.vue
index 2375a7504..df49a7f1f 100644
--- a/vue-app/src/views/JoinLanding.vue
+++ b/vue-app/src/views/JoinLanding.vue
@@ -111,10 +111,7 @@
         <button class="btn-secondary" @click="toggleCriteria">
           See round criteria
         </button>
-        <links
-          v-if="$store.getters.isRecipientRegistrationOpen"
-          :to="$store.getters.joinFormUrl()"
-          class="btn-primary"
+        <links :to="$store.getters.joinFormUrl()" class="btn-primary"
           >Add project</links
         >
       </div>
@@ -145,10 +142,7 @@
         <button class="btn-secondary" @click="toggleCriteria">
           See round criteria
         </button>
-        <links
-          v-if="$store.getters.isRecipientRegistrationOpen"
-          :to="$store.getters.joinFormUrl()"
-          class="btn-primary"
+        <links :to="$store.getters.joinFormUrl()" class="btn-primary"
           >Add project</links
         >
       </div>
diff --git a/vue-app/src/views/JoinOptimistic.vue b/vue-app/src/views/JoinOptimistic.vue
index e0bcecd77..ac92db443 100644
--- a/vue-app/src/views/JoinOptimistic.vue
+++ b/vue-app/src/views/JoinOptimistic.vue
@@ -115,7 +115,7 @@ import {
 import { Project } from '@/api/projects'
 import { Metadata, MetadataFormValidations } from '@/api/metadata'
 import { DateTime } from 'luxon'
-import { addRecipient } from '@/api/recipient-registry-optimistic'
+import { addRecipient } from '@/api/recipient-registry'
 import { waitForTransaction } from '@/utils/contracts'
 import { required, email } from 'vuelidate/lib/validators'
 
@@ -225,6 +225,12 @@ export default class JoinView extends mixins(validationMixin) {
     if (updateFurthest && this.currentStep + 1 > this.furthestStep) {
       this.form.furthestStep = this.currentStep + 1
     }
+
+    if (this.steps[this.currentStep] === 'email') {
+      // save the email for sending application data to google spreadsheet
+      this.form.team.email = this.email
+    }
+
     this.$store.commit(SET_RECIPIENT_DATA, {
       updatedData: this.form,
     })
@@ -263,12 +269,6 @@ export default class JoinView extends mixins(validationMixin) {
     // If isNavDisabled => disable quick-links
     if (this.isNavDisabled) return
 
-    if (this.steps[step] === 'email') {
-      // save the email in metadata for later use
-      this.form.team.email = this.email
-      this.$v.form.$touch()
-    }
-
     // Save form data
     this.saveFormData(updateFurthest)
 
diff --git a/vue-app/src/views/MetadataList.vue b/vue-app/src/views/MetadataList.vue
index 3421e45c6..bfca92cda 100644
--- a/vue-app/src/views/MetadataList.vue
+++ b/vue-app/src/views/MetadataList.vue
@@ -254,7 +254,7 @@ export default class MetadataList extends Vue {
   font-size: 16px;
   overflow: hidden;
   margin: 1rem 10px;
-  color: #f7f7f7;
+  color: var(--text-body);
   opacity: 0.8;
 }
 </style>
diff --git a/vue-app/src/views/ProjectAdded.vue b/vue-app/src/views/ProjectAdded.vue
index 61c6754a5..3e5f4d847 100644
--- a/vue-app/src/views/ProjectAdded.vue
+++ b/vue-app/src/views/ProjectAdded.vue
@@ -11,8 +11,13 @@
             <h1>Project submitted!</h1>
             <transaction-receipt :hash="$route.params.hash" />
           </div>
-          <div class="subtitle">You’re almost on board this funding round.</div>
-          <ul>
+          <div
+            v-if="$store.getters.requireRegistrationDeposit"
+            class="subtitle"
+          >
+            You’re almost on board this funding round.
+          </div>
+          <ul v-if="$store.getters.requireRegistrationDeposit">
             <li>
               Your project just needs to go through some final checks to ensure
               it meets round criteria. You can

From a8fa9bd161906d8960534226131905cdccd4d892 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Tue, 2 Aug 2022 10:54:58 -0400
Subject: [PATCH 22/36] fix lint warning

---
 vue-app/src/api/projects.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/vue-app/src/api/projects.ts b/vue-app/src/api/projects.ts
index b86684a3e..0ab238d6d 100644
--- a/vue-app/src/api/projects.ts
+++ b/vue-app/src/api/projects.ts
@@ -7,7 +7,6 @@ import {
   recipientRegistryType,
 } from './core'
 
-import SimpleRegistry from './recipient-registry-simple'
 import KlerosRegistry from './recipient-registry-kleros'
 import RecipientRegistry from './recipient-registry'
 

From ed17365e8e66a2cb6c8092ad6df74b2436f5b6fe Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Tue, 2 Aug 2022 10:57:33 -0400
Subject: [PATCH 23/36] hide deposit information if deposit is not required

---
 .../components/RecipientSubmissionWidget.vue  | 65 +++++++++++++------
 1 file changed, 44 insertions(+), 21 deletions(-)

diff --git a/vue-app/src/components/RecipientSubmissionWidget.vue b/vue-app/src/components/RecipientSubmissionWidget.vue
index e9355d087..bdc8ce8c5 100644
--- a/vue-app/src/components/RecipientSubmissionWidget.vue
+++ b/vue-app/src/components/RecipientSubmissionWidget.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="tx-container">
+  <div class="tx-container" v-if="visible">
     <div
       :class="
         isWaiting
@@ -8,13 +8,7 @@
       "
     >
       <loader v-if="isLoading" />
-      <div
-        :class="
-          isWaiting || txError
-            ? 'tx-progress-area'
-            : 'tx-progress-area-no-notice'
-        "
-      >
+      <div :class="progressClass">
         <loader class="button-loader" v-if="isWaiting" />
         <div v-if="isWaiting" class="tx-notice">
           <div v-if="!!txHash">Waiting for transaction to be mined...</div>
@@ -26,7 +20,7 @@
           Check your wallet or {{ blockExplorerLabel }} for more info.
         </div>
       </div>
-      <div class="connected">
+      <div class="connected" v-if="$store.getters.requireRegistrationDeposit">
         <div class="total-title">
           Total to submit
           <img
@@ -92,7 +86,9 @@ export default class RecipientSubmissionWidget extends Vue {
   fiatSign = '$'
 
   async created() {
-    this.ethPrice = await fetchCurrentEthPrice()
+    if (this.$store.getters.requireRegistrationDeposit) {
+      this.ethPrice = await fetchCurrentEthPrice()
+    }
     this.isLoading = false
   }
 
@@ -108,6 +104,14 @@ export default class RecipientSubmissionWidget extends Vue {
     return !!this.$store.state.recipientRegistryInfo?.deposit
   }
 
+  get visible(): boolean {
+    return (
+      this.$store.getters.requireRegistrationDeposit ||
+      this.hasTxError ||
+      this.isWaiting
+    )
+  }
+
   get depositAmount(): string {
     return this.$store.state.recipientRegistryInfo
       ? formatAmount(this.$store.state.recipientRegistryInfo.deposit, 18)
@@ -135,6 +139,21 @@ export default class RecipientSubmissionWidget extends Vue {
     }
     return '-'
   }
+
+  get progressClass(): string {
+    const { requireRegistrationDeposit } = this.$store.getters
+    const classes = ['tx-progress-area']
+
+    if (requireRegistrationDeposit && (this.isWaiting || this.txError)) {
+      classes.push('error-and-info')
+    } else if (requireRegistrationDeposit) {
+      classes.push('info-only')
+    } else {
+      classes.push('error-only')
+    }
+
+    return classes.join(' ')
+  }
 }
 </script>
 
@@ -201,13 +220,16 @@ export default class RecipientSubmissionWidget extends Vue {
   padding-bottom: 2rem;
 }
 
+.no-deposit {
+  border-radius: calc(1rem - 1px);
+  margin-bottom: 0rem;
+}
+
 .tx-progress-area {
   background: var(--bg-inactive);
   text-align: center;
-  border-radius: calc(1rem - 1px) calc(1rem - 1px) 0 0;
   padding: 1.5rem;
   width: -webkit-fill-available;
-  margin-bottom: 2rem;
   display: flex;
   align-items: center;
   gap: 1rem;
@@ -215,17 +237,18 @@ export default class RecipientSubmissionWidget extends Vue {
   font-weight: 500;
 }
 
-.tx-progress-area-no-notice {
-  background: var(--bg-inactive);
-  text-align: center;
+.error-only {
+  border-radius: calc(1rem - 1px);
+}
+
+.error-and-info {
+  border-radius: calc(1rem - 1px) calc(1rem - 1px) 0 0;
+  margin-bottom: 2rem;
+}
+
+.info-only {
   border-radius: calc(3rem - 1px) calc(3rem - 1px) 0 0;
-  width: -webkit-fill-available;
   margin-bottom: 2rem;
-  display: flex;
-  align-items: center;
-  gap: 1rem;
-  justify-content: center;
-  font-weight: 500;
   height: 1rem;
 }
 

From 85255b6a46e32ae7e5c52c232ab7994b329fc3a8 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Tue, 2 Aug 2022 12:26:20 -0400
Subject: [PATCH 24/36] set challenge period and deposit to 0 for simple
 registry

---
 contracts/scripts/deployRecipientRegistry.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/contracts/scripts/deployRecipientRegistry.ts b/contracts/scripts/deployRecipientRegistry.ts
index 0ed29b470..f8a2a2639 100644
--- a/contracts/scripts/deployRecipientRegistry.ts
+++ b/contracts/scripts/deployRecipientRegistry.ts
@@ -2,6 +2,10 @@ import { ethers } from 'hardhat'
 import { UNIT } from '../utils/constants'
 import { RecipientRegistryFactory } from '../utils/recipient-registry-factory'
 
+function isSimpleRegistry(registryType: string): boolean {
+  return registryType === 'simple'
+}
+
 /*
  * Deploy a new recipient registry.
  * The following environment variables must be set to run the script
@@ -19,8 +23,12 @@ import { RecipientRegistryFactory } from '../utils/recipient-registry-factory'
 async function main() {
   const recipientRegistryType = process.env.RECIPIENT_REGISTRY_TYPE || 'simple'
   const fundingRoundFactoryAddress = process.env.FUNDING_ROUND_FACTORY_ADDRESS
-  const challengePeriodDuration = process.env.CHALLENGE_PERIOD_IN_SECONDS || 300
-  const baseDeposit = process.env.BASE_DEPOSIT || UNIT.div(10).toString()
+  const challengePeriodDuration = isSimpleRegistry(recipientRegistryType)
+    ? 0
+    : process.env.CHALLENGE_PERIOD_IN_SECONDS || 300
+  const baseDeposit = isSimpleRegistry(recipientRegistryType)
+    ? 0
+    : process.env.BASE_DEPOSIT || UNIT.div(10).toString()
 
   if (!fundingRoundFactoryAddress) {
     console.log('Environment variable FUNDING_ROUND_FACTORY_ADDRESS not set')

From 39fabbd9dd77f488f3da98727799d80fbc7aa47c Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Tue, 2 Aug 2022 12:39:07 -0400
Subject: [PATCH 25/36] simplify code

---
 contracts/scripts/deployRecipientRegistry.ts | 23 +++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/contracts/scripts/deployRecipientRegistry.ts b/contracts/scripts/deployRecipientRegistry.ts
index f8a2a2639..582bdbaf2 100644
--- a/contracts/scripts/deployRecipientRegistry.ts
+++ b/contracts/scripts/deployRecipientRegistry.ts
@@ -2,10 +2,6 @@ import { ethers } from 'hardhat'
 import { UNIT } from '../utils/constants'
 import { RecipientRegistryFactory } from '../utils/recipient-registry-factory'
 
-function isSimpleRegistry(registryType: string): boolean {
-  return registryType === 'simple'
-}
-
 /*
  * Deploy a new recipient registry.
  * The following environment variables must be set to run the script
@@ -23,12 +19,13 @@ function isSimpleRegistry(registryType: string): boolean {
 async function main() {
   const recipientRegistryType = process.env.RECIPIENT_REGISTRY_TYPE || 'simple'
   const fundingRoundFactoryAddress = process.env.FUNDING_ROUND_FACTORY_ADDRESS
-  const challengePeriodDuration = isSimpleRegistry(recipientRegistryType)
-    ? 0
-    : process.env.CHALLENGE_PERIOD_IN_SECONDS || 300
-  const baseDeposit = isSimpleRegistry(recipientRegistryType)
-    ? 0
-    : process.env.BASE_DEPOSIT || UNIT.div(10).toString()
+  let challengePeriodDuration = '0'
+  let baseDeposit = '0'
+
+  if (recipientRegistryType === 'optimistic') {
+    challengePeriodDuration = process.env.CHALLENGE_PERIOD_IN_SECONDS || '300'
+    baseDeposit = process.env.BASE_DEPOSIT || UNIT.div(10).toString()
+  }
 
   if (!fundingRoundFactoryAddress) {
     console.log('Environment variable FUNDING_ROUND_FACTORY_ADDRESS not set')
@@ -43,9 +40,9 @@ async function main() {
   console.log('*******************')
   console.log(`Deploying a new ${recipientRegistryType} recipient registry!`)
   console.log(` challenge period in seconds: ${challengePeriodDuration}`)
-  console.log(` baseDeposit ${baseDeposit}`)
-  console.log(` fundingRoundFactoryAddress ${fundingRoundFactoryAddress}`)
-  console.log(` fundingRoundFactoryOwner ${factoryOwner}`)
+  console.log(` baseDeposit: ${baseDeposit}`)
+  console.log(` fundingRoundFactoryAddress: ${fundingRoundFactoryAddress}`)
+  console.log(` fundingRoundFactoryOwner: ${factoryOwner}`)
   const [deployer] = await ethers.getSigners()
 
   const recipientRegistry = await RecipientRegistryFactory.deploy(

From d35dc05f2a856313430630104c419e0b96b5e253 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Tue, 2 Aug 2022 12:39:41 -0400
Subject: [PATCH 26/36] styling recipient submission widget

---
 vue-app/src/components/RecipientSubmissionWidget.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/vue-app/src/components/RecipientSubmissionWidget.vue b/vue-app/src/components/RecipientSubmissionWidget.vue
index bdc8ce8c5..e4f88f5c0 100644
--- a/vue-app/src/components/RecipientSubmissionWidget.vue
+++ b/vue-app/src/components/RecipientSubmissionWidget.vue
@@ -228,7 +228,6 @@ export default class RecipientSubmissionWidget extends Vue {
 .tx-progress-area {
   background: var(--bg-inactive);
   text-align: center;
-  padding: 1.5rem;
   width: -webkit-fill-available;
   display: flex;
   align-items: center;
@@ -239,11 +238,13 @@ export default class RecipientSubmissionWidget extends Vue {
 
 .error-only {
   border-radius: calc(1rem - 1px);
+  padding: 1.5rem;
 }
 
 .error-and-info {
   border-radius: calc(1rem - 1px) calc(1rem - 1px) 0 0;
   margin-bottom: 2rem;
+  padding: 1.5rem;
 }
 
 .info-only {

From 82c061cd24c307af0daae9af3c72e37d5594e9f5 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Tue, 2 Aug 2022 12:40:42 -0400
Subject: [PATCH 27/36] disable navigation if metadata is not selected

---
 vue-app/src/views/JoinOptimistic.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vue-app/src/views/JoinOptimistic.vue b/vue-app/src/views/JoinOptimistic.vue
index ac92db443..3cab47ae1 100644
--- a/vue-app/src/views/JoinOptimistic.vue
+++ b/vue-app/src/views/JoinOptimistic.vue
@@ -206,7 +206,7 @@ export default class JoinView extends mixins(validationMixin) {
       return false
     }
 
-    let isValid = true
+    let isValid = this.hasMetadata
     const stepName = this.steps[step]
     if (stepName === 'summary') {
       isValid = this.isLinkStepValid() && !this.$v.form.$invalid

From 39c40288a94328503ba8b173ded8ae9e270e19ff Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Tue, 2 Aug 2022 22:58:44 -0400
Subject: [PATCH 28/36] fix typo

---
 vue-app/src/views/AboutHowItWorks.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vue-app/src/views/AboutHowItWorks.vue b/vue-app/src/views/AboutHowItWorks.vue
index 091e0cce5..b2481f0ed 100644
--- a/vue-app/src/views/AboutHowItWorks.vue
+++ b/vue-app/src/views/AboutHowItWorks.vue
@@ -83,7 +83,7 @@
     </ul>
 
     <p>
-      If you dont contribute in the contribution phase, the round is over for
+      If you don't contribute in the contribution phase, the round is over for
       you once this phase ends.
     </p>
 

From 30f99afe619e6c3ec06b7e3c0ecd62375fa15a0f Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Tue, 2 Aug 2022 23:02:03 -0400
Subject: [PATCH 29/36] refactor and do not show add project button for
 previous rounds

---
 vue-app/src/api/recipient-registry-kleros.ts  |  4 +--
 .../src/api/recipient-registry-optimistic.ts  |  2 +-
 vue-app/src/api/recipient-registry-simple.ts  |  2 +-
 vue-app/src/api/recipient-registry.ts         |  2 +-
 vue-app/src/api/types.ts                      |  4 +--
 vue-app/src/components/TransactionModal.vue   | 21 ++++++++++-----
 vue-app/src/store/getters.ts                  | 25 +++++++++--------
 vue-app/src/views/Join.vue                    | 17 +++++++-----
 .../{JoinOptimistic.vue => JoinForm.vue}      |  2 +-
 vue-app/src/views/JoinLanding.vue             | 27 +++++++++++++------
 vue-app/src/views/ProjectList.vue             | 24 ++++++++++-------
 11 files changed, 79 insertions(+), 51 deletions(-)
 rename vue-app/src/views/{JoinOptimistic.vue => JoinForm.vue} (99%)

diff --git a/vue-app/src/api/recipient-registry-kleros.ts b/vue-app/src/api/recipient-registry-kleros.ts
index 1c2285378..694ca736b 100644
--- a/vue-app/src/api/recipient-registry-kleros.ts
+++ b/vue-app/src/api/recipient-registry-kleros.ts
@@ -226,8 +226,8 @@ export function create(): RecipientRegistryInterface {
     removeProject,
     registerProject,
     rejectProject,
-    isRegistrationOpen: true,
-    requireRegistrationDeposit: true,
+    isSelfRegistration: false, //TODO: add support for self registration
+    requireRegistrationDeposit: false,
   }
 }
 
diff --git a/vue-app/src/api/recipient-registry-optimistic.ts b/vue-app/src/api/recipient-registry-optimistic.ts
index 0499caf2c..a8c7d6682 100644
--- a/vue-app/src/api/recipient-registry-optimistic.ts
+++ b/vue-app/src/api/recipient-registry-optimistic.ts
@@ -127,7 +127,7 @@ export function create(): RecipientRegistryInterface {
     registerProject,
     removeProject,
     rejectProject,
-    isRegistrationOpen: true,
+    isSelfRegistration: true,
     requireRegistrationDeposit: true,
   }
 }
diff --git a/vue-app/src/api/recipient-registry-simple.ts b/vue-app/src/api/recipient-registry-simple.ts
index 6ea353309..687568c36 100644
--- a/vue-app/src/api/recipient-registry-simple.ts
+++ b/vue-app/src/api/recipient-registry-simple.ts
@@ -160,7 +160,7 @@ export function create(): RecipientRegistryInterface {
     removeProject,
     registerProject,
     rejectProject,
-    isRegistrationOpen: false,
+    isSelfRegistration: false,
     requireRegistrationDeposit: false,
   }
 }
diff --git a/vue-app/src/api/recipient-registry.ts b/vue-app/src/api/recipient-registry.ts
index 9c447053f..10761c902 100644
--- a/vue-app/src/api/recipient-registry.ts
+++ b/vue-app/src/api/recipient-registry.ts
@@ -74,7 +74,7 @@ export async function getRegistryInfo(
     listingPolicyUrl: `${ipfsGatewayUrl}/ipfs/${recipientRegistryPolicy}`,
     recipientCount: recipientCount.toNumber(),
     owner,
-    isRegistrationOpen: registry.isRegistrationOpen,
+    isSelfRegistration: registry.isSelfRegistration,
     requireRegistrationDeposit: registry.requireRegistrationDeposit,
   }
 }
diff --git a/vue-app/src/api/types.ts b/vue-app/src/api/types.ts
index 6649bb368..2e2f708b2 100644
--- a/vue-app/src/api/types.ts
+++ b/vue-app/src/api/types.ts
@@ -8,7 +8,7 @@ export interface RegistryInfo {
   listingPolicyUrl: string
   recipientCount: number
   owner: string
-  isRegistrationOpen: boolean
+  isSelfRegistration: boolean
   requireRegistrationDeposit: boolean
 }
 
@@ -17,7 +17,7 @@ export interface RecipientRegistryInterface {
   registerProject: Function
   rejectProject: Function
   removeProject: Function
-  isRegistrationOpen?: boolean
+  isSelfRegistration?: boolean
   requireRegistrationDeposit?: boolean
 }
 
diff --git a/vue-app/src/components/TransactionModal.vue b/vue-app/src/components/TransactionModal.vue
index a303356e7..60e0a8ad9 100644
--- a/vue-app/src/components/TransactionModal.vue
+++ b/vue-app/src/components/TransactionModal.vue
@@ -12,13 +12,15 @@
         }
       "
     ></transaction>
-    <button
-      v-if="txHash"
-      class="btn-secondary close-btn"
-      @click="$emit('close')"
-    >
-      Close
-    </button>
+    <div class="btn-row">
+      <button
+        v-if="txHash"
+        class="btn-secondary close-btn"
+        @click="$emit('close')"
+      >
+        Close
+      </button>
+    </div>
   </div>
 </template>
 
@@ -71,6 +73,11 @@ export default class TransactionModal extends Vue {
   padding: 1.5rem;
 }
 
+.btn-row {
+  display: flex;
+  justify-content: center;
+}
+
 .close-btn {
   margin-top: $modal-space;
 }
diff --git a/vue-app/src/store/getters.ts b/vue-app/src/store/getters.ts
index 97f494017..323072821 100644
--- a/vue-app/src/store/getters.ts
+++ b/vue-app/src/store/getters.ts
@@ -79,13 +79,6 @@ const getters = {
       getters.recipientSpacesRemaining < 20
     )
   },
-  isRoundBufferPhase: (state: RootState, getters): boolean => {
-    return (
-      !!state.currentRound &&
-      !getters.isJoinPhase &&
-      !hasDateElapsed(state.currentRound.signUpDeadline)
-    )
-  },
   isRoundContributionPhase: (state: RootState): boolean => {
     return (
       !!state.currentRound &&
@@ -225,15 +218,25 @@ const getters = {
 
     return nativeTokenDecimals
   },
-  isRecipientRegistrationOpen: (state: RootState): boolean => {
-    return !!state.recipientRegistryInfo?.isRegistrationOpen
+  isSelfRegistration: (state: RootState): boolean => {
+    return !!state.recipientRegistryInfo?.isSelfRegistration
   },
   requireRegistrationDeposit: (state: RootState): boolean => {
     return !!state.recipientRegistryInfo?.requireRegistrationDeposit
   },
   canAddProject: (_, getters): boolean => {
-    const { requireRegistrationDeposit, isRecipientRegistryOwner } = getters
-    return requireRegistrationDeposit || isRecipientRegistryOwner
+    const {
+      requireRegistrationDeposit,
+      isRecipientRegistryOwner,
+      isRecipientRegistryFull,
+      isRoundJoinPhase,
+    } = getters
+
+    return (
+      (requireRegistrationDeposit || isRecipientRegistryOwner) &&
+      !isRecipientRegistryFull &&
+      isRoundJoinPhase
+    )
   },
   joinFormUrl:
     () =>
diff --git a/vue-app/src/views/Join.vue b/vue-app/src/views/Join.vue
index 86163733c..5a3f79bd6 100644
--- a/vue-app/src/views/Join.vue
+++ b/vue-app/src/views/Join.vue
@@ -1,20 +1,23 @@
 <template>
-  <div>
-    <join-optimistic v-if="$store.getters.canAddProject" />
-    <not-found v-else />
+  <div v-if="$store.state.currentRound && $store.state.recipientRegistryInfo">
+    <join-form v-if="$store.getters.canAddProject" />
+    <join-landing v-else />
   </div>
+  <loader v-else />
 </template>
 
 <script lang="ts">
 import Vue from 'vue'
 import Component from 'vue-class-component'
-import NotFound from '@/views/NotFound.vue'
-import JoinOptimistic from '@/views/JoinOptimistic.vue'
+import JoinLanding from '@/views/JoinLanding.vue'
+import JoinForm from '@/views/JoinForm.vue'
+import Loader from '@/components/Loader.vue'
 
 @Component({
   components: {
-    JoinOptimistic,
-    NotFound,
+    JoinForm,
+    JoinLanding,
+    Loader,
   },
 })
 export default class JoinView extends Vue {}
diff --git a/vue-app/src/views/JoinOptimistic.vue b/vue-app/src/views/JoinForm.vue
similarity index 99%
rename from vue-app/src/views/JoinOptimistic.vue
rename to vue-app/src/views/JoinForm.vue
index 3cab47ae1..df4bb812b 100644
--- a/vue-app/src/views/JoinOptimistic.vue
+++ b/vue-app/src/views/JoinForm.vue
@@ -141,7 +141,7 @@ import { required, email } from 'vuelidate/lib/validators'
     },
   },
 })
-export default class JoinView extends mixins(validationMixin) {
+export default class JoinForm extends mixins(validationMixin) {
   currentStep = 0
   steps = this.isEmailRequired
     ? ['project', 'summary', 'email', 'submit']
diff --git a/vue-app/src/views/JoinLanding.vue b/vue-app/src/views/JoinLanding.vue
index df49a7f1f..876e18f53 100644
--- a/vue-app/src/views/JoinLanding.vue
+++ b/vue-app/src/views/JoinLanding.vue
@@ -1,6 +1,5 @@
 <template>
-  <not-found id="not-found" v-if="!$store.getters.canAddProject" />
-  <div v-else id="join-landing">
+  <div id="join-landing">
     <div class="gradient">
       <div class="hero">
         <image-responsive title="core" />
@@ -18,6 +17,11 @@
       <loader />
     </div>
 
+    <div class="content" v-else-if="!registryInfo">
+      <h1>Fetching recipient registry data...</h1>
+      <loader />
+    </div>
+
     <div class="content" v-else-if="$store.getters.hasContributionPhaseEnded">
       <div class="big-emoji">☹</div>
       <h1>Sorry, it's too late to join</h1>
@@ -61,12 +65,15 @@
       <h1>Join the funding round</h1>
       <div class="subtitle">
         We’ll need some information about your project<span
-          v-if="$store.state.requireRegistrationDeposit"
+          v-if="$store.getters.requireRegistrationDeposit"
         >
           and a
           <strong>{{ formatAmount(deposit) }} {{ depositToken }}</strong>
           security deposit</span
         >.
+        <span v-if="!$store.getters.isSelfRegistration"
+          >Contact the round coordinator to submit your application.</span
+        >
       </div>
       <div class="subtitle mt2">
         The round only accepts a total of {{ maxRecipients }} projects, so apply
@@ -111,7 +118,10 @@
         <button class="btn-secondary" @click="toggleCriteria">
           See round criteria
         </button>
-        <links :to="$store.getters.joinFormUrl()" class="btn-primary"
+        <links
+          v-if="$store.getters.canAddProject"
+          :to="$store.getters.joinFormUrl()"
+          class="btn-primary"
           >Add project</links
         >
       </div>
@@ -121,7 +131,7 @@
       <h1>Join the next funding round</h1>
       <div class="subtitle">
         We’ll need some information about your project<span
-          v-if="$store.state.requireRegistrationDeposit"
+          v-if="$store.getters.requireRegistrationDeposit"
         >
           and a
           <strong>{{ formatAmount(deposit) }} {{ depositToken }}</strong>
@@ -142,7 +152,10 @@
         <button class="btn-secondary" @click="toggleCriteria">
           See round criteria
         </button>
-        <links :to="$store.getters.joinFormUrl()" class="btn-primary"
+        <links
+          v-if="$store.getters.canAddProject"
+          :to="$store.getters.joinFormUrl()"
+          class="btn-primary"
           >Add project</links
         >
       </div>
@@ -169,7 +182,6 @@ import ImageResponsive from '@/components/ImageResponsive.vue'
 
 import { getCurrentRound } from '@/api/round'
 import { formatAmount } from '@/utils/amounts'
-import NotFound from '@/views/NotFound.vue'
 
 @Component({
   components: {
@@ -180,7 +192,6 @@ import NotFound from '@/views/NotFound.vue'
     TimeLeft,
     ImageResponsive,
     Breadcrumbs,
-    NotFound,
   },
 })
 export default class JoinLanding extends Vue {
diff --git a/vue-app/src/views/ProjectList.vue b/vue-app/src/views/ProjectList.vue
index 633d67f76..68c5e4cc0 100644
--- a/vue-app/src/views/ProjectList.vue
+++ b/vue-app/src/views/ProjectList.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="project-container">
-    <div class="projects">
+    <loader v-if="isLoading" />
+    <div v-else class="projects">
       <div
         :class="{
           title: true,
@@ -38,8 +39,8 @@
             class="pointer"
           />
         </div>
-        <div v-if="$store.getters.canAddProject" class="add-project">
-          <links :to="addProjectUrl" class="btn-primary">Add project</links>
+        <div v-if="canAddProject" class="add-project">
+          <links to="/join" class="btn-primary">Add project</links>
         </div>
         <div class="hr" />
       </div>
@@ -88,6 +89,7 @@ import RoundInformation from '@/components/RoundInformation.vue'
 import FilterDropdown from '@/components/FilterDropdown.vue'
 import Links from '@/components/Links.vue'
 import Panel from '@/components/Panel.vue'
+import Loader from '@/components/Loader.vue'
 
 const SHUFFLE_RANDOM_SEED = Math.random()
 
@@ -115,6 +117,7 @@ function shuffleArray(array: any[]) {
     FilterDropdown,
     Links,
     Panel,
+    Loader,
   },
 })
 export default class ProjectList extends Vue {
@@ -202,15 +205,16 @@ export default class ProjectList extends Vue {
     this.search = ''
   }
 
-  get showAddProjectButton(): boolean {
-    const { requireRegistrationDeposit, isRecipientRegistryOwner } =
+  get canAddProject(): boolean {
+    const { isCurrentRound, isRecipientRegistryOwner, isSelfRegistration } =
       this.$store.getters
-    return requireRegistrationDeposit || isRecipientRegistryOwner
-  }
 
-  get addProjectUrl(): string {
-    const { requireRegistrationDeposit } = this.$store.getters
-    return requireRegistrationDeposit ? '/join' : '/join/project'
+    // do minimal checks here and redirect users to the join landing page
+    // to do more checks and give reasons if the round is not open for registration
+    return (
+      isCurrentRound(this.roundAddress) &&
+      (isSelfRegistration || isRecipientRegistryOwner)
+    )
   }
 }
 </script>

From cba88c82e7c981f1e78d13106845593c26f099d3 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 3 Aug 2022 11:35:59 -0400
Subject: [PATCH 30/36] css styling

---
 vue-app/src/views/MetadataList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vue-app/src/views/MetadataList.vue b/vue-app/src/views/MetadataList.vue
index bfca92cda..711eaf1fa 100644
--- a/vue-app/src/views/MetadataList.vue
+++ b/vue-app/src/views/MetadataList.vue
@@ -243,7 +243,7 @@ export default class MetadataList extends Vue {
   margin: 1.5rem 10px;
   font-size: 20px;
   * {
-    color: #f7f7f7;
+    color: var(--text-body);
   }
 }
 

From 7e998835e8130bc7d377c1e1f39409dd4e6dd00d Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Wed, 3 Aug 2022 11:36:39 -0400
Subject: [PATCH 31/36] make the metadata list in join form responsive

---
 vue-app/src/views/JoinForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vue-app/src/views/JoinForm.vue b/vue-app/src/views/JoinForm.vue
index df4bb812b..3cd87df12 100644
--- a/vue-app/src/views/JoinForm.vue
+++ b/vue-app/src/views/JoinForm.vue
@@ -383,7 +383,7 @@ export default class JoinForm extends mixins(validationMixin) {
 @import '../styles/theme';
 
 .container {
-  width: clamp(calc(800px - 4rem), calc(100% - 4rem), 1100px);
+  width: clamp(calc(500px - 4rem), calc(100% - 4rem), 1100px);
   margin: 0 auto;
   @media (max-width: $breakpoint-m) {
     width: 100%;

From 8cb066161486760f7e8360eef859e18990894de0 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Thu, 4 Aug 2022 15:38:40 -0400
Subject: [PATCH 32/36] change recipient menu dropdown icon to diamond and
 rearrange items

---
 vue-app/src/components/NavBar.vue | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/vue-app/src/components/NavBar.vue b/vue-app/src/components/NavBar.vue
index d9bee75a9..a9bf16244 100644
--- a/vue-app/src/components/NavBar.vue
+++ b/vue-app/src/components/NavBar.vue
@@ -71,6 +71,7 @@ export default class NavBar extends Vue {
     { to: '/about/how-it-works', text: 'How it works', emoji: '⚙️' },
     { to: '/about/maci', text: 'Bribery protection', emoji: '🤑' },
     { to: '/about/sybil-resistance', text: 'Sybil resistance', emoji: '👤' },
+    { to: '/about/layer-2', text: 'Layer 2', emoji: '🚀' },
     {
       to: 'https://github.com/clrfund/monorepo/',
       text: 'Code',
@@ -79,27 +80,21 @@ export default class NavBar extends Vue {
     {
       to: '/recipients',
       text: 'Recipients',
-      emoji: '🚀',
+      emoji: '💎',
     },
     {
       to: '/metadata',
       text: 'Metadata',
       emoji: '📃',
     },
-  ]
+  ].filter((item) => {
+    return chain.isLayer2 || item.text !== 'Layer 2'
+  })
 
   created() {
     const savedTheme = lsGet(this.themeKey)
     const theme = isValidTheme(savedTheme) ? savedTheme : getOsColorScheme()
     this.$store.commit(TOGGLE_THEME, theme)
-
-    if (chain.isLayer2) {
-      this.dropdownItems.splice(-1, 0, {
-        to: '/about/layer-2',
-        text: 'Layer 2',
-        emoji: '🚀',
-      })
-    }
   }
 
   closeHelpDropdown(): void {

From d4078500f1a024e56034a3035d1f983f397b53f8 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Thu, 4 Aug 2022 15:39:41 -0400
Subject: [PATCH 33/36] use consistent environment variable prefix

---
 vue-app/.env.example    | 8 ++++----
 vue-app/src/api/core.ts | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/vue-app/.env.example b/vue-app/.env.example
index 367d59b19..c3b1bdd93 100644
--- a/vue-app/.env.example
+++ b/vue-app/.env.example
@@ -44,16 +44,16 @@ VUE_APP_GOOGLE_SPREADSHEET_ID=
 
 # metadata registry configurations
 # The networks where metadata is stored; as comma separated strings
-# i.e. rinkeby,ropsten,mainnet
+# i.e. arbitrum-rinkeby,ropsten,mainnet
 VUE_APP_METADATA_NETWORKS=
 
 # metadata registry subgraph url prefix
 # Add the network part (VUE_APP_METADATA_NETWORKS) to form the complete url
-# i.e. https://api.thegraph.com/subgraphs/name/yuetloo/metadata-
-METADATA_SUBGRAPH_URL_PREFIX=
+# i.e. https://api.thegraph.com/subgraphs/name/clrfund/metadata-
+VUE_APP_METADATA_SUBGRAPH_URL_PREFIX=
 
 # subgraph query batch size, default to 30
-QUERY_BATCH_SIZE=
+VUE_APP_QUERY_BATCH_SIZE=
 
 # Select the sheet's name to write the data, by default 'Raw'
 GOOGLE_SHEET_NAME=
diff --git a/vue-app/src/api/core.ts b/vue-app/src/api/core.ts
index 242335ce3..244cf7838 100644
--- a/vue-app/src/api/core.ts
+++ b/vue-app/src/api/core.ts
@@ -70,7 +70,8 @@ export const METADATA_NETWORKS = process.env.VUE_APP_METADATA_NETWORKS
   ? process.env.VUE_APP_METADATA_NETWORKS.split(',')
   : ['rinkeby']
 
-export const QUERY_BATCH_SIZE = Number(process.env.QUERY_BATCH_SIZE) || 30
+export const QUERY_BATCH_SIZE =
+  Number(process.env.VUE_APP_QUERY_BATCH_SIZE) || 30
 
 export const MAX_RETRIES = Number(process.env.VUE_APP_MAX_RETRIES) || 10
 

From fb702be68ba55beb970c864627b4fbba3b61c4d6 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Thu, 4 Aug 2022 18:02:07 -0400
Subject: [PATCH 34/36] add missing bannerImageHash

---
 vue-app/src/api/recipient-registry.ts | 10 +++++++++-
 vue-app/src/api/types.ts              |  1 +
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/vue-app/src/api/recipient-registry.ts b/vue-app/src/api/recipient-registry.ts
index 10761c902..6c53b1333 100644
--- a/vue-app/src/api/recipient-registry.ts
+++ b/vue-app/src/api/recipient-registry.ts
@@ -342,11 +342,19 @@ export async function getRequests(
     const requestType = Number(recipient.requestType)
     if (requestType === RequestTypeCode.Registration) {
       // Registration request
-      const { name, description, imageHash, thumbnailImageHash } = metadata
+      const {
+        name,
+        description,
+        imageHash,
+        bannerImageHash,
+        thumbnailImageHash,
+      } = metadata
+
       metadata = {
         name,
         description,
         imageUrl: `${ipfsGatewayUrl}/ipfs/${imageHash}`,
+        bannerImageUrl: `${ipfsGatewayUrl}/ipfs/${bannerImageHash}`,
         thumbnailImageUrl: thumbnailImageHash
           ? `${ipfsGatewayUrl}/ipfs/${thumbnailImageHash}`
           : `${ipfsGatewayUrl}/ipfs/${imageHash}`,
diff --git a/vue-app/src/api/types.ts b/vue-app/src/api/types.ts
index 2e2f708b2..0f5a57927 100644
--- a/vue-app/src/api/types.ts
+++ b/vue-app/src/api/types.ts
@@ -43,6 +43,7 @@ interface RecipientMetadata {
   name: string
   description: string
   imageUrl: string
+  thumbnailImageUrl: string
 }
 
 export interface RecipientRegistryRequest {

From 6f332d0ccf6e08242eca69eaf1f3f2c6fe629036 Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Thu, 4 Aug 2022 18:02:52 -0400
Subject: [PATCH 35/36] allow simple recipient registry owner to remove
 recipient

---
 vue-app/src/api/recipient-registry-simple.ts | 18 ++++++++++++----
 vue-app/src/views/RecipientRegistry.vue      | 22 +++++++++++++-------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/vue-app/src/api/recipient-registry-simple.ts b/vue-app/src/api/recipient-registry-simple.ts
index 687568c36..fc835e4f5 100644
--- a/vue-app/src/api/recipient-registry-simple.ts
+++ b/vue-app/src/api/recipient-registry-simple.ts
@@ -1,5 +1,6 @@
 import { BigNumber, Contract, Event, Signer } from 'ethers'
-import { TransactionResponse } from '@ethersproject/abstract-provider'
+import { ContractTransaction } from '@ethersproject/contracts'
+
 import { isHexString } from '@ethersproject/bytes'
 
 import { SimpleRecipientRegistry } from './abi'
@@ -122,7 +123,7 @@ export function addRecipient(
   recipientData: any,
   _deposit: BigNumber,
   signer: Signer
-): Promise<TransactionResponse> {
+): Promise<ContractTransaction> {
   const registry = new Contract(
     registryAddress,
     SimpleRecipientRegistry,
@@ -142,8 +143,17 @@ export function addRecipient(
   return registry.addRecipient(address, JSON.stringify(json))
 }
 
-function removeProject() {
-  throw new Error('removeProject not implemented')
+function removeProject(
+  registryAddress: string,
+  recipientId: string,
+  signer: Signer
+): Promise<ContractTransaction> {
+  const registry = new Contract(
+    registryAddress,
+    SimpleRecipientRegistry,
+    signer
+  )
+  return registry.removeRecipient(recipientId)
 }
 
 function rejectProject() {
diff --git a/vue-app/src/views/RecipientRegistry.vue b/vue-app/src/views/RecipientRegistry.vue
index 46b778b0a..57985e8dc 100644
--- a/vue-app/src/views/RecipientRegistry.vue
+++ b/vue-app/src/views/RecipientRegistry.vue
@@ -96,14 +96,15 @@
             </td>
             <td>
               <div class="actions" v-if="isUserConnected">
-                <!-- TODO: to implement this feature, it requires to send a baseDeposit (see contract)
-              <div
-                class="btn-warning"
-                @click="remove(request)"
-                v-if="isExecuted(request)"
-              >
-                Remove
-              </div> -->
+                <!-- TODO: to implement remove for optimistic registry, it requires to send a baseDeposit (see contract)-->
+                <!-- Only implement remove for simple registry -->
+                <div
+                  class="btn-warning"
+                  @click="remove(request)"
+                  v-if="isOwner && canRemove && isExecuted(request)"
+                >
+                  Remove
+                </div>
                 <div
                   class="icon-btn-approve"
                   v-if="
@@ -181,6 +182,11 @@ export default class RecipientRegistryView extends Vue {
     )
   }
 
+  get canRemove(): boolean {
+    // only allow remove for simple recipient registry
+    return this.registryInfo && !this.registryInfo.isSelfRegistration
+  }
+
   get registryInfo(): RegistryInfo {
     return this.$store.state.recipientRegistryInfo
   }

From ee70287c33a81c9ade6c4534baecc21a0cc084ad Mon Sep 17 00:00:00 2001
From: yuetloo <contact@yuetloo.com>
Date: Thu, 4 Aug 2022 18:03:29 -0400
Subject: [PATCH 36/36] update about recipient for simple recipient registry

---
 vue-app/src/views/AboutRecipients.vue | 28 +++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/vue-app/src/views/AboutRecipients.vue b/vue-app/src/views/AboutRecipients.vue
index a47a9b635..f80bd1b13 100644
--- a/vue-app/src/views/AboutRecipients.vue
+++ b/vue-app/src/views/AboutRecipients.vue
@@ -37,9 +37,14 @@
     </div>
     <h2>Register your project</h2>
     <p>
-      In order to participate in a funding round as a project, you'll need to
-      submit an application to join the recipient registry (via an on-chain
-      transaction).
+      In order to participate in a funding round as a project,
+      <span v-if="$store.getters.isSelfRegistration"
+        >you'll need to submit an application to join the recipient registry
+        (via an on-chain transaction)</span
+      ><span v-else
+        >you'll need to contact the round coordinator to submit an
+        application</span
+      >.
     </p>
     <p>
       MACI, our anti-bribery tech, currently limits the amount of projects
@@ -58,12 +63,19 @@
         Click "See round criteria" and familiarize yourself with the criteria
         for projects.
       </li>
+      <li>
+        Once you're familiar with the criteria and you're sure your project
+        meets them,
+        <span v-if="$store.getters.selfRegistration"
+          >click "Add project." You'll see a series of forms to fill out asking
+          for more information about your project</span
+        >
+        <span v-else
+          >contact the round coordinator to add your project to the recipient
+          registry.</span
+        >
+      </li>
       <template v-if="$store.getters.requireRegistrationDeposit">
-        <li>
-          Once you're familiar with the criteria and you're sure your project
-          meets them, click "Add project." You'll see a series of forms to fill
-          out asking for more information about your project.
-        </li>
         <li>
           With the forms finished, you can finish your submission:
           <ol>