diff --git a/resources/views/Wishlist/DeleteWish.vue b/resources/views/Wishlist/DeleteWish.vue
index fcf5e94..196b748 100644
--- a/resources/views/Wishlist/DeleteWish.vue
+++ b/resources/views/Wishlist/DeleteWish.vue
@@ -1,11 +1,57 @@
 <script>
+import {useUserStore} from "../../store/user.js";
+import {useWishStore} from "../../store/wish.js";
+import {rules} from "../../js/rules.js";
+import {toRef} from "vue";
 export default {
-name: "DeleteWish"
+    name: "DeleteWish",
+    data: () => ({
+        userStore: useUserStore(),
+        wishStore: useWishStore(),
+        isWide: window.innerWidth >= 800,
+        deleting: false
+    }),
+    computed: {
+        rules() {
+            return rules
+        }
+    },
+    props: {
+        dialogDelete: Function,
+        updateFrontWishes: Function,
+        wish_id: Number
+    },
+    setup(props) {
+        const id = toRef(props, 'wish_id')
+    },
+    methods: {
+        removeWish(){
+            this.deleting = true;
+            this.wishStore.remove(this.wish_id, this.userStore.token).then(()=>{
+                this.deleting = false;
+                this.updateFrontWishes();
+                this.dialogDelete();
+            });
+        }
+    }
 }
 </script>
 
 <template>
-  $END$
+    <v-card class="card-bg">
+        <v-card-title class="d-flex justify-space-between">
+            <span>Удалить запись?</span>
+            <span>
+                            <v-icon @click="dialogDelete" class="cursor-pointer" color="white" icon="mdi-close-thick"></v-icon>
+                        </span>
+        </v-card-title>
+        <v-card-text>
+            <div class="d-flex justify-center">
+                <v-btn class="ma-3" @click="removeWish" :loading="deleting">Да</v-btn>
+                <v-btn class="ma-3" @click="dialogDelete">Нет</v-btn>
+            </div>
+        </v-card-text>
+    </v-card>
 </template>
 
 <style scoped>
diff --git a/resources/views/Wishlist/Wishlist.vue b/resources/views/Wishlist/Wishlist.vue
index 0d0bff2..d5d7dfc 100644
--- a/resources/views/Wishlist/Wishlist.vue
+++ b/resources/views/Wishlist/Wishlist.vue
@@ -4,9 +4,10 @@ import {useWishStore} from "../../store/wish.js";
 import CreateWish from "./CreateWish.vue";
 import {ref} from "vue";
 import EditWish from "./EditWish.vue";
+import DeleteWish from "./DeleteWish.vue";
 export default {
     name: "Wishlist",
-    components: {EditWish, CreateWish},
+    components: {DeleteWish, EditWish, CreateWish},
     data: () => ({
         userStore: useUserStore(),
         wishStore: useWishStore(),
@@ -35,6 +36,9 @@ export default {
         dialogEditClose(){
             this.dialogEdit = false;
         },
+        dialogDeleteClose(){
+            this.dialogDelete = false;
+        },
         updateFrontWishes(){
             this.fetching = true;
             this.wishStore.getUserWishes(this.userStore.user['id']).then((wishes)=>{
@@ -42,16 +46,6 @@ export default {
                 this.fetching = false
             });
         },
-        removeWish(id){
-            this.fetching = true;
-            this.wishStore.remove(id, this.userStore.token).then(()=>{
-                this.dialogDelete = false;
-                this.wishStore.getUserWishes(this.userStore.user['id']).then((wishes)=>{
-                    this.wishesList = wishes;
-                    this.fetching = false;
-                });
-            })
-        },
         editWish(id){
             this.wishToEditId = id;
             this.dialogEdit = true;
@@ -114,20 +108,7 @@ export default {
                 <EditWish :dialogEdit="dialogEditClose" :updateFrontWishes="updateFrontWishes" :wish_id="wishToEditId"/>
             </v-dialog>
             <v-dialog v-model="dialogDelete" :class="isWide ? 'w-33' : 'w-100'">
-                <v-card class="card-bg">
-                    <v-card-title class="d-flex justify-space-between">
-                        <span>Удалить запись?</span>
-                        <span>
-                            <v-icon @click="dialogDelete = false" class="cursor-pointer" color="white" icon="mdi-close-thick"></v-icon>
-                        </span>
-                    </v-card-title>
-                    <v-card-text>
-                        <div class="d-flex justify-center">
-                            <v-btn class="ma-3" @click="removeWish(wishToDelete)">Да</v-btn>
-                            <v-btn class="ma-3" @click="dialogDelete = false">Нет</v-btn>
-                        </div>
-                    </v-card-text>
-                </v-card>
+                <DeleteWish :dialogDelete="dialogDeleteClose" :updateFrontWishes="updateFrontWishes" :wish_id="wishToDelete"/>
             </v-dialog>
         </v-table>
         <v-table v-if="!fetching && !isWide" class="card-bg w-100 h-auto mt-5 pa-3">
@@ -157,20 +138,7 @@ export default {
                 <EditWish :dialogEdit="dialogEditClose" :updateFrontWishes="updateFrontWishes" :wish_id="wishToEditId"/>
             </v-dialog>
             <v-dialog v-model="dialogDelete" :class="isWide ? 'w-66' : 'w-100'">
-                <v-card class="card-bg">
-                    <v-card-title class="d-flex justify-space-between">
-                        <span>Удалить запись?</span>
-                        <span>
-                            <v-icon @click="dialogDelete = false" class="cursor-pointer" color="white" icon="mdi-close-thick"></v-icon>
-                        </span>
-                    </v-card-title>
-                    <v-card-text>
-                        <div class="d-flex justify-center">
-                            <v-btn class="ma-3" @click="removeWish(wishToDelete)">Да</v-btn>
-                            <v-btn class="ma-3" @click="dialogDelete = false">Нет</v-btn>
-                        </div>
-                    </v-card-text>
-                </v-card>
+                <DeleteWish :dialogDelete="dialogDeleteClose" :updateFrontWishes="updateFrontWishes" :wish_id="wishToDelete"/>
             </v-dialog>
         </v-table>
     </div>