diff --git a/package.json b/package.json
index 4f812a247..5853f1833 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,8 @@
     "clsx": "^2.1.0",
     "dayjs": "1.11.10",
     "ethers": "5.7.2",
+    "final-form": "^4.20.10",
+    "formik": "^2.4.5",
     "framer-motion": "^10.16.16",
     "gsap": "^3.12.4",
     "next": "14.0.4",
diff --git a/src/components/BaseModal/index.tsx b/src/components/BaseModal/index.tsx
index 48579b19a..1ee31dc11 100644
--- a/src/components/BaseModal/index.tsx
+++ b/src/components/BaseModal/index.tsx
@@ -21,6 +21,7 @@ const BaseModal = (props: PropsWithChildren<IBaseModalProps>): React.ReactNode =
     isShow,
     onHide,
     title,
+    className,
     children,
     description,
     headerClassName,
@@ -34,7 +35,7 @@ const BaseModal = (props: PropsWithChildren<IBaseModalProps>): React.ReactNode =
         isCentered={true}
       >
         <ModalOverlay />
-        <ModalContent className={cs(s.modalContent, s[size])}>
+        <ModalContent className={cs(s.modalContent, s[size], className)}>
           <ModalHeader className={cs(s.modalHeader, headerClassName)}>
             <Flex justifyContent="space-between" alignItems="center">
               <button
