Merge branch 'develop' into feat/whatsapp-embedded-signup
This commit is contained in:
@@ -101,14 +101,12 @@ const getContactDetails = () => {
|
||||
}
|
||||
};
|
||||
|
||||
watch(conversationId, (newConversationId, prevConversationId) => {
|
||||
if (newConversationId && newConversationId !== prevConversationId) {
|
||||
watch(contactId, (newContactId, prevContactId) => {
|
||||
if (newContactId && newContactId !== prevContactId) {
|
||||
getContactDetails();
|
||||
}
|
||||
});
|
||||
|
||||
watch(contactId, getContactDetails);
|
||||
|
||||
const onDragEnd = () => {
|
||||
dragging.value = false;
|
||||
updateUISettings({
|
||||
|
||||
@@ -62,10 +62,10 @@ export default {
|
||||
}
|
||||
let alertMessage = this.$t('PROFILE_SETTINGS.PASSWORD_UPDATE_SUCCESS');
|
||||
try {
|
||||
await this.$store.dispatch('updateProfile', {
|
||||
await this.$store.dispatch('updatePassword', {
|
||||
password: this.password,
|
||||
password_confirmation: this.passwordConfirmation,
|
||||
current_password: this.currentPassword,
|
||||
passwordConfirmation: this.passwordConfirmation,
|
||||
currentPassword: this.currentPassword,
|
||||
});
|
||||
} catch (error) {
|
||||
alertMessage =
|
||||
|
||||
Reference in New Issue
Block a user