diff --git a/src/renderer/components/modal/modal-types/guard-modal.component.tsx b/src/renderer/components/modal/modal-types/guard-modal.component.tsx index 3e123ae3..0e486b30 100644 --- a/src/renderer/components/modal/modal-types/guard-modal.component.tsx +++ b/src/renderer/components/modal/modal-types/guard-modal.component.tsx @@ -5,7 +5,7 @@ import { BsmImage } from "renderer/components/shared/bsm-image.component"; import { BsmButton } from "renderer/components/shared/bsm-button.component"; import { useTranslation } from "renderer/hooks/use-translation.hook"; -export function GuardModal({resolver}: {resolver: (x: ModalResponse) => void}) { +export function GuardModal({resolver}: {resolver: (x: ModalResponse) => void}) { const [guardCode, setGuardCode] = useState(''); const t = useTranslation(); diff --git a/src/renderer/components/modal/modal-types/login-modal.component.tsx b/src/renderer/components/modal/modal-types/login-modal.component.tsx index 9592f8ca..c8535faa 100644 --- a/src/renderer/components/modal/modal-types/login-modal.component.tsx +++ b/src/renderer/components/modal/modal-types/login-modal.component.tsx @@ -5,7 +5,7 @@ import { useTranslation } from "renderer/hooks/use-translation.hook"; import { ModalExitCode, ModalResponse } from "renderer/services/modale.service"; import BeatImpatient from '../../../../../assets/images/apngs/beat-impatient.png' -export function LoginModal({resolver}: {resolver: (x: ModalResponse) => void}) { +export function LoginModal({resolver}: {resolver: (x: ModalResponse) => void}) { const [username, setUsername] = useState(''); const [password, setPassword] = useState(''); diff --git a/src/renderer/services/modale.service.ts b/src/renderer/services/modale.service.ts index 1812af55..173a2b19 100644 --- a/src/renderer/services/modale.service.ts +++ b/src/renderer/services/modale.service.ts @@ -32,14 +32,14 @@ export class ModalService{ return this.resolver; } - public resolve(data: ModalResponse): void{ + public resolve(data: ModalResponse): void{ this.resolver(data); } - public async openModal(modalType: ModalType, data?: any): Promise{ + public async openModal(modalType: ModalType, data?: any): Promise>{ this.close(); await timeout(100); //Must wait resolve - const promise = new Promise((resolve) => { this.resolver = resolve; }); + const promise = new Promise>((resolve) => { this.resolver = resolve; }); promise.then(() => this.close()); this.modalType$.next(modalType); if(data){ this.modalData = data; } @@ -54,6 +54,8 @@ export enum ModalType { GUARD_CODE = "GUARD_CODE", UNINSTALL = "UNINSTALL", INSTALLATION_FOLDER = "INSTALLATION_FOLDER", + EDIT_VERSION = "EDIT_VERSION", + CLONE_VERSION = "CLONE_VERSION" } export enum ModalExitCode { @@ -63,7 +65,7 @@ export enum ModalExitCode { CANCELED = 2, } -export interface ModalResponse { +export interface ModalResponse { exitCode: ModalExitCode, - data?: any + data?: T }