From 97b07e4690a9264838fccb4940581ab3ad9221de Mon Sep 17 00:00:00 2001 From: SebinSong Date: Tue, 29 Oct 2024 16:47:32 +1300 Subject: [PATCH 1/3] make sure non-monetary is not blank --- frontend/views/containers/contributions/NonMonetaryPledges.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/views/containers/contributions/NonMonetaryPledges.vue b/frontend/views/containers/contributions/NonMonetaryPledges.vue index 2af1a9192a..d7457da450 100644 --- a/frontend/views/containers/contributions/NonMonetaryPledges.vue +++ b/frontend/views/containers/contributions/NonMonetaryPledges.vue @@ -19,7 +19,7 @@ fieldset( .inputgroup input.input( type='text' - v-model='pledge.value' + v-model.trim='pledge.value' data-test='inputNonMonetaryPledge' :maxlength='config.maxChar' :aria-label='L("Pledge value")' From 9bbe04ae132106ca7fefd687f6c6f668051e5a26 Mon Sep 17 00:00:00 2001 From: SebinSong Date: Wed, 30 Oct 2024 08:30:10 +1300 Subject: [PATCH 2/3] fix typo --- .../views/containers/group-settings/InvitationLinkModal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/views/containers/group-settings/InvitationLinkModal.vue b/frontend/views/containers/group-settings/InvitationLinkModal.vue index d2fe722b6f..6302c2e6bf 100644 --- a/frontend/views/containers/group-settings/InvitationLinkModal.vue +++ b/frontend/views/containers/group-settings/InvitationLinkModal.vue @@ -6,7 +6,7 @@ modal-template(ref='modal' :a11yTitle='L("Add new members")') .c-container template(v-if='link') i18n.is-title-4(tag='h3') Share this link to grant access to your group. - i18n.has-text-1(tag='p') After the onboarding period has ended, everyone will be asked to vote on whether or not a new member should be added. But for now, enjoy 60 free passes! + i18n.has-text-1(tag='p') After the onboarding period has ended, everyone will be asked to vote on whether or not a new member should be added. But for now, enjoy 150 free passes! link-to-copy.c-link(:link='link') i18n.has-text-1(v-if='expireDate' tag='p' :args='{ expireDate }') This invite link expires on {expireDate}. i18n.has-text-1(v-else tag='p') This invite link doesn't expire From 4024c8552e8f1b5b460c6ac02a63ef72e6015657 Mon Sep 17 00:00:00 2001 From: SebinSong Date: Wed, 30 Oct 2024 14:32:11 +1300 Subject: [PATCH 3/3] add variable --- .../views/containers/group-settings/InvitationLinkModal.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/views/containers/group-settings/InvitationLinkModal.vue b/frontend/views/containers/group-settings/InvitationLinkModal.vue index 6302c2e6bf..0cc1b8aa60 100644 --- a/frontend/views/containers/group-settings/InvitationLinkModal.vue +++ b/frontend/views/containers/group-settings/InvitationLinkModal.vue @@ -6,7 +6,7 @@ modal-template(ref='modal' :a11yTitle='L("Add new members")') .c-container template(v-if='link') i18n.is-title-4(tag='h3') Share this link to grant access to your group. - i18n.has-text-1(tag='p') After the onboarding period has ended, everyone will be asked to vote on whether or not a new member should be added. But for now, enjoy 150 free passes! + i18n.has-text-1(tag='p' :args='{ count: anyoneLinkMax }') After the onboarding period has ended, everyone will be asked to vote on whether or not a new member should be added. But for now, enjoy {count} free passes! link-to-copy.c-link(:link='link') i18n.has-text-1(v-if='expireDate' tag='p' :args='{ expireDate }') This invite link expires on {expireDate}. i18n.has-text-1(v-else tag='p') This invite link doesn't expire @@ -33,6 +33,7 @@ import { humanDate } from '@model/contracts/shared/time.js' import { REPLACE_MODAL } from '@utils/events.js' import SvgBrokenLink from '@svgs/broken-link.svg' import { buildInvitationUrl } from '@view-utils/buildInvitationUrl.js' +import { MAX_GROUP_MEMBER_COUNT } from '@model/contracts/shared/constants.js' export default ({ name: 'InvitationLinkModal', @@ -62,6 +63,9 @@ export default ({ }, expireDate () { return humanDate(this.currentWelcomeInvite.expires, { month: 'long', day: 'numeric' }) + }, + anyoneLinkMax () { + return MAX_GROUP_MEMBER_COUNT } }, methods: {