Merge remote-tracking branch 'refs/remotes/origin/koni/dev/issue-162'…

… into mythical-dev
Koniverse · Dec 26, 2024 · 777b5dd · 777b5dd
2 parents c0c11fa + e440ca0
commit 777b5dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/packages/extension-koni-ui/src/Popup/Home/LeaderboardTemp/TermAndConditionModal.tsx b/packages/extension-koni-ui/src/Popup/Home/LeaderboardTemp/TermAndConditionModal.tsx
@@ -50,7 +50,7 @@ function Component (props: Props): React.ReactElement<Props> {
       id={modalId}
       onCancel={onCancel}
     >
-      <div className={'__modal-title'}>{t(`${metadata?.title || ''}`)}</div>
+      <div className={'__modal-title'}>{t(`${metadata?.title || 'modal'}`)}</div>
 
       <div className={'__modal-description'}>
         <ContentGenerator
@@ -112,6 +112,7 @@ export const TermAndConditionModal = styled(Component)<Props>(({ theme: { extend
       maxWidth: 370,
       maxHeight: 484,
       paddingTop: 24,
+      width: '100%',
       height: 'auto',
       backgroundImage: 'url(/images/mythical/leaderboard-terms-conditions-bg.png)',
       backgroundSize: '100% 100%',

diff --git a/packages/extension-koni-ui/src/Popup/Home/LeaderboardTemp/index.tsx b/packages/extension-koni-ui/src/Popup/Home/LeaderboardTemp/index.tsx
@@ -13,7 +13,8 @@ import { TopThreeArea } from '@subwallet/extension-koni-ui/Popup/Home/Leaderboar
 import { ThemeProps } from '@subwallet/extension-koni-ui/types';
 import { openInNewTab } from '@subwallet/extension-koni-ui/utils';
 import { ModalContext, Skeleton } from '@subwallet/react-ui';
-import React, { useCallback, useContext, useEffect, useState } from 'react';
+import CN from 'classnames';
+import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 
@@ -111,14 +112,20 @@ const Component = ({ className }: Props): React.ReactElement => {
     openInNewTab(LINK_NFL_APP_DOWNLOAD)();
   }, []);
 
+  const shouldShowInfoButton = useMemo(() => {
+    const leaderboard = leaderboardInfo?.metadata as LeaderboardMetadata | undefined;
+
+    return !!(leaderboard && 'title' in leaderboard && 'content' in leaderboard);
+  }, [leaderboardInfo]);
+
   return (
     <div className={className}>
       <MainScreenHeader
         className={'main-screen-header'}
         rightPartNode={
           (
             <button
-              className={'info-button'}
+              className={CN('info-button', { hidden: !shouldShowInfoButton })}
               onClick={openTermAndConditionModal}
             >
               <InfoIcon />