Skip to content

Send and receive SMS messages using your Android phone programmatically via a simple HTTP API

fix: remove form submit on new message send button

Acho Arnold Ewin2ef0b8eaba83
diff --git a/web/app/pages/bulk-messages/index.vue b/web/app/pages/bulk-messages/index.vue
index f6237c89..26a0253c 100644
--- a/web/app/pages/bulk-messages/index.vue
+++ b/web/app/pages/bulk-messages/index.vue
@@ -169,7 +169,7 @@ onMounted(async () => {
</li>
</ul>
</VAlert>
- <form @submit.prevent="sendBulkMessages">
+ <form>
<VFileInput
v-model="formFile"
label="File"
@@ -180,16 +180,17 @@ onMounted(async () => {
variant="outlined"
/>
<div class="d-flex">
- <VBtn
+ <loading-button
color="primary"
type="submit"
+ size="large"
:loading="loading"
:disabled="loading"
- size="large"
+ :icon="mdiSendCheck"
+ @click="sendBulkMessages"
>
- <VIcon start :icon="mdiSendCheck" />
Send Bulk Messages
- </VBtn>
+ </loading-button>
<VSpacer />
<VBtn
v-if="mdAndUp"
diff --git a/web/app/pages/phone-api-keys/index.vue b/web/app/pages/phone-api-keys/index.vue
index 3d786534..27804cbd 100644
--- a/web/app/pages/phone-api-keys/index.vue
+++ b/web/app/pages/phone-api-keys/index.vue
@@ -383,14 +383,13 @@ onBeforeUnmount(() => {
</VForm>
</VCardText>
<VCardActions class="mt-n6 mb-1">
- <VBtn
+ <loading-button
color="primary"
- variant="flat"
:loading="loading"
@click="createPhoneApiKey"
>
Create<span v-if="lgAndUp" class="mx-1">Phone API</span>Key
- </VBtn>
+ </loading-button>
<VSpacer />
<VBtn
variant="text"
diff --git a/web/app/pages/settings/index.vue b/web/app/pages/settings/index.vue
index 4927537a..0788fbb0 100644
--- a/web/app/pages/settings/index.vue
+++ b/web/app/pages/settings/index.vue
@@ -95,7 +95,7 @@ function parseErrors(error: unknown): ErrorMessages {
const bag = new ErrorMessages()
const data = toApiError(error).data?.data
if (data && typeof data === 'object') {
- Object.keys(data).forEach((key) => bag.addMany(key, data[key]))
+ Object.keys(data).forEach((key) => bag.addMany(key, data[key]!))
}
return bag
}
@@ -596,9 +596,9 @@ function scheduleWindowError(index: number): string | null {
? errorMessages.value.get('windows')
: []
if (messages.length === 0) return null
- const message = messages.find((x) => x.includes(`Day of week ${index}`))
+ const message = messages.find((x) => x.includes(`day_of_week ${index}`))
return message
- ? message.replace(`Day of week ${index}`, getWeekday(index))
+ ? message.replace(`day_of_week ${index}`, getWeekday(index))
: null
}
@@ -631,7 +631,7 @@ async function saveSchedule() {
await loadSendSchedules()
} catch (error: unknown) {
errorMessages.value = parseErrors(error)
- if (errorMessages.value.size() === 0) {
+ if (errorMessages.value.size() != 0) {
notificationsStore.addNotification({
type: 'error',
message: 'Failed to save send schedule',
diff --git a/web/app/pages/threads/[id]/index.vue b/web/app/pages/threads/[id]/index.vue
index 0f08f57a..541a0d3a 100644
--- a/web/app/pages/threads/[id]/index.vue
+++ b/web/app/pages/threads/[id]/index.vue
@@ -516,7 +516,7 @@ onBeforeUnmount(() => {
</div>
<VFooter app class="py-0" color="#121212">
<VContainer class="pb-0 pt-0">
- <VForm ref="form" class="d-flex" @submit.prevent="sendMessage">
+ <VForm ref="form" class="d-flex">
<VTextField
v-model="formMessage"
:disabled="submitting || !contactIsPhoneNumber"
@@ -537,6 +537,7 @@ onBeforeUnmount(() => {
class="ml-2"
icon
size="large"
+ @click="sendMessage"
>
<VProgressCircular
v-if="submitting"
diff --git a/web/app/stores/phones.ts b/web/app/stores/phones.ts
index d7412ffb..b867e874 100644
--- a/web/app/stores/phones.ts
+++ b/web/app/stores/phones.ts
@@ -72,6 +72,7 @@ export const usePhonesStore = defineStore('phones', () => {
message: getApiErrorMessage(error, 'Error while updating phone'),
type: 'error',
})
+ throw error
}
}