From 1370b8baf258ea8f10f833df6bd9e025a58ba535 Mon Sep 17 00:00:00 2001 From: Karolina Kosiorowska Date: Tue, 31 Oct 2023 14:32:42 +0100 Subject: [PATCH 1/4] Update arbitrum quest content --- src/assets/questline-data.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/questline-data.json b/src/assets/questline-data.json index e59d61ff3..41ef226fe 100644 --- a/src/assets/questline-data.json +++ b/src/assets/questline-data.json @@ -29,7 +29,7 @@ "quests": [ { "name": "Execute individual transactions on Arbitrum", - "description": "The more transactions you execute on Arbitrum compared to other members of this realm in a week, the more of the weekly XP drop you will get." + "description": "The more contract interactions you execute on Arbitrum compared to other members of this realm in a week, the more of the weekly XP drop you will get." } ] }, From 0d6e1f7ea21a529ced1e30dbdc3e01943e8ff870 Mon Sep 17 00:00:00 2001 From: Karolina Kosiorowska Date: Tue, 31 Oct 2023 14:42:48 +0100 Subject: [PATCH 2/4] Fix for leaderboard colors --- .../Island/RealmDetails/LeaderboardList/LeaderboardItem.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ui/Island/RealmDetails/LeaderboardList/LeaderboardItem.tsx b/src/ui/Island/RealmDetails/LeaderboardList/LeaderboardItem.tsx index 84af5c072..4b5f63761 100644 --- a/src/ui/Island/RealmDetails/LeaderboardList/LeaderboardItem.tsx +++ b/src/ui/Island/RealmDetails/LeaderboardList/LeaderboardItem.tsx @@ -112,12 +112,12 @@ export default function LeaderboardItem({ } .leaderboard_item[data-rank="2"] { - color: #d99e45; + color: #d0d6d6; border: 1px solid currentColor; } .leaderboard_item[data-rank="3"] { - color: #d0d6d6; + color: #d99e45; border: 1px solid currentColor; margin-bottom: 14px; } From 2228903b5db8a7358da8c37b97b8834500b5d4e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Paczy=C5=84ski?= Date: Tue, 31 Oct 2023 14:59:31 +0100 Subject: [PATCH 3/4] Add population to onboarding page --- src/ui/Footer/FooterLinks.tsx | 44 ++++++++++++++++++++++ src/ui/Footer/FooterWrapper.tsx | 27 ++++++++++++++ src/ui/Footer/OnboardingFooter.tsx | 13 +++++++ src/ui/Footer/PopulationCount.tsx | 46 +++++++++++++++++++++++ src/ui/Footer/index.tsx | 59 +++--------------------------- src/ui/Onboarding/index.tsx | 2 + 6 files changed, 137 insertions(+), 54 deletions(-) create mode 100644 src/ui/Footer/FooterLinks.tsx create mode 100644 src/ui/Footer/FooterWrapper.tsx create mode 100644 src/ui/Footer/OnboardingFooter.tsx create mode 100644 src/ui/Footer/PopulationCount.tsx diff --git a/src/ui/Footer/FooterLinks.tsx b/src/ui/Footer/FooterLinks.tsx new file mode 100644 index 000000000..b4ed42374 --- /dev/null +++ b/src/ui/Footer/FooterLinks.tsx @@ -0,0 +1,44 @@ +import React from "react" +import IconLink from "shared/components/IconLink" +import { LINKS } from "shared/constants" +import discordIcon from "shared/assets/icons/discord.svg" +import twitterIcon from "shared/assets/icons/twitter.svg" +import githubIcon from "shared/assets/icons/github.svg" + +const ICON_SIZE = "18px" + +export default function FooterLinks() { + return ( + <> +
+ + + +
+ + Rulebook + + + + ) +} diff --git a/src/ui/Footer/FooterWrapper.tsx b/src/ui/Footer/FooterWrapper.tsx new file mode 100644 index 000000000..bbf4ef5f4 --- /dev/null +++ b/src/ui/Footer/FooterWrapper.tsx @@ -0,0 +1,27 @@ +import React, { ReactNode } from "react" + +export default function FooterWrapper({ children }: { children: ReactNode }) { + return ( + <> +
{children}
+ + + ) +} diff --git a/src/ui/Footer/OnboardingFooter.tsx b/src/ui/Footer/OnboardingFooter.tsx new file mode 100644 index 000000000..086260b35 --- /dev/null +++ b/src/ui/Footer/OnboardingFooter.tsx @@ -0,0 +1,13 @@ +import React from "react" +import FooterWrapper from "./FooterWrapper" +import FooterLinks from "./FooterLinks" +import PopulationCount from "./PopulationCount" + +export default function OnboardingFooter() { + return ( + + + + + ) +} diff --git a/src/ui/Footer/PopulationCount.tsx b/src/ui/Footer/PopulationCount.tsx new file mode 100644 index 000000000..26728a2ce --- /dev/null +++ b/src/ui/Footer/PopulationCount.tsx @@ -0,0 +1,46 @@ +import React from "react" +import Icon from "shared/components/Icon" +import { separateThousandsByComma } from "shared/utils" +import populationIcon from "shared/assets/icons/people.svg" +import { selectTotalPopulation, useDappSelector } from "redux-state" + +export default function PopulationCount() { + const population = useDappSelector(selectTotalPopulation) + + if (!population) return null + + return ( + <> +
+
+ +

Population

+
+

+ {separateThousandsByComma(population)} +

+
+ + + ) +} diff --git a/src/ui/Footer/index.tsx b/src/ui/Footer/index.tsx index 2339b5a44..b2f520d66 100644 --- a/src/ui/Footer/index.tsx +++ b/src/ui/Footer/index.tsx @@ -1,65 +1,16 @@ import React from "react" -import IconLink from "shared/components/IconLink" -import discordIcon from "shared/assets/icons/discord.svg" -import twitterIcon from "shared/assets/icons/twitter.svg" -import githubIcon from "shared/assets/icons/github.svg" // import ClaimProgressBar from "./ClaimProgressBar" // not used at the moment -import { LINKS } from "shared/constants" import Version from "shared/components/Version" import RealmsBar from "./RealmBar" - -const ICON_SIZE = "18px" +import FooterLinks from "./FooterLinks" +import FooterWrapper from "./FooterWrapper" export default function Footer() { return ( -
-
- - - -
- - Rulebook - + + - -
+ ) } diff --git a/src/ui/Onboarding/index.tsx b/src/ui/Onboarding/index.tsx index bbe882dcc..8c855e71b 100644 --- a/src/ui/Onboarding/index.tsx +++ b/src/ui/Onboarding/index.tsx @@ -9,6 +9,7 @@ import FullPageLoader from "shared/components/FullPageLoader" import Nav from "ui/Nav" import portalBackground from "shared/assets/portal-background.mp4" import Version from "shared/components/Version" +import OnboardingFooter from "ui/Footer/OnboardingFooter" import ConnectWallet from "./ConnectWallet" import JoinWaitlist from "./JoinWaitlist" import EnterPortal from "./EnterPortal" @@ -65,6 +66,7 @@ export default function Onboarding() {