Skip to content

Commit fde4463

Browse files
Merge branch 'dev' into fix/console-errors
2 parents d4d5853 + 45bb402 commit fde4463

File tree

15 files changed

+30
-37
lines changed

15 files changed

+30
-37
lines changed

.github/workflows/pre-release.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/components/sections/bounties/Navigation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export default function BountiesNavigation(): ReactElement {
8484
"!text-blue-600": router.query.slug === item.link.split("/")[2],
8585
})}
8686
>
87-
<span className="absolute inline-block -left-6 nav-icon">{router.query.slug === item.link.split("/")[2] && <ChevronRightIcon />}</span>
87+
<span className="absolute !inline-block -left-6 nav-icon">{router.query.slug === item.link.split("/")[2] && <ChevronRightIcon />}</span>
8888
<span className="nav-label">{item.label}</span>
8989
</Link>
9090
</li>

src/components/sections/courses/_partials/LanguageSwitcher.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,13 @@ export default function LanguageSelector(): ReactElement {
4141
course.translations
4242
.filter((locale) => locale)
4343
.forEach((translation) => {
44+
const code = translation.locale || "en";
4445
setLocales((prev) => [
4546
...prev,
4647
{
4748
id: translation.id,
48-
code: translation.locale,
49-
name: languages[translation.locale],
49+
code,
50+
name: languages[code],
5051
},
5152
]);
5253
});

src/components/sections/profile/Header.tsx

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ export default function ProfileHeader() {
5757

5858
const username = useMemo(() => user?.displayName, [user?.displayName]);
5959

60+
const isCurrentUser = useMemo(() => username?.toLowerCase() === authUser?.displayName?.toLowerCase(), [authUser, username]);
61+
62+
const showKycVerificationButton = useMemo(() => {
63+
return isCurrentUser && !isKycVerified;
64+
}, [isCurrentUser, isKycVerified]);
65+
6066
const dispatch = useDispatch();
6167
const triggerKYCVerification = () => {
6268
dispatch(openVerificationModal({}));
@@ -117,7 +123,7 @@ export default function ProfileHeader() {
117123
{t("profile.header.connect-discord")}
118124
</Button>
119125
)}
120-
{!isKycVerified && (
126+
{!isKycVerified && showKycVerificationButton && (
121127
<Button variant="outline-primary" className="flex mx-auto text-base" onClick={triggerKYCVerification}>
122128
{t("profile.header.sumsub.verify")}
123129
</Button>

src/components/sections/profile/Navigation.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export default function ProfileNagivation(): ReactElement {
107107
<li key={`profile-menu-subItem-${k}`} className="text-sm relative text-primary">
108108
<Link href={item.link} className={`relative text-gray-500 ${isCurrentMenuItem(item) && "text-primary"}`}>
109109
{isCurrentMenuItem(item) && (
110-
<span className="inline-block absolute -left-6 nav-icon">
110+
<span className="!inline-block absolute -left-6 nav-icon">
111111
<ChevronRightIcon />
112112
</span>
113113
)}

src/components/ui/SideNavigation/_partials/Content.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export function NavItem({ item, isActive = false, expanded = false }: NavItemPro
3434
const { t } = useTranslation();
3535
return (
3636
<span>
37-
<span style={{ display: isActive ? "inline-block" : "none" }} className="absolute top-0 inline-block -left-6 nav-icon">
37+
<span style={{ display: isActive ? "!inline-block" : "none" }} className="absolute top-0 inline-block -left-6 nav-icon">
3838
<ChevronRightIcon className={`transition-transform duration-200 ${item.subitems && item.subitems.length && isActive && expanded ? "transform rotate-90" : ""}`} />
3939
</span>
4040
<span className="nav-label">{t(item.label)}</span>

src/icons/tokens/AE.svg

Lines changed: 2 additions & 2 deletions
Loading

src/icons/tokens/DAC.svg

Lines changed: 2 additions & 1 deletion
Loading

src/icons/tokens/ETH.svg

Lines changed: 2 additions & 1 deletion
Loading

src/icons/tokens/ICP.svg

Lines changed: 2 additions & 1 deletion
Loading

0 commit comments

Comments
 (0)