Skip to content

Commit

Permalink
feat: add most feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
RasenGUY committed Dec 7, 2023
1 parent fca22fd commit d0506b5
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
7 changes: 3 additions & 4 deletions src/common/modals/ClaimModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const ClaimModal = ({ hide, game, wallet, tokenDecimals
}
};
const wagerUSDValue = useTokenUSDValue(game.wager.wagerCurrency, Number(formatUnits(game.wager.wagerAmount, tokenDecimals)));
console.log(Number(formatUnits(game.wager.wagerAmount, tokenDecimals)))

return tokenDecimals && (
<WinnerDeclarationContainer tw="items-start p-[24px] gap-y-[16px] min-w-[340px]">
<div tw="flex justify-end w-full">
Expand Down Expand Up @@ -89,9 +89,8 @@ export const ClaimModal = ({ hide, game, wallet, tokenDecimals
size={11}
/>
</ClaimModalAvatarWrapper>
<div tw="flex flex-col gap-y-[11px]">
<div tw="flex flex-row items-center justify-start gap-y-[11px]">
<NormalText tw="text-blanc">{miniWalletAddress(wallet.address)}</NormalText>
<NormalText tw="text-shinishi">{"Change wallet"}</NormalText>
</div>
</div>
</div>
Expand Down Expand Up @@ -138,7 +137,7 @@ export const ClaimModal = ({ hide, game, wallet, tokenDecimals
</div>
</div>
<GradientDiv tw="h-[max-content] flex justify-between gap-[10px] dark:bg-[#414141] py-[8px] px-[5px]">
<NormalText tw="dark:text-shinishi">Net winnings</NormalText>
<NormalText tw="dark:text-blanc">Net winnings</NormalText>
{
!calculateFeesQuery.data ? 'calculating...' : <NormalText>{
parseFloat(String(Number(formatUnits(calculateFeesQuery.data[sendAmountIndex], tokenDecimals)) - Number(formatUnits(game.wager.wagerAmount, tokenDecimals)))).toFixed(2)
Expand Down
3 changes: 2 additions & 1 deletion src/common/modals/DiceWinnerModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,15 @@ const DiceWinnerModal = ({
<BadgeText>{wagerCurrency}</BadgeText>
</WagerTypeBadgeWrapper>


<div tw="flex gap-x-[25px] items-center">
<Link to="/wins" tw="min-w-[197px]">
<Button buttonType="primary" tw="flex items-center justify-center w-full">
Claim Win
<DownloadIcon color="#151515" tw="h-[16px] w-[16px] ms-[5px]"/>
</Button>
</Link>
<Link to={`/${gameType.toLocaleLowerCase()}/create`} tw="min-w-[197px]" state={{ gameType }}>
<Link to={`/create/${gameType.toLocaleLowerCase()}`} tw="min-w-[197px]" state={{ gameType }}>
<Button buttonType="secondary" tw="flex items-center w-full justify-center">
Start a new game
<RestartIcon tw="h-[16px] w-[16px] ms-[5px]"/>
Expand Down
4 changes: 2 additions & 2 deletions src/components/WegaGames/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@ export const ClaimableGames: React.FC<ClaimableGamesProps> = ({ gamesCount, user
setSortedGames(sortedGameIds.map(id => data.entities[id] as Wega) ?? []);
}
}, [data, gamesCount, isSuccess, userWalletAddress, defaultNetwork?.id]);
return !isLoading ? (<Section hdr="Tokens won" direction="col" tw="gap-2" { ...rest } >
return !isLoading ? (<Section hdr="Tokens won" direction="col" tw="gap-2 w-full" { ...rest } >
{
sortedGames && sortedGames.length > 0 ? sortedGames.map((game: Wega, i) => (
<ClaimBar networkId={networkId} count={i + 1} gameId={game.id} key={`claim-wins-bar-${i}`} className="dark:bg-[#1C1C1C] py-2 px-3 rounded-[5px]" />)) : <></>
<ClaimBar networkId={networkId} count={i + 1} gameId={game.id} key={`claim-wins-bar-${i}`} tw="dark:bg-[#1C1C1C] py-2 px-3 rounded-[5px] w-full" />)) : <></>
}
</Section>
) : <ComponentLoader tw="w-full flex justify-center" />
Expand Down
2 changes: 1 addition & 1 deletion src/containers/Navigation/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const Navigation = () => {

return (
<NavigationBar tw="font-primary">
<div tw="relative z-[950] container dark:text-blanc flex w-full py-[20px] px-[20px] justify-center items-end">
<div tw="relative z-[950] sm:container dark:text-blanc flex w-full py-[20px] px-[20px] justify-center items-end">
<NavigationLinksContainer tw="box-border flex w-full gap-x-[30px]">
<BrandContainer tw="mb-[4px]">
<div tw="mr-5">
Expand Down
2 changes: 1 addition & 1 deletion src/containers/WinsPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const WinsPage = () => {
<Helmet>
<title>Claim</title>
</Helmet>
<MainContainer tw="min-h-[100vh] w-[50vw]">
<MainContainer tw="min-h-[100vh] w-[100vw] md:w-[80vw] lg:w-[65vw] 2xl:w-[55vw]">
<Section
direction='col'
tw="w-full"
Expand Down

0 comments on commit d0506b5

Please sign in to comment.