Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feat/maci-v1
Browse files Browse the repository at this point in the history
  • Loading branch information
yuetloo committed Feb 29, 2024
2 parents 99151f0 + 419095a commit 77362e6
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions vue-app/src/components/AddToCartButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,15 @@ function handleSubmit(): void {
if (currentUser.value.encryptionKey) {
contribute()
} else {
promptSignagure()
promptSignature()
}
return
}
promptConnection()
}
function promptSignagure(): void {
function promptSignature(): void {
const { open, close } = useModal({
component: SignatureModal,
attrs: {
Expand All @@ -134,7 +134,7 @@ function promptConnection(): void {
onClose() {
close().then(() => {
if (currentUser.value?.walletAddress) {
promptSignagure()
promptSignature()
}
})
},
Expand Down
8 changes: 4 additions & 4 deletions vue-app/src/components/Cart.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<div class="empty-cart">
<div class="moon-emoji">🌚</div>
<h3>{{ $t('cart.sign_the_message_to_see_your_cart') }}</h3>
<button @click="promptSignagure" class="btn-action">{{ $t('cart.sign') }}</button>
<button @click="promptSignature" class="btn-action">{{ $t('cart.sign') }}</button>
</div>
</div>
<div v-else class="cart-container">
Expand Down Expand Up @@ -311,7 +311,7 @@ function removeAll(): void {
onMounted(() => {
if (currentUser.value && !currentUser.value.encryptionKey) {
promptSignagure()
promptSignature()
}
})
Expand All @@ -322,7 +322,7 @@ function promptConnection(): void {
onClose() {
close().then(() => {
if (currentUser.value?.walletAddress) {
promptSignagure()
promptSignature()
}
})
},
Expand All @@ -331,7 +331,7 @@ function promptConnection(): void {
open()
}
function promptSignagure(): void {
function promptSignature(): void {
const { open, close } = useModal({
component: SignatureModal,
attrs: {
Expand Down
4 changes: 2 additions & 2 deletions vue-app/src/components/CartWidget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const isCartBadgeShown = computed(() => {
return (canUserReallocate.value || isRoundContributionPhase.value) && !!cart.value.length
})
async function promptSignagure() {
async function promptSignature() {
const { open, close } = useModal({
component: SignatureModal,
attrs: {
Expand All @@ -69,7 +69,7 @@ function toggleCart(): void {
if (currentUser.value.encryptionKey) {
appStore.toggleShowCartPanel()
} else {
promptSignagure()
promptSignature()
}
}
</script>
Expand Down
2 changes: 1 addition & 1 deletion vue-app/src/views/AboutQuadraticFunding.vue
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<h2>{{ $t('quadratic_funding.resources.h2') }}</h2>
<ul>
<li>
<links to="https://vitalik.ca/general/2019/12/07/quadratic.html">{{
<links to="https://vitalik.eth.limo/general/2019/12/07/quadratic.html">{{
$t('quadratic_funding.resources.li1')
}}</links>
</li>
Expand Down
4 changes: 2 additions & 2 deletions vue-app/src/views/VerifyLanding.vue
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function translateDate(date: DateTime): string {
})
}
async function promptSignagure() {
async function promptSignature() {
const { open, close } = useModal({
component: SignatureModal,
attrs: {
Expand All @@ -152,7 +152,7 @@ function handleButtonClicked() {
if (currentUser.value.encryptionKey) {
gotoVerify()
} else {
promptSignagure()
promptSignature()
}
}
Expand Down

0 comments on commit 77362e6

Please sign in to comment.