diff --git a/src/components/ModalManage/ModalComponent.tsx b/src/components/ModalManage/ModalComponent.tsx
new file mode 100644
index 000000000..a8af2e2de
--- /dev/null
+++ b/src/components/ModalManage/ModalComponent.tsx
@@ -0,0 +1,117 @@
+import {
+  Box,
+  Flex,
+  Modal,
+  ModalBody,
+  ModalCloseButton,
+  ModalContent,
+  ModalHeader,
+  ModalOverlay,
+  ModalProps,
+} from '@chakra-ui/react';
+import cx from 'classnames';
+
+import styles from './styles.module.scss';
+import { ReactNode } from 'react';
+import { useDispatch } from 'react-redux';
+import { closeModal } from '@/stores/states/modal/reducer';
+
+export interface ModalComponentProps {
+  id: string;
+  render: Function;
+  title?: string | ReactNode;
+  className?: string;
+  actions?: object;
+  modalProps?: ModalProps;
+  onClose?: Function;
+  theme?: 'light' | 'dark';
+  contentPadding?: number;
+  hideCloseButton?: boolean;
+  size?: string;
+  disableBgClose?: boolean;
+}
+
+const ModalComponent = (props: ModalComponentProps) => {
+  const {
+    id,
+    render,
+    title,
+    className,
+    actions,
+    modalProps,
+    onClose,
+    contentPadding,
+    hideCloseButton = false,
+    disableBgClose = false,
+  } = props;
+
+  const dispatch = useDispatch();
+
+  const handleClose = () => {
+    dispatch(closeModal({ id }));
+    if (onClose) onClose(props);
+  };
+
+  return (
+    <Modal
+      isOpen
+      onClose={handleClose}
+      isCentered
+      closeOnOverlayClick={!disableBgClose}
+      {...modalProps}
+    >
+      <ModalOverlay />
+      <ModalContent
+        className={className}
+        minW={{ base: '90%', sm: '440px' }}
+        padding={contentPadding}
+        // height={'90%'}
+      >
+        <Flex
+          className="modal-header-wrap"
+          justifyContent={'space-between'}
+          alignItems="center"
+          mb={[3]}
+        >
+          {!!title && (
+            <Box flex={1}>
+              <ModalHeader
+                style={{
+                  fontFamily: 'var(--chakra-fonts-body)',
+                  fontSize: 24,
+                  textTransform:
+                    typeof title === 'string' ? 'capitalize' : 'none',
+                  fontWeight: 600,
+                }}
+              >
+                {title}
+              </ModalHeader>
+            </Box>
+          )}
+          <Box
+            display={hideCloseButton ? 'none' : 'block'}
+            style={
+              contentPadding
+                ? {
+                    paddingTop: 20,
+                    paddingRight: 20,
+                  }
+                : {}
+            }
+          >
+            <ModalCloseButton
+              size={'sm'}
+              className={cx(styles.modalButtonClose)}
+            />
+          </Box>
+        </Flex>
+
+        <ModalBody className={cx(styles.modalBody)}>
+          {render && render(actions)}
+        </ModalBody>
+      </ModalContent>
+    </Modal>
+  );
+};
+
+export default ModalComponent;
diff --git a/src/components/ModalManage/index.tsx b/src/components/ModalManage/index.tsx
new file mode 100644
index 000000000..0c897b011
--- /dev/null
+++ b/src/components/ModalManage/index.tsx
@@ -0,0 +1,45 @@
+'use client';
+
+import last from 'lodash/last';
+import cx from 'classnames';
+import ModalComponent, { ModalComponentProps } from './ModalComponent';
+import styles from './styles.module.scss';
+import { closeModal, openModal } from '@/stores/states/modal/reducer';
+import { useDispatch, useSelector } from 'react-redux';
+import { modalSelector } from '@/stores/states/modal/selector';
+
+const ModalManager = () => {
+  const modals: ModalComponentProps[] = useSelector(modalSelector)
+    .modals as unknown as ModalComponentProps[];
+  const dispatch = useDispatch();
+
+  if (!modals.length) return null;
+
+  const onBackdropClick = () => {
+    const id = last(modals)?.id || '';
+    dispatch(closeModal({ id }));
+  };
+
+  return (
+    <div className={cx(styles.wrapper, modals.length > 0 && styles.show)}>
+      <div className={styles.backdrop} onClick={onBackdropClick} />
+      {modals.map(modal => (
+        <ModalComponent
+          key={modal.id}
+          actions={{ openModal, closeModal }}
+          id={modal.id}
+          title={modal.title}
+          render={modal.render}
+          className={modal.className}
+          modalProps={modal.modalProps}
+          onClose={modal.onClose}
+          theme={modal.theme}
+          hideCloseButton={modal.hideCloseButton}
+          disableBgClose={modal.disableBgClose}
+        />
+      ))}
+    </div>
+  );
+};
+
+export default ModalManager;
diff --git a/src/components/ModalManage/styles.module.scss b/src/components/ModalManage/styles.module.scss
new file mode 100644
index 000000000..cf0f603e2
--- /dev/null
+++ b/src/components/ModalManage/styles.module.scss
@@ -0,0 +1,25 @@
+.noPadding {
+  padding: 0;
+}
+.modalContent {
+  border: none;
+}
+.modalBody {
+  -ms-overflow-style: none; /* IE and Edge */
+  scrollbar-width: none; /* Firefox */
+  &::-webkit-scrollbar {
+    display: none;
+  }
+}
+.modalDark {
+  background-color: var(--bs-gray-dark);
+  color: #fcfcfd;
+  button {
+    filter: invert(100%) sepia(0%) saturate(0%) hue-rotate(10deg)
+      brightness(104%) contrast(102%);
+  }
+}
+
+.modalButtonClose {
+  box-shadow: none !important;
+}
diff --git a/src/modules/Whitelist/index.tsx b/src/modules/Whitelist/index.tsx
index 1b29ca861..c9ba33693 100644
--- a/src/modules/Whitelist/index.tsx
+++ b/src/modules/Whitelist/index.tsx
@@ -15,7 +15,7 @@ const Whitelist = () => {
   React.useEffect(() => {
     const element = document.getElementById(CONTAINER_ID)
     if (height && element) {
-      element.style.paddingTop = `${height}px`
+      element.style.paddingTop = `${height + 32}px`
     }
   }, [height])
 
diff --git a/src/modules/Whitelist/steps/Step/index.tsx b/src/modules/Whitelist/steps/Step/index.tsx
index 5dec5ea12..4d47223ab 100644
--- a/src/modules/Whitelist/steps/Step/index.tsx
+++ b/src/modules/Whitelist/steps/Step/index.tsx
@@ -1,10 +1,11 @@
 import s from './styles.module.scss';
 import { Button, Flex, Text } from '@chakra-ui/react';
 import cx from 'clsx';
-import React, { useMemo } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import HistoryMessage from '@/modules/Whitelist/HistoryMessage';
 import Image from 'next/image';
 import { CDN_URL_ICONS } from '@/config';
+import AuthenStorage from '@/utils/storage/authen.storage';
 
 export enum MultiplierStep {
   authen,
@@ -24,7 +25,8 @@ export interface IItemCommunity {
   right: {
     title: string;
     desc: string
-  }
+  },
+  handleShowManualPopup?: () => void;
 }
 
 export default function ItemCommunity({
@@ -36,6 +38,15 @@ export default function ItemCommunity({
   content: IItemCommunity;
   isLoading?: boolean;
 }) {
+  const [showManualCheck, setShowManualCheck] = useState(false);
+  const token = AuthenStorage.getAuthenKey();
+
+  useEffect(() => {
+    if(!!token) {
+      setShowManualCheck(false);
+    }
+  }, [token]);
+
   const { isActive, image, step } = content;
 
   const isRunning = useMemo(() => {
@@ -58,17 +69,40 @@ export default function ItemCommunity({
             </Flex>
           </Flex>
           {!!content?.actionText && (
-            <Button
-              className={s.itemCommunity__btnCTA}
-              onClick={() => {
-                if (content?.actionHandle && isRunning) {
-                  content?.actionHandle()
-                }
-              }}
-              isLoading={isLoading}
-            >
-              {content?.actionText}
-            </Button>
+            <Flex direction={"column"}>
+              <Button
+                className={s.itemCommunity__btnCTA}
+                onClick={() => {
+                  if (content?.actionHandle && isRunning && !isLoading) {
+                    content?.actionHandle();
+
+                    if (step === MultiplierStep.authen) {
+                      setTimeout(() => {
+                        setShowManualCheck(true);
+                      }, 3000);
+                    }
+                  }
+                }}
+                isLoading={isLoading}
+              >
+                {content?.actionText}
+              </Button>
+              {
+                step === MultiplierStep.authen && showManualCheck && (
+                  <Text
+                    cursor={"pointer"}
+                    fontSize={"14px"}
+                    fontWeight={400}
+                    color={"#000000"}
+                    textDecoration={"underline"}
+                    onClick={content?.handleShowManualPopup}
+                    mt={1}
+                  >
+                    Missing from the Leaderboard?
+                  </Text>
+                )
+              }
+            </Flex>
           )}
           {step === MultiplierStep.signMessage && (
             <HistoryMessage />
diff --git a/src/modules/Whitelist/steps/Step/styles.module.scss b/src/modules/Whitelist/steps/Step/styles.module.scss
index a122593c8..984e94aed 100644
--- a/src/modules/Whitelist/steps/Step/styles.module.scss
+++ b/src/modules/Whitelist/steps/Step/styles.module.scss
@@ -57,3 +57,8 @@
     border-radius: 0 !important;
   }
 }
+
+.modalContent {
+  border-radius: 0px !important;
+  min-width: unset !important;
+}
diff --git a/src/modules/Whitelist/steps/VerifyTwModal/index.tsx b/src/modules/Whitelist/steps/VerifyTwModal/index.tsx
new file mode 100644
index 000000000..d15ba2916
--- /dev/null
+++ b/src/modules/Whitelist/steps/VerifyTwModal/index.tsx
@@ -0,0 +1,88 @@
+import { getError } from '@/utils/error';
+import { Button } from '@chakra-ui/react';
+import { FormikProps, useFormik } from 'formik';
+import React, { useState } from 'react';
+import s from './styles.module.scss';
+import { generateTokenWithTwPost } from '@/services/player-share';
+import { toast } from 'react-hot-toast';
+import { closeModal } from '@/stores/states/modal/reducer';
+import { useDispatch } from 'react-redux';
+import BaseModal from '@/components/BaseModal';
+
+interface FormValues {
+  postUrl: string;
+}
+
+export const ReferralModalID = 'ReferralModalID';
+
+const VerifyTwModal = ({isShow, onHide, secretCode, onSuccess}: any) => {
+  const dispatch = useDispatch();
+  const [isCreating, setIsCreating] = useState(false);
+
+  const onSubmit = async (values: FormValues) => {
+    try {
+      setIsCreating(true);
+      const result = await generateTokenWithTwPost(secretCode as string, formValues.postUrl);
+      onSuccess && onSuccess(result);
+      dispatch(closeModal({ id: ReferralModalID }));
+    } catch (error) {
+      toast.error('Can not verify the post.');
+    } finally {
+      setIsCreating(false);
+    }
+  };
+
+  const formik: FormikProps<FormValues> = useFormik<FormValues>({
+    initialValues: { postUrl: '' } as FormValues,
+    onSubmit,
+  });
+
+  const formValues = React.useMemo(() => {
+    return formik.values;
+  }, [formik.values]);
+
+  const onChangeText = (e: any) => {
+    formik.setValues((values: any) => ({
+      ...values,
+      postUrl: e.target.value,
+    }));
+  };
+
+  return (
+    <BaseModal
+      isShow={isShow}
+      onHide={onHide}
+      title={"Missing from the Leaderboard?"}
+      headerClassName={s.modalManualHeader}
+      className={s.modalContent}
+    >
+      <div className={s.container}>
+        <div className={s.content}>
+          <form className={s.form} onSubmit={formik.handleSubmit}>
+            <div className={s.desc}>Simply paste the URL of your tweet below to verify manually and we'll take care of the rest.</div>
+            <div className={s.inputContainer}>
+              <input
+                id="postUrl"
+                value={formValues.postUrl}
+                placeholder="Enter post URL"
+                className={s.input}
+                onChange={onChangeText}
+              />
+            </div>
+            <Button
+              type="submit"
+              isDisabled={isCreating || !formValues.postUrl}
+              isLoading={isCreating}
+              loadingText={'Verifying...'}
+              className={s.button}
+            >
+              Verify
+            </Button>
+          </form>
+        </div>
+      </div>
+    </BaseModal>
+  );
+};
+
+export default VerifyTwModal;
diff --git a/src/modules/Whitelist/steps/VerifyTwModal/styles.module.scss b/src/modules/Whitelist/steps/VerifyTwModal/styles.module.scss
new file mode 100644
index 000000000..21e3eb75d
--- /dev/null
+++ b/src/modules/Whitelist/steps/VerifyTwModal/styles.module.scss
@@ -0,0 +1,149 @@
+.container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  .content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+
+    width: 100%;
+  }
+
+  .title {
+    text-align: center;
+    font-size: 24px;
+    font-weight: 700;
+
+    margin-top: 8px;
+  }
+
+  .desc {
+    //text-align: center;
+    font-size: 16px;
+    margin-bottom: 24px;
+    font-weight: 400;
+    color: #1C1C1C;
+  }
+
+  .form {
+    width: 100%;
+  }
+
+  .inputContainer {
+    border-radius: 0px;
+    background: rgba(255, 255, 255, 0.10);
+    border: 1px solid #CECECE;
+    display: flex;
+    padding: 12px;
+    align-items: center;
+    gap: 12px;
+    width: 100%;
+    margin-bottom: 24px;
+  }
+  
+  .input {
+    height: 100%;
+    overflow: hidden;
+    color: #000000;
+    font-size: 16px;
+    font-style: normal;
+    font-weight: 400;
+    line-height: 140%;
+    background-color: transparent;
+    width: 100%;
+
+    &::placeholder {
+      color: #898989;
+      opacity: 1; /* Firefox */
+    }
+
+    &::-ms-input-placeholder { /* Edge 12-18 */
+      color: #898989;
+    }
+
+    &:focus {
+      outline: none;
+    }
+  }
+
+  .button {
+    height: 48px !important;
+    padding: 8px 60px !important;
+    border-radius: 0px !important;
+    background: #FA4E0E !important;
+    color: #fff !important;
+    width: 180px !important;
+  }
+  
+}
+
+.grid {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  // display: grid;
+  // grid-template-columns: 1fr 1fr 1fr;
+  gap: 20px;
+
+  // @include w-max(768px) {
+  //   grid-template-columns: 1fr 1fr;
+  // }
+
+  // @include w-max(468px) {
+  //   grid-template-columns: 1fr;
+  // }
+
+  .item {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 100%;
+    padding: 28px 0px;
+    background-color: #1C1C1C;
+    padding: 28px 32px;
+    background-color: #1C1C1C;
+    min-width: 380px;
+    width: fit-content;
+
+    @include w-max(768px) {
+      min-width: 320px;
+    }
+  }
+
+  .item_title {
+    text-align: center;
+    font-size: 16px;
+    margin-top: 8px;
+  }
+
+  .item_desc {
+    text-align: center;
+    font-size: 28px;
+    margin-top: 12px;
+    font-weight: 800;
+    line-height: 30px;
+  }
+
+  .btn {
+    height: 16px;
+    opacity: 0.8;
+    cursor: pointer;
+  }
+}
+
+.modalManualHeader {
+  padding-bottom: 0 !important;
+}
+
+.modalContent {
+  :global {
+    .chakra-modal__body {
+      padding-left: rem(24) !important;
+      padding-right: rem(24) !important;
+    }
+  }
+}
+
diff --git a/src/modules/Whitelist/steps/index.tsx b/src/modules/Whitelist/steps/index.tsx
index 6b355fc12..ed6120667 100644
--- a/src/modules/Whitelist/steps/index.tsx
+++ b/src/modules/Whitelist/steps/index.tsx
@@ -16,13 +16,14 @@ import { commonSelector } from '@/stores/states/common/selector';
 import { userSelector } from '@/stores/states/user/selector';
 import copy from 'copy-to-clipboard';
 import toast from 'react-hot-toast';
+import BaseModal from '@/components/BaseModal';
+import VerifyTwModal from '@/modules/Whitelist/steps/VerifyTwModal';
 
 interface IAuthenCode {
   public_code: string;
   secret_code: string;
 }
 
-
 const Steps = () => {
   const [authenCode, setAuthenCode] = useState<IAuthenCode>();
   const timer = useRef<any>();
@@ -32,6 +33,7 @@ const Steps = () => {
   const { toggle: isShowConnect, onToggle: onToggleConnect } = useToggle();
   const needReload = useAppSelector(commonSelector).needReload
   const user = useAppSelector(userSelector);
+  const [showManualCheck, setShowManualCheck] = useState(false);
 
   const handleShareTw = async () => {
     const res: any = await requestAuthenByShareCode();
@@ -85,21 +87,29 @@ const Steps = () => {
   const handleVerifyTwitter = async (): Promise<void> => {
     try {
       const result = await generateTokenWithTwPost(authenCode?.secret_code as string);
-      if (result) {
-        clearInterval(timer.current);
-        const twitterToken = AuthenStorage.getAuthenKey();
-        if (!twitterToken || twitterToken !== result?.token) {
-          AuthenStorage.setAuthenKey(result?.token);
-          setBearerToken(result?.token);
-        }
-        setSubmitting(false);
-        dispatch(requestReload());
-      }
+      onVerifyTwSuccess(result);
     } catch (err) {
       console.log('handleVerifyTwitter', err);
     }
   };
 
+  const onVerifyTwSuccess = (result: any) => {
+    if (result) {
+      clearInterval(timer.current);
+      const twitterToken = AuthenStorage.getAuthenKey();
+      if (!twitterToken || twitterToken !== result?.token) {
+        AuthenStorage.setAuthenKey(result?.token);
+        setBearerToken(result?.token);
+      }
+      setSubmitting(false);
+      dispatch(requestReload());
+      setShowManualCheck(false);
+    }
+  }
+
+  const handleShowManualPopup = () => {
+    setShowManualCheck(true);
+  }
 
   const DATA_COMMUNITY = useMemo<IItemCommunity[]>(() => {
     return (
@@ -116,7 +126,8 @@ const Steps = () => {
           right: {
             title: '+1 PTS',
             desc: 'per view'
-          }
+          },
+          handleShowManualPopup: handleShowManualPopup,
         },
         {
           title: 'Refer a friend to BVM',
@@ -160,11 +171,27 @@ const Steps = () => {
             key={index}
             index={index}
             content={item}
-            isLoading={index === 0 && submitting}
+            isLoading={item.step === MultiplierStep.authen && submitting}
           />
         );
       })}
       <ConnectModal isShow={isShowConnect} onHide={onToggleConnect}/>
+      <VerifyTwModal
+        isShow={showManualCheck}
+        onHide={() => {
+          setShowManualCheck(false);
+        }}
+        secretCode={authenCode?.secret_code}
+        onSuccess={onVerifyTwSuccess}
+      />
+      <VerifyTwModal
+        isShow={showManualCheck}
+        onHide={() => {
+          setShowManualCheck(false);
+        }}
+        secretCode={authenCode?.secret_code}
+        onSuccess={onVerifyTwSuccess}
+      />
     </Flex>
   );
 };
diff --git a/src/services/player-share.ts b/src/services/player-share.ts
index 5239cf525..9d933df74 100644
--- a/src/services/player-share.ts
+++ b/src/services/player-share.ts
@@ -18,14 +18,16 @@ export const generateToken = async (uuid: string | string[]): Promise<any> => {
   return;
 };
 
-export const generateTokenWithTwPost = async (uuid: string): Promise<any> => {
+export const generateTokenWithTwPost = async (uuid: string, link?: string): Promise<any> => {
   try {
     const res = await apiClient.post(`/bvm/generate-token-with-twitter-post`, {
       secret_code: uuid,
+      link: link
     });
     return Object(camelCaseKeys(res));
   } catch (error) {
-    console.log(error);
+    throw error;
+    // console.log(error);
   }
   return;
 };
diff --git a/src/utils/format.ts b/src/utils/format.ts
index 2cf74b3a3..a6b8b3532 100644
--- a/src/utils/format.ts
+++ b/src/utils/format.ts
@@ -160,3 +160,17 @@ export function formatString(
 
 export const zeroPad = (num: number, places: number) =>
   String(num).padStart(places, '0');
+
+export const formatMaxDecimals = (params: { value: any; maxDecimals?: number }) => {
+  const value = params.value;
+  const maxDecimals = params.maxDecimals !== undefined ? params.maxDecimals : 3;
+
+  if (
+    value &&
+    value.toString().includes('.') &&
+    value.toString().split('.')[1]?.length > maxDecimals
+  ) {
+    return undefined;
+  }
+  return value;
+};