Merge pull request #1269 from topcoder-platform/sync-v6-with-dev

Sync v6 with dev

Author: vas3a

src/apps/learn/src/lib/components/svgs/Doug-Hanson.svg

@@ -5,4 +5,3 @@ export { ReactComponent as CrowdIcon } from './crowd-icon.svg'
 export { ReactComponent as TcLogoSvg } from './tc-logo.svg'
 export { ReactComponent as FccLogoBlackSvg } from './vendor-fcc-logo-black.svg'
 export { ReactComponent as IconCertifSvg } from './icon-certif.svg'
-export { ReactComponent as DougSigSvg } from './Doug-Hanson.svg'

src/apps/learn/src/lib/components/svgs/index.ts

@@ -39,7 +39,6 @@ const TCACertificatePreview: FC<TCACertificatePreviewProps> = (props: TCACertifi
                 certification={props.certification}
                 completedDate={props.completedDate ?? ''}
                 completionUuid={props.completionUuid}
-                displaySignature
                 tcHandle={props.tcHandle ?? ''}
                 userName={props.userName}
                 validateLink={props.validateLink}

src/apps/learn/src/lib/components/tca-certificate-preview/TCACertificatePreview.tsx

@@ -8,7 +8,6 @@ import { TCAcademyLogoWhiteSvg, TCLogoSvg } from '~/libs/ui'
 import { LearnConfig } from '../../../../config'
 import { TCACertificateType, TCACertification } from '../../../data-providers'
 import { CertificateBadgeIcon } from '../../dynamic-icons'
-import { DougSigSvg } from '../../svgs'
 
 import { CertificateBackground } from './certificate-background'
 import styles from './TCACertificate.module.scss'
@@ -17,7 +16,6 @@ interface TCACertificateProps {
     certification: TCACertification
     completionUuid?: null | string
     completedDate?: string
-    displaySignature?: boolean
     elRef?: MutableRefObject<HTMLElement | any>
     tcHandle?: string
     userName?: string
@@ -28,8 +26,6 @@ const TCACertificate: FC<TCACertificateProps> = (props: TCACertificateProps) =>
     // TODO: add cross track theme/type support
     const certificateType: TCACertificateType = props.certification.certificationCategory?.track ?? 'DEV'
 
-    const displaySignature: boolean = props.displaySignature ?? true
-
     const completedDate: string = moment(props.completedDate || new Date())
         .format('MMM D, YYYY')
 
@@ -93,16 +89,6 @@ const TCACertificate: FC<TCACertificateProps> = (props: TCACertificateProps) =>
                                     <span className='ultra-small-medium'>{props.validateLink}</span>
                                 </div>
                             </div>
-                            {
-                                displaySignature && (
-                                    <div className={styles.sigWrap}>
-                                        <DougSigSvg />
-                                        <div className={styles.divider} />
-                                        <span>Doug Hanson</span>
-                                        <span>CEO, Topcoder</span>
-                                    </div>
-                                )
-                            }
                         </div>
                     )}
                 </div>

src/apps/learn/src/lib/components/tca-certificate-preview/tca-certificate/TCACertificate.tsx

@@ -7,8 +7,6 @@ import { PageTitle, TabsNavbar, TabsNavItem } from '~/libs/ui'
 import { getHashFromTabId, getTabIdFromHash, WalletAdminTabsConfig, WalletAdminTabViews } from './config'
 import { PaymentsTab } from './payments'
 import { HomeTab } from './home'
-import { TaxFormsTab } from './tax-forms'
-import { PaymentMethodsTab } from './payment-methods'
 import styles from './WalletAdminTabs.module.scss'
 
 interface WalletHomeProps {
@@ -46,10 +44,6 @@ const WalletAdminTabs: FC<WalletHomeProps> = (props: WalletHomeProps) => {
             {activeTab === WalletAdminTabViews.home && <HomeTab profile={props.profile} />}
 
             {activeTab === WalletAdminTabViews.payments && <PaymentsTab profile={props.profile} />}
-
-            {activeTab === WalletAdminTabViews.taxforms && <TaxFormsTab profile={props.profile} />}
-
-            {activeTab === WalletAdminTabViews.withdrawalmethods && <PaymentMethodsTab profile={props.profile} />}
         </div>
     )
 }

src/apps/wallet-admin/src/home/tabs/WalletAdminTabs.tsx

@@ -3,8 +3,6 @@ import { TabsNavItem } from '~/libs/ui'
 export enum WalletAdminTabViews {
     home = '0',
     payments = '1',
-    taxforms = '2',
-    withdrawalmethods = '3',
 }
 
 export const WalletAdminTabsConfig: TabsNavItem[] = [
@@ -16,14 +14,6 @@ export const WalletAdminTabsConfig: TabsNavItem[] = [
         id: WalletAdminTabViews.payments,
         title: 'Payments',
     },
-    {
-        id: WalletAdminTabViews.withdrawalmethods,
-        title: 'Payment Providers',
-    },
-    {
-        id: WalletAdminTabViews.taxforms,
-        title: 'Tax Forms',
-    },
 ]
 
 export function getHashFromTabId(tabId: string): string {
@@ -32,10 +22,6 @@ export function getHashFromTabId(tabId: string): string {
             return '#home'
         case WalletAdminTabViews.payments:
             return '#payments'
-        case WalletAdminTabViews.taxforms:
-            return '#tax-forms'
-        case WalletAdminTabViews.withdrawalmethods:
-            return '#payment-providers'
         default:
             return '#home'
     }
@@ -45,10 +31,6 @@ export function getTabIdFromHash(hash: string): string {
     switch (hash) {
         case '#payments':
             return WalletAdminTabViews.payments
-        case '#tax-forms':
-            return WalletAdminTabViews.taxforms
-        case '#payment-providers':
-            return WalletAdminTabViews.withdrawalmethods
         default:
             return WalletAdminTabViews.home
     }