toast uuid issue fix

oasisprotocol · Sep 9, 2021 · accdcac · accdcac
1 parent 9018ff0
commit accdcac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/src/popup/component/Toast/ToastContainer.js b/src/popup/component/Toast/ToastContainer.js
@@ -15,12 +15,10 @@ class ToastContainer extends Component {
     }
 
     pushToast = (toastProps) => {
-        const { type, text, duration, isShowMask = false } = toastProps;
+        const { text, duration, isShowMask = false } = toastProps;
         let lastDuration = duration || default_duration
         this.setState({
             currentToast: {
-                id: getUuid(),
-                type,
                 text,
                 duration: lastDuration,
                 isShowMask
@@ -37,7 +35,7 @@ class ToastContainer extends Component {
     }
 
     render() {
-        const { toastList, isShowMask, currentToast } = this.state;
+        const { isShowMask, currentToast } = this.state;
         return (
             <div className="toast-container">
                 {isShowMask && <div className="mask" />}
@@ -49,11 +47,4 @@ class ToastContainer extends Component {
     }
 }
 
-let toastCount = 0;
-
-
-const getUuid = () => {
-    return 'toast-container' + new Date().getTime() + '-' + toastCount++;
-};
-
 export default ToastContainer;
diff --git a/src/popup/component/Toast/ToastItem.js b/src/popup/component/Toast/ToastItem.js
@@ -3,10 +3,10 @@ import "./ToastItem.scss";
 
 class ToastItem extends Component {
     componentDidMount() {
-        const { id, duration, onClose, isShowMask } = this.props;
+        const { duration, onClose} = this.props;
         this.timer = setTimeout(() => {
             if (onClose) {
-                onClose(id, isShowMask);
+                onClose();
             }
         }, duration)
     }