Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Disable reward button when not enough meeds - MEED-7597 - Meeds-io/MIPs#154 #589

Merged
merged 1 commit into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,12 @@
class="d-flex flex-column justify-space-between"
width="40%"
flat>
<wallet-current-balance :loading="loading" :reward-settings="rewardSettings" />
<wallet-current-balance
:loading="loading"
:reward-settings="rewardSettings"
:configured-budget="configuredBudget"
:admin-wallet="adminWallet"
:contract-details="contractDetails" />
<extension-registry-components
name="WalletRewardingCard"
type="wallet-reward-cards-extensions" />
Expand Down Expand Up @@ -58,6 +63,8 @@
:reward-report="selectedRewardReport"
:transaction-ether-scan-link="transactionEtherScanLink"
:contract-details="contractDetails"
:admin-wallet="adminWallet"
:configured-budget="configuredBudget"
@reward-report-updated="rewardReportUpdated"
@back="showRewardDetails = false" />
</template>
Expand All @@ -77,7 +84,9 @@ export default {
rewardsPage: 0,
rewardsPageSize: 12,
transactionEtherScanLink: null,
contractDetails: null
contractDetails: null,
distributionForecast: null,
adminWallet: null,
}),
computed: {
rewardReport() {
Expand All @@ -89,6 +98,9 @@ export default {
selectedDate() {
return this.rewardPeriod?.startDate.substring(0, 10) || new Date().toISOString().substring(0, 10);
},
configuredBudget() {
return this.distributionForecast?.budget;
},
},
created() {
this.init()
Expand All @@ -106,7 +118,9 @@ export default {
return this.walletUtils.initSettings(false, true, true)
.then(() => {
this.contractDetails = window.walletSettings.contractDetail;
return this.addressRegistry.searchWalletByTypeAndId('admin', 'admin');
})
.then((adminWallet) => this.adminWallet = adminWallet)
.then(() => this.walletUtils.initWeb3(false, true))
.then(() => {
if (this.contractDetails) {
Expand All @@ -129,6 +143,7 @@ export default {
this.rewardSettings = settings || {};
})
.then(() => this.refreshRewards())
.then(() => this.computeDistributionForecast())
.finally(() => this.loading = false);
},
refreshRewards(period) {
Expand Down Expand Up @@ -167,7 +182,13 @@ export default {
if (index !== -1) {
this.rewardReports[index] = rewardReport;
}
}
},
computeDistributionForecast() {
return this.$rewardService.computeDistributionForecast(this.rewardSettings)
.then(distributionForecast => {
this.distributionForecast = distributionForecast;
});
},
},
};
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
-->
<template>
<v-card
:loading="loading || loadingWallet"
:loading="loading"
class="border-radius border-color ma-5 mb-2"
flat>
<div class="d-flex flex-column flex-grow-1">
Expand Down Expand Up @@ -105,18 +105,26 @@ export default {
type: Object,
default: null
},
adminWallet: {
type: Object,
default: null
},
contractDetails: {
type: Object,
default: null
},
configuredBudget: {
type: Number,
default: 0
},
loading: {
type: Boolean,
default: false,
},
},
data () {
return {
loadingWallet: false,
adminWallet: null,
contractDetails: null,
walletAdminUri: '/portal/administration/home/rewards/wallet',
configuredBudget: null
};
},
computed: {
Expand Down Expand Up @@ -148,39 +156,5 @@ export default {
return this.lowEtherBalance ? this.$t('wallet.administration.lowEtherBalance') : this.$t('wallet.administration.lowTokenBalance');
}
},
watch: {
rewardSettings() {
this.computeDistributionForecast();
}
},
created() {
this.init();
},
methods: {
init() {
this.loadingWallet = true;
this.error = null;
return this.walletUtils.initSettings(false, true)
.then(() => {
this.contractDetails = window.walletSettings.contractDetail;
return this.addressRegistry.searchWalletByTypeAndId('admin', 'admin');
})
.then((adminWallet) => this.adminWallet = adminWallet)
.then(() => {
this.$nextTick().then(() => {
this.computeDistributionForecast();
});
})
.finally(() => {
this.loadingWallet = false;
});
},
computeDistributionForecast() {
return this.$rewardService.computeDistributionForecast(this.rewardSettings)
.then(distributionForecast => {
this.configuredBudget = distributionForecast?.budget || 0;
});
},
}
};
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,19 @@
<div v-else-if="tokensToSend > 0 && !sendingInProgress" class="text-subtitle pe-2">{{ rewardsToSend }}</div>
<v-tooltip
bottom
:disabled="!isNotPastPeriod">
:disabled="!disabledSendButton">
<template #activator="{ on }">
<div v-on="on" class="d-inline-block">
<v-btn
:loading="loadingSending"
:disabled="isNotPastPeriod || sendingInProgress"
:disabled="disabledSendButton || sendingInProgress"
class="btn btn-primary"
@click="sendRewards">
{{ $t('wallet.administration.rewardDetails.label.reward') }}
</v-btn>
</div>
</template>
<span>{{ $t('wallet.administration.rewardCard.status.inPeriod') }}</span>
<span> {{ disabledSendButtonLabel }} </span>
</v-tooltip>
</template>
<extension-registry-components
Expand Down Expand Up @@ -120,10 +120,18 @@ export default {
type: Object,
default: null
},
adminWallet: {
type: Object,
default: null
},
contractDetails: {
type: Object,
default: null
},
configuredBudget: {
type: Number,
default: 0
},
transactionEtherScanLink: {
type: String,
default: function () {
Expand Down Expand Up @@ -228,6 +236,30 @@ export default {
0: this.formattedTokensToSend,
1: this.points
});
},
tokenBalance() {
return this.adminWallet?.tokenBalance || 0;
},
etherBalance() {
return this.adminWallet?.etherBalance || 0;
},
lowEtherBalance() {
return this.etherBalance < 1;
},
lowTokenBalance() {
return this.configuredBudget > this.tokenBalance;
},
balanceBelowBudget() {
return this.lowEtherBalance || this.lowTokenBalance;
},
balanceBelowBudgetLabel() {
return this.lowEtherBalance ? this.$t('wallet.administration.lowEtherBalance') : this.$t('wallet.administration.lowTokenBalance');
},
disabledSendButton() {
return this.isNotPastPeriod || this.balanceBelowBudget;
},
disabledSendButtonLabel() {
return this.isNotPastPeriod ? this.$t('wallet.administration.rewardCard.status.inPeriod') : this.balanceBelowBudgetLabel;
}
},
methods: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,10 @@ export default {
return this.success ? 'success' : 'error';
},
statusIconTitle() {
return this.success ? this.$t('wallet.administration.rewardDetails.successfullyProceeded') :
this.pending ? this.$t('wallet.administration.rewardDetails.transactionInProgress') : this.$t('wallet.administration.rewardDetails.transactionError');
if (this.success) {
return this.$t('wallet.administration.rewardDetails.successfullyProceeded');
}
return this.pending ? this.$t('wallet.administration.rewardDetails.transactionInProgress') : this.$t('wallet.administration.rewardDetails.transactionError');
},
amount() {
return this.completelyProceeded ? this.reward?.tokensSent : this.reward?.amount;
Expand Down