Merge branch 'master' into add-token

Author: amitamrutiya

src/base/Pagination/Pagination.tsx

@@ -1,8 +1,13 @@
-import { Pagination as MuiPagination, PaginationProps as MuiPaginationProps } from '@mui/material';
+import {
+  Pagination as MuiPagination,
+  PaginationItem as MuiPaginationItem,
+  PaginationProps as MuiPaginationProps
+} from '@mui/material';
 import React from 'react';
 
 const Pagination = React.forwardRef<HTMLDivElement, MuiPaginationProps>((props, ref) => {
   return <MuiPagination {...props} ref={ref} />;
 });
 
+export { MuiPaginationItem as PaginationItem };
 export default Pagination;

src/base/Pagination/index.tsx

@@ -1,5 +1,5 @@
 import { PaginationProps } from '@mui/material';
-import Pagination from './Pagination';
+import Pagination, { PaginationItem } from './Pagination';
 
-export { Pagination };
+export { Pagination, PaginationItem };
 export type { PaginationProps };

src/custom/Prompt/index.tsx

@@ -1,3 +1,3 @@
-import PromptComponent from './promt-component';
-
+import PromptComponent, { PROMPT_VARIANTS } from './promt-component';
+export { PROMPT_VARIANTS, PromptComponent };
 export default PromptComponent;

src/custom/Prompt/promt-component.tsx

@@ -1,5 +1,5 @@
 import { forwardRef, useImperativeHandle, useRef, useState } from 'react';
-import { Typography } from '../../base';
+import { Checkbox, FormControlLabel, Typography } from '../../base';
 import { useTheme } from '../../theme';
 import { Modal, ModalBody, ModalButtonPrimary, ModalButtonSecondary, ModalFooter } from '../Modal';
 import { ActionComponent, Subtitle } from './style';
@@ -26,6 +26,8 @@ interface State {
   showInfoIcon?: string;
   variant?: PromptVariant;
   headerIcon?: React.ReactNode;
+  showCheckbox?: boolean;
+  isChecked?: boolean;
 }
 
 interface ShowParams {
@@ -34,11 +36,13 @@ interface ShowParams {
   primaryOption: string;
   variant: PromptVariant;
   showInfoIcon?: string;
+  showCheckbox?: boolean;
   headerIcon?: React.ReactNode;
 }
 
 export interface PromptRef {
   show: (params: ShowParams) => Promise<string>;
+  getCheckboxState: () => boolean;
 }
 
 const PromptComponent = forwardRef<PromptRef, PromptProps>(({ variant }, ref) => {
@@ -49,7 +53,9 @@ const PromptComponent = forwardRef<PromptRef, PromptProps>(({ variant }, ref) =>
     primaryOption: '',
     showInfoIcon: '',
     variant,
-    headerIcon: undefined
+    headerIcon: undefined,
+    isChecked: false,
+    showCheckbox: false
   });
 
   /* This ref is used to store the resolve and reject functions of the promise returned by the show method */
@@ -67,7 +73,8 @@ const PromptComponent = forwardRef<PromptRef, PromptProps>(({ variant }, ref) =>
       setState({
         ...params,
         isOpen: true,
-        showInfoIcon: params.showInfoIcon || ''
+        showInfoIcon: params.showInfoIcon || '',
+        showCheckbox: !!params.showCheckbox
       });
     });
   };
@@ -77,11 +84,20 @@ const PromptComponent = forwardRef<PromptRef, PromptProps>(({ variant }, ref) =>
     setState((prevState) => ({ ...prevState, isOpen: false }));
   };
 
+  const handleCheckboxChange = () => {
+    setState((prevState) => ({ ...prevState, isChecked: !prevState.isChecked }));
+  };
+
+  const getCheckboxState = () => {
+    return !!state.isChecked;
+  };
+
   useImperativeHandle(ref, () => ({
-    show
+    show,
+    getCheckboxState
   }));
 
-  const { isOpen, primaryOption, title, subtitle, showInfoIcon, headerIcon } = state;
+  const { isOpen, primaryOption, title, subtitle, showInfoIcon, headerIcon, showCheckbox } = state;
   const { resolve } = promiseInfoRef.current;
 
   return (
@@ -96,10 +112,28 @@ const PromptComponent = forwardRef<PromptRef, PromptProps>(({ variant }, ref) =>
       {subtitle && (
         <ModalBody>
           <Subtitle id="alert-dialog-description" variant="body1" component="div">
-            <Typography variant="body1" component="div">
+            <Typography
+              variant="body1"
+              component="div"
+              style={{
+                color: theme.palette.text.primary
+              }}
+            >
               {subtitle}
             </Typography>
           </Subtitle>
+          {showCheckbox && (
+            <FormControlLabel
+              control={
+                <Checkbox
+                  checked={getCheckboxState()}
+                  onChange={handleCheckboxChange}
+                  color="primary"
+                />
+              }
+              label={<span style={{ fontSize: '1rem' }}>Do not show again</span>}
+            />
+          )}
         </ModalBody>
       )}
       <ModalFooter variant="filled" helpText={showInfoIcon}>

src/custom/index.tsx

@@ -36,7 +36,7 @@ import { LearningCard } from './LearningCard';
 import { BasicMarkdown, RenderMarkdown } from './Markdown';
 import { ModalCard } from './ModalCard';
 import PopperListener, { IPopperListener } from './PopperListener';
-import PromptComponent from './Prompt';
+import { PROMPT_VARIANTS, PromptComponent } from './Prompt';
 import ResponsiveDataTable, {
   DataTableEllipsisMenu,
   ResponsiveDataTableProps
@@ -90,6 +90,7 @@ export {
   InfoTooltip,
   LearningCard,
   ModalCard,
+  PROMPT_VARIANTS,
   PopperListener,
   PromptComponent,
   ResponsiveDataTable,

src/theme/palette.ts

@@ -353,7 +353,7 @@ export const darkModePalette: PaletteOptions = {
       tertiary: Colors.blue[10]
     },
     success: {
-      default: Colors.green[40],
+      default: Colors.KEPPEL,
       hover: Colors.green[50],
       pressed: Colors.green[60],
       secondary: Colors.green[20],