Merge pull request #314 from xuhcc/empty-cart-withdraw

Frontend: Show 'withdraw' button even if cart is empty
clrfund · Mar 19, 2021 · 048bb44 · 048bb44
2 parents a07cf0c + 31c4475
commit 048bb44
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/vue-app/src/components/Cart.vue b/vue-app/src/components/Cart.vue
@@ -179,7 +179,7 @@ export default class Cart extends Vue {
   }
 
   canSubmit(): boolean {
-    return this.$store.state.currentRound && this.cart.length > 0
+    return this.$store.state.currentRound && this.cart.length > 0 || this.canWithdrawContribution()
   }
 
   private isFormValid(): boolean {
@@ -271,6 +271,7 @@ export default class Cart extends Vue {
 
   hasUnallocatedFunds(): boolean {
     return (
+      this.errorMessage === null &&
       this.contribution !== null &&
       !this.contribution.isZero() &&
       this.getTotal().lt(this.contribution)
@@ -312,8 +313,10 @@ export default class Cart extends Vue {
   }
 
   canWithdrawContribution(): boolean {
-    const { status } = this.$store.state.currentRound
-    return status === RoundStatus.Cancelled && !this.contribution.isZero()
+    return (
+      this.$store.state.currentRound?.status === RoundStatus.Cancelled &&
+      !this.contribution.isZero()
+    )
   }
 
   withdrawContribution(): void {

diff --git a/vue-app/src/components/ProjectListItem.vue b/vue-app/src/components/ProjectListItem.vue
@@ -49,6 +49,7 @@ import { DateTime } from 'luxon'
 import { DEFAULT_CONTRIBUTION_AMOUNT, CartItem } from '@/api/contributions'
 import { recipientRegistryType } from '@/api/core'
 import { Project, getProject } from '@/api/projects'
+import { RoundStatus } from '@/api/round'
 import { TcrItemStatus } from '@/api/recipient-registry-kleros'
 import RecipientRegistrationModal from '@/components/RecipientRegistrationModal.vue'
 import { SAVE_CART } from '@/store/action-types'
@@ -111,6 +112,7 @@ export default class ProjectListItem extends Vue {
       this.$store.state.currentUser &&
       this.$store.state.currentRound &&
       DateTime.local() < this.$store.state.currentRound.votingDeadline &&
+      this.$store.state.currentRound.status !== RoundStatus.Cancelled &&
       this.project.isHidden === false &&
       this.project.isLocked === false
     )

diff --git a/vue-app/src/components/WithdrawalModal.vue b/vue-app/src/components/WithdrawalModal.vue
@@ -23,6 +23,7 @@ import { BigNumber } from 'ethers'
 
 import { withdrawContribution } from '@/api/contributions'
 import Transaction from '@/components/Transaction.vue'
+import { SET_CONTRIBUTION } from '@/store/mutation-types'
 import { formatAmount } from '@/utils/amounts'
 import { waitForTransaction } from '@/utils/contracts'
 
@@ -54,6 +55,7 @@ export default class WithdrawalModal extends Vue {
       this.withdrawalTxError = error.message
       return
     }
+    this.$store.commit(SET_CONTRIBUTION, BigNumber.from(0))
     this.step += 1
   }
 

diff --git a/vue-app/src/views/Project.vue b/vue-app/src/views/Project.vue
@@ -245,6 +245,7 @@ export default class ProjectView extends Vue {
       this.hasContributeBtn() &&
       this.$store.state.currentUser &&
       DateTime.local() < this.$store.state.currentRound.votingDeadline &&
+      this.$store.state.currentRound.status !== RoundStatus.Cancelled &&
       this.project !== null &&
       !this.project.isLocked
     )