Fix merge conflicts

marmelab · Oct 14, 2021 · 37b9154 · 37b9154
1 parent 92e52cb
commit 37b9154
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/ra-core/src/sideEffect/useNotify.spec.tsx b/packages/ra-core/src/sideEffect/useNotify.spec.tsx
@@ -18,16 +18,17 @@ const Notification = ({
                 type,
                 undoable,
                 autoHideDuration,
+                multiLine,
             });
         } else {
-            notify(message, type, {}, undoable, autoHideDuration);
+            notify(message, type, {}, undoable, autoHideDuration, multiLine);
         }
     }, [
         message,
         undoable,
         autoHideDuration,
         shortSignature,
-        shortSignature,
+        multiLine,
         type,
         notify,
     ]);

diff --git a/packages/ra-core/src/sideEffect/useNotify.ts b/packages/ra-core/src/sideEffect/useNotify.ts
@@ -32,7 +32,8 @@ const useNotify = () => {
                 | (NotificationOptions & { type: NotificationType }),
             messageArgs: any = {},
             undoable: boolean = false,
-            autoHideDuration?: number
+            autoHideDuration?: number,
+            multiLine?: boolean
         ) => {
             if (typeof type === 'string') {
                 warning(
@@ -44,6 +45,7 @@ const useNotify = () => {
                         messageArgs,
                         undoable,
                         autoHideDuration,
+                        multiLine,
                     })
                 );
             } else {