devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged develop into feature-homepage-contacts-languages

Browse Source
This commit is contained in:
Tiago Ribeiro
2024-02-29 23:53:42 +00:00
parent 424b72efaf 02d2d07f6c
commit 2feb9223c1
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/(exam)/ExamPage.tsx
View File

@@ -424,7 +424,7 @@ export default function ExamPage({page}: Props) {
<AbandonPopup <AbandonPopup
isOpen={showAbandonPopup} isOpen={showAbandonPopup}
abandonPopupTitle="Leave Exercise" 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" abandonConfirmButtonText="Confirm"
onAbandon={() => { onAbandon={() => {
reset(); reset();

3
src/pages/payment-record.tsx
View File

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