Merged develop into feature-homepage-contacts-languages

src/pages/(exam)/ExamPage.tsx

@@ -424,7 +424,7 @@ export default function ExamPage({page}: Props) {
 							<AbandonPopup
 								isOpen={showAbandonPopup}
 								abandonPopupTitle="Leave Exercise"
-								abandonPopupDescription="Are you sure you want to leave the exercise? You will lose all your progress."
+								abandonPopupDescription="Are you sure you want to leave the exercise? Your progress will be saved and this exam can be resumed on the Dashboard."
 								abandonConfirmButtonText="Confirm"
 								onAbandon={() => {
 									reset();

src/pages/payment-record.tsx

@@ -1151,7 +1151,7 @@ export default function PaymentRecord() {
               >
                 Payments
               </Tab>
-              <Tab
+              {['admin','developer'].includes(user.type) && (<Tab
                 className={({ selected }) =>
                   clsx(
                     "w-full rounded-lg py-2.5 text-sm font-medium leading-5 text-mti-purple-light",
@@ -1165,6 +1165,7 @@ export default function PaymentRecord() {
               >
                 Paypal
               </Tab>
+              )}
             </Tab.List>
             <Tab.Panels>
               <Tab.Panel className="overflow-y-scroll max-h-[600px] rounded-xl scrollbar-hide gap-8 flex flex-col gap-8">