From cb1439e89fd04a5b45afb74db91ad896c221c9b2 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Thu, 6 Jan 2022 10:17:34 +0100
Subject: [PATCH] rollback change in the modal dialog

---
 libs/remix-ui/app/src/lib/remix-app/interface/index.ts    | 8 ++++----
 .../modal-dialog/src/lib/remix-ui-modal-dialog.tsx        | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/remix-ui/app/src/lib/remix-app/interface/index.ts b/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
index 4e5e6bd4e9..dcfcd7a1eb 100644
--- a/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
+++ b/libs/remix-ui/app/src/lib/remix-app/interface/index.ts
@@ -6,10 +6,10 @@ export interface AppModal {
     title: string
     // eslint-disable-next-line no-undef
     message: string | JSX.Element
-    okLabel?: string
-    okFn?: (value?:any) => void
-    cancelLabel?: string
-    cancelFn?: () => void,
+    okLabel: string
+    okFn: (value?:any) => void
+    cancelLabel: string
+    cancelFn: () => void,
     modalType?: ModalTypes,
     defaultValue?: string
     hideFn?: () => void
diff --git a/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx b/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx
index 41b2afb4d1..714255aa93 100644
--- a/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx
+++ b/libs/remix-ui/modal-dialog/src/lib/remix-ui-modal-dialog.tsx
@@ -96,7 +96,7 @@ export const ModalDialog = (props: ModalDialogProps) => {
           </div>
           <div className="modal-footer" data-id={`${props.id}ModalDialogModalFooter-react`}>
             {/* todo add autofocus ^^ */}
-            {<span
+            { props.okLabel && <span
               data-id={`${props.id}-modal-footer-ok-react`}
               className={'modal-ok btn btn-sm ' + (state.toggleBtn ? 'btn-dark' : 'btn-light')}
               onClick={() => {
@@ -107,7 +107,7 @@ export const ModalDialog = (props: ModalDialogProps) => {
               {props.okLabel ? props.okLabel : 'OK'}
             </span>
             }
-            {<span
+            { props.cancelLabel && <span
               data-id={`${props.id}-modal-footer-cancel-react`}
               className={'modal-cancel btn btn-sm ' + (state.toggleBtn ? 'btn-light' : 'btn-dark')}
               data-dismiss="modal"