diff --git a/website/client/src/components/payments/selectUserModal.vue b/website/client/src/components/payments/selectUserModal.vue index e34e0a04df..e12b56b189 100644 --- a/website/client/src/components/payments/selectUserModal.vue +++ b/website/client/src/components/payments/selectUserModal.vue @@ -71,7 +71,6 @@ id="selectUser" v-model="userSearchTerm" :is-valid="foundUser._id" - :placeholder="$t('usernameOrUserId')" :invalid-issues="userInputInvalidIssues" /> @@ -318,6 +317,7 @@ export default { computed: { ...mapState({ currentEventList: 'worldState.data.currentEventList', + user: 'user.data', }), currentEvent () { return find(this.currentEventList, event => Boolean(event.gemsPromo) || Boolean(event.promo)); @@ -399,6 +399,8 @@ export default { this.foundUser = result; }, 500), selectUser () { + this.foundUser.g1g1 = this.currentEvent?.promo === 'g1g1' + && this.foundUser._id !== this.user._id; this.$root.$emit('habitica::send-gift', this.foundUser); this.close(); }, diff --git a/website/client/src/components/payments/successModal.vue b/website/client/src/components/payments/successModal.vue index 76c6f4eb77..738c3fcff4 100644 --- a/website/client/src/components/payments/successModal.vue +++ b/website/client/src/components/payments/successModal.vue @@ -59,6 +59,12 @@