Improve input dialog

3 files changed, 8 insertions, 6 deletions

diff --git a/src/client/app/mobile/views/pages/notifications.vue b/src/client/app/mobile/views/pages/notifications.vue
index a7271162d1..69f7b902c8 100644
--- a/src/client/app/mobile/views/pages/notifications.vue
+++ b/src/client/app/mobile/views/pages/notifications.vue
@@ -27,8 +27,8 @@ export default Vue.extend({
 				type: 'warning',
 				text: this.$t('read-all'),
 				showCancelButton: true
-			}).then(res => {
-				if (!res) return;
+			}).then(({ canceled }) => {
+				if (canceled) return;
 
 				this.$root.api('notifications/mark_all_as_read');
 			});
diff --git a/src/client/app/mobile/views/pages/user-lists.vue b/src/client/app/mobile/views/pages/user-lists.vue
index 2222a22487..dc9d47de3c 100644
--- a/src/client/app/mobile/views/pages/user-lists.vue
+++ b/src/client/app/mobile/views/pages/user-lists.vue
@@ -38,9 +38,11 @@ export default Vue.extend({
 	},
 	methods: {
 		fn() {
-			this.$input({
+			this.$root.dialog({
 				title: this.$t('enter-list-name'),
-			}).then(async title => {
+				input: true
+			}).then(async ({ canceled, result: title }) => {
+				if (canceled) return;
 				const list = await this.$root.api('users/lists/create', {
 					title
 				});
diff --git a/src/client/app/mobile/views/pages/user.vue b/src/client/app/mobile/views/pages/user.vue
index afef398acf..15c5fbb9ad 100644
--- a/src/client/app/mobile/views/pages/user.vue
+++ b/src/client/app/mobile/views/pages/user.vue
@@ -120,7 +120,7 @@ export default Vue.extend({
 				text: this.$t('push-to-list'),
 				action: async () => {
 					const lists = await this.$root.api('users/lists/list');
-					const listId = await this.$root.dialog({
+					const { canceled, result: listId } = await this.$root.dialog({
 						type: null,
 						title: this.$t('select-list'),
 						select: {
@@ -130,7 +130,7 @@ export default Vue.extend({
 						},
 						showCancelButton: true
 					});
-					if (!listId) return;
+					if (canceled) return;
 					await this.$root.api('users/lists/push', {
 						listId: listId,
 						userId: this.user.id