diff --git a/frontend/apps/vara-man/src/components/ui/modal/modal2.tsx b/frontend/apps/vara-man/src/components/ui/modal/modal2.tsx index eae2d31dd..6e93e1c71 100644 --- a/frontend/apps/vara-man/src/components/ui/modal/modal2.tsx +++ b/frontend/apps/vara-man/src/components/ui/modal/modal2.tsx @@ -1,6 +1,6 @@ +import { cn } from '@/app/utils'; import * as Dialog from '@radix-ui/react-dialog'; import { ReactNode } from 'react'; -// import { CrossIcon } from '@/assets/images'; export function Modal({ open, @@ -18,11 +18,15 @@ export function Modal({ ); } -function ModalContent({ children }: { children: ReactNode }) { +function ModalContent({ children, classNameContent }: { children: ReactNode; classNameContent?: string }) { return ( - + {children} diff --git a/frontend/apps/vara-man/src/feature/single-game/components/modals/game-over.tsx b/frontend/apps/vara-man/src/feature/single-game/components/modals/game-over.tsx index c2ba1d8b5..959a9a1a2 100644 --- a/frontend/apps/vara-man/src/feature/single-game/components/modals/game-over.tsx +++ b/frontend/apps/vara-man/src/feature/single-game/components/modals/game-over.tsx @@ -33,7 +33,7 @@ export const GameOverModal = ({ restartGame }: any) => { return (
- +
diff --git a/frontend/apps/vara-man/src/feature/tournament-game/components/modals/confirm-cancel.tsx b/frontend/apps/vara-man/src/feature/tournament-game/components/modals/confirm-cancel.tsx index c25f7e4c6..20a1c10ff 100644 --- a/frontend/apps/vara-man/src/feature/tournament-game/components/modals/confirm-cancel.tsx +++ b/frontend/apps/vara-man/src/feature/tournament-game/components/modals/confirm-cancel.tsx @@ -1,25 +1,26 @@ - - +import { Modal } from '@/components/ui/modal/modal2'; import { Button } from '@gear-js/vara-ui'; -import { Modal } from '@/components'; + type Props = { - setIsOpenCancelModal: (_: boolean) => void - onCancelGame: () => void -} + setIsOpenCancelModal: (_: boolean) => void; + onCancelGame: () => void; +}; export const ConfirmCancelModal = ({ setIsOpenCancelModal, onCancelGame }: Props) => { - - return ( - null}> -

Sure you want to end the game?

-
-

- This action cannot be undone. The game will be concluded, and all players will exit the gaming room. Any entry fees will be refunded to all players. -

-
-
-
-
- ) -} + return ( + + +

Sure you want to end the game?

+
+

+ This action cannot be undone. The game will be concluded, and all players will exit the gaming room. Any + entry fees will be refunded to all players. +

+
+
+
+
+
+ ); +}; diff --git a/frontend/apps/vara-man/src/feature/tournament-game/components/modals/game-canceled.tsx b/frontend/apps/vara-man/src/feature/tournament-game/components/modals/game-canceled.tsx index 4aa737731..bb9555f8b 100644 --- a/frontend/apps/vara-man/src/feature/tournament-game/components/modals/game-canceled.tsx +++ b/frontend/apps/vara-man/src/feature/tournament-game/components/modals/game-canceled.tsx @@ -1,22 +1,22 @@ - - import { useGame } from '@/app/context/ctx-game'; -import { Modal } from '@/components'; +import { Modal } from '@/components/ui/modal/modal2'; import { Button } from '@gear-js/vara-ui'; export const GameCanceledModal = () => { - const { setPreviousGame } = useGame() - return ( - null}> -

The game has been canceled by the administrator

-
-

- Game administrator Samovit has ended the game. All spent VARA tokens for the entry fee will be refunded. -

-
-
-
-
- ) -} + const { setPreviousGame } = useGame(); + return ( + + +

The game has been canceled by the administrator

+
+

+ Game administrator Samovit has ended the game. All spent VARA tokens for the entry fee will be refunded. +

+
+
+
+
+
+ ); +}; diff --git a/frontend/apps/vara-man/src/feature/tournament-game/components/modals/game-find.tsx b/frontend/apps/vara-man/src/feature/tournament-game/components/modals/game-find.tsx index 055fed6fb..c1fc4288b 100644 --- a/frontend/apps/vara-man/src/feature/tournament-game/components/modals/game-find.tsx +++ b/frontend/apps/vara-man/src/feature/tournament-game/components/modals/game-find.tsx @@ -1,6 +1,7 @@ import { useApp } from '@/app/context/ctx-app'; import { useGameMessage } from '@/app/hooks/use-game'; -import { Modal } from '@/components'; +import { Modal } from '@/components/ui/modal/modal2'; + import { SpriteIcon } from '@/components/ui/sprite-icon'; import { useEzTransactions } from '@dapps-frontend/ez-transactions'; import { useCheckBalance } from '@dapps-frontend/hooks'; @@ -76,52 +77,54 @@ export const GameFindModal = ({ findGame, setIsOpenFindModal }: GameFindModalPro }); return ( - null}> -

The game has been found

-
-

- To proceed, review the parameters of the gaming session and click the “Join” button. If applicable, you will - need to pay the entry fee and required amount of gas immediately after clicking the “Join” button. After the - end of the game, any unused gas will be refunded. -

+ + +

The game has been found

+
+

+ To proceed, review the parameters of the gaming session and click the “Join” button. If applicable, you will + need to pay the entry fee and required amount of gas immediately after clicking the “Join” button. After the + end of the game, any unused gas will be refunded. +

-
-
-
-

Entry fee

-
- - {bid} VARA +
+
+
+

Entry fee

+
+ + {bid} VARA +
-
-
-

Players already joined the game

-
- - {findGame.participants} - /10 +
+

Players already joined the game

+
+ + {findGame.participants} + /10 +
-
-
- + + -
-
-
-
+
+
+ +
+ ); }; diff --git a/frontend/apps/vara-man/src/feature/tournament-game/components/modals/game-play-again.tsx b/frontend/apps/vara-man/src/feature/tournament-game/components/modals/game-play-again.tsx index 061ddb5c9..be4390640 100644 --- a/frontend/apps/vara-man/src/feature/tournament-game/components/modals/game-play-again.tsx +++ b/frontend/apps/vara-man/src/feature/tournament-game/components/modals/game-play-again.tsx @@ -12,7 +12,7 @@ export const GamePlayAgainModal = ({ setIsOpenPlayAgain, restartGame }: GamePlay const setCoins = useSetAtom(COINS); return ( - +

Game over