Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

patch PR 7 of week ending 8/27/24 #2200

Merged
merged 3 commits into from
Aug 24, 2024
Merged

patch PR 7 of week ending 8/27/24 #2200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bc72a48
fix(deps): update dependency @vercel/node to v3.2.9
renovate[bot] Aug 23, 2024
ba76d76
fix(deps): update dependency eslint to v9.9.1
renovate[bot] Aug 24, 2024
834d85a
enhancement: add rewards at the top for mobile in contest page (#2199)
nakedfool Aug 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions packages/react-app-revamp/components/_pages/Contest/components/RewardsInfo/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,7 @@ const ContestRewardsInfo: FC<ContestRewardsInfoProps> = ({ rewardsModuleAddress,
{formatBalance(currentUnpaidToken.tokenBalance)} $
<span className="uppercase mr-1 truncate inline-block overflow-hidden">{currentUnpaidSymbol}</span>
</div>

{!isMobile ? (
<>
to {payees.length} {payees.length > 1 ? "winners" : "winner"}
</>
) : null}
to {payees.length} {payees.length > 1 ? "winners" : "winner"}
</span>
</div>
) : currentPaidToken ? (
Expand Down
15 changes: 10 additions & 5 deletions packages/react-app-revamp/layouts/LayoutViewContest/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,17 +202,22 @@ const LayoutViewContest = ({ children }: { children: React.ReactNode }) => {
)}
<div className="animate-reveal pt-3 md:pt-0">
<div className="flex flex-col mt-6 md:mt-10 gap-4">
<ContestName contestName={contestName} address={address} chainName={chainName} />
<div className="flex flex-col gap-2">
{isMobile && rewardsModuleAddress && rewardsAbi ? (
<div className="w-2/3">
<ContestRewardsInfo rewardsModuleAddress={rewardsModuleAddress} rewardsAbi={rewardsAbi} />
</div>
) : null}
<ContestName contestName={contestName} address={address} chainName={chainName} />
</div>

<div
className={`flex flex-row ${rewardsModuleAddress && rewardsAbi ? "justify-between" : "gap-3"} md:justify-normal md:gap-4 items-center`}
>
<div className={`flex flex-row gap-3 md:gap-4 items-center`}>
<UserProfileDisplay
ethereumAddress={contestAuthorEthereumAddress}
shortenOnFallback
textualVersion={isMobile}
/>
{rewardsModuleAddress && rewardsAbi ? (
{!isMobile && rewardsModuleAddress && rewardsAbi ? (
<ContestRewardsInfo rewardsModuleAddress={rewardsModuleAddress} rewardsAbi={rewardsAbi} />
) : null}
{isMobile ? (
Expand Down
4 changes: 2 additions & 2 deletions packages/react-app-revamp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@
"@types/underscore": "1.11.15",
"@types/uuid": "10.0.0",
"@typescript-eslint/parser": "7.18.0",
"@vercel/node": "3.2.8",
"@vercel/node": "3.2.9",
"@wagmi/connectors": "5.1.7",
"@wagmi/core": "2.13.4",
"autoprefixer": "10.4.20",
"cheerio": "1.0.0",
"class-variance-authority": "0.7.0",
"compare-versions": "6.1.1",
"date-fns": "3.6.0",
"eslint": "9.9.0",
"eslint": "9.9.1",
"eslint-config-next": "14.2.6",
"ethers": "5.7.2",
"frog": "0.11.4",
Expand Down
46 changes: 23 additions & 23 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3403,10 +3403,10 @@
resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.0.tgz#b0ffd0312b4a3fd2d6f77237e7248a5ad3a680ae"
integrity sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==

"@eslint/config-array@^0.17.1":
version "0.17.1"
resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.17.1.tgz#d9b8b8b6b946f47388f32bedfd3adf29ca8f8910"
integrity sha512-BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA==
"@eslint/config-array@^0.18.0":
version "0.18.0"
resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.18.0.tgz#37d8fe656e0d5e3dbaea7758ea56540867fd074d"
integrity sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==
dependencies:
"@eslint/object-schema" "^2.1.4"
debug "^4.3.1"
Expand All @@ -3427,10 +3427,10 @@
minimatch "^3.1.2"
strip-json-comments "^3.1.1"

"@eslint/[email protected].0":
version "9.9.0"
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.9.0.tgz#d8437adda50b3ed4401964517b64b4f59b0e2638"
integrity sha512-hhetes6ZHP3BlXLxmd8K2SNgkhNSi+UcecbnwWKwpP7kyi/uC75DJ1lOOBO3xrC4jyojtGE3YxKZPHfk4yrgug==
"@eslint/[email protected].1":
version "9.9.1"
resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.9.1.tgz#4a97e85e982099d6c7ee8410aacb55adaa576f06"
integrity sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==

"@eslint/object-schema@^2.1.4":
version "2.1.4"
Expand Down Expand Up @@ -8287,10 +8287,10 @@
resolved "https://registry.yarnpkg.com/@vanilla-extract/sprinkles/-/sprinkles-1.6.1.tgz#2c8a832757a0d8104dc6bd5d961db2c70d1dbdcb"
integrity sha512-N/RGKwGAAidBupZ436RpuweRQHEFGU+mvAqBo8PRMAjJEmHoPDttV8RObaMLrJHWLqvX+XUMinHUnD0hFRQISw==

"@vercel/[email protected].6":
version "8.3.6"
resolved "https://registry.yarnpkg.com/@vercel/build-utils/-/build-utils-8.3.6.tgz#f85ebb753433500f177c04c0f4c784108a4afda8"
integrity sha512-EPwr8tXu41aoXg9QBiF98clu5AHbKtwbp3SeX/W6c8L0fhLwiT+H/s3WDuOL/UMz0TT3B8JAdY4PZioWNEAf6g==
"@vercel/[email protected].7":
version "8.3.7"
resolved "https://registry.yarnpkg.com/@vercel/build-utils/-/build-utils-8.3.7.tgz#4859c1d0c605b3392dd5ba82a49ebae755f2ce4c"
integrity sha512-xscYxdzQ2IAMNbXlldbTZv1+YtD/Yq/EXgruqFBTZ/ofh+GIMCig1YrJh2CS6R2B2ja77szUiel//T8lRrDN1g==

"@vercel/[email protected]":
version "2.0.2"
Expand All @@ -8315,16 +8315,16 @@
node-gyp-build "^4.2.2"
resolve-from "^5.0.0"

"@vercel/[email protected].8":
version "3.2.8"
resolved "https://registry.yarnpkg.com/@vercel/node/-/node-3.2.8.tgz#03ea22bea999c21ecb24cf40587ad26a987b8b12"
integrity sha512-mINg3ab1FHIqupZlLVpmCvyqGtkafnyNesgs7ZoCbNxqbb4ZrHtPj1kHv9cvTrFlDkFapkV/Ez8nbSsHeAxtOw==
"@vercel/[email protected].9":
version "3.2.9"
resolved "https://registry.yarnpkg.com/@vercel/node/-/node-3.2.9.tgz#bd088cdd4de90d8a2164aed46c577a9344976a46"
integrity sha512-q3HLv+yIU3sOFS82GltdjFiBXt8cRcPmDKD3lI0z4cDLb2FSJeGE4yYqK7FxZmO8E5Hqzrm2uUoy5Mw3XERTmw==
dependencies:
"@edge-runtime/node-utils" "2.3.0"
"@edge-runtime/primitives" "4.1.0"
"@edge-runtime/vm" "3.2.0"
"@types/node" "16.18.11"
"@vercel/build-utils" "8.3.6"
"@vercel/build-utils" "8.3.7"
"@vercel/error-utils" "2.0.2"
"@vercel/nft" "0.27.3"
"@vercel/static-config" "3.0.0"
Expand Down Expand Up @@ -11367,16 +11367,16 @@ eslint-visitor-keys@^4.0.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb"
integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==

[email protected].0:
version "9.9.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.9.0.tgz#8d214e69ae4debeca7ae97daebbefe462072d975"
integrity sha512-JfiKJrbx0506OEerjK2Y1QlldtBxkAlLxT5OEcRF8uaQ86noDe2k31Vw9rnSWv+MXZHj7OOUV/dA0AhdLFcyvA==
[email protected].1:
version "9.9.1"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.9.1.tgz#147ac9305d56696fb84cf5bdecafd6517ddc77ec"
integrity sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg==
dependencies:
"@eslint-community/eslint-utils" "^4.2.0"
"@eslint-community/regexpp" "^4.11.0"
"@eslint/config-array" "^0.17.1"
"@eslint/config-array" "^0.18.0"
"@eslint/eslintrc" "^3.1.0"
"@eslint/js" "9.9.0"
"@eslint/js" "9.9.1"
"@humanwhocodes/module-importer" "^1.0.1"
"@humanwhocodes/retry" "^0.3.0"
"@nodelib/fs.walk" "^1.2.8"
Expand Down