From dda25ca0b233b492980f343c76647970b3792d75 Mon Sep 17 00:00:00 2001
From: Aaron DeRuvo <aaron.deruvo@gmail.com>
Date: Thu, 12 Dec 2019 16:43:26 -0800
Subject: [PATCH 1/2] no message

---
 packages/web/src/brandkit/IconsPage.tsx      |  2 +-
 packages/web/src/brandkit/Intro.tsx          |  2 +-
 packages/web/src/brandkit/Logo.tsx           | 10 ++++------
 packages/web/src/brandkit/Typography.tsx     |  6 +++---
 packages/web/src/community/CodeOfConduct.tsx | 10 +++++-----
 packages/web/src/dev/Cover.tsx               |  6 +++---
 packages/web/src/dev/FaucetPage.tsx          |  4 ++--
 packages/web/src/i18n.ts                     |  1 +
 packages/web/src/shared/Footer.3.tsx         |  2 +-
 9 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/packages/web/src/brandkit/IconsPage.tsx b/packages/web/src/brandkit/IconsPage.tsx
index f89588b9d93..f082d3afb69 100644
--- a/packages/web/src/brandkit/IconsPage.tsx
+++ b/packages/web/src/brandkit/IconsPage.tsx
@@ -40,7 +40,7 @@ const Overview = withNamespaces(NameSpaces.brand)(function _Overview({ t }: I18n
         {t('licenseTitle')}
       </Text>
       <Text style={[fonts.p, brandStyles.gap, standardStyles.elementalMargin]}>
-        <Trans i18nKey="icons.license">
+        <Trans ns={NameSpaces.brand} i18nKey="icons.license">
           <InlineAnchor href={CeloLinks.iconsLicense}>
             Creative Commons Attribution-NoDerivatives 4.0 International License
           </InlineAnchor>
diff --git a/packages/web/src/brandkit/Intro.tsx b/packages/web/src/brandkit/Intro.tsx
index 5856b34e5d5..08b154060f3 100644
--- a/packages/web/src/brandkit/Intro.tsx
+++ b/packages/web/src/brandkit/Intro.tsx
@@ -28,7 +28,7 @@ const Overview = withNamespaces(NameSpaces.brand)(function _Overview({ t }: I18n
       <H4 style={standardStyles.blockMarginBottom}>{t('home.introduction')}</H4>
       <Text style={[fonts.h5, standardStyles.elementalMarginBottom]}>{t('home.useageTitle')}</Text>
       <Text style={fonts.p}>
-        <Trans i18nKey="home.useageText">
+        <Trans ns={NameSpaces.brand} i18nKey="home.useageText">
           <InlineAnchor href={menuItems.CODE_OF_CONDUCT.link}>Code Of Conduct</InlineAnchor>
         </Trans>
       </Text>
diff --git a/packages/web/src/brandkit/Logo.tsx b/packages/web/src/brandkit/Logo.tsx
index 671290b71d8..6ff57515c10 100644
--- a/packages/web/src/brandkit/Logo.tsx
+++ b/packages/web/src/brandkit/Logo.tsx
@@ -11,7 +11,7 @@ import Judgement, { Value } from 'src/brandkit/logo/Judgement'
 import LogoExample, { Logos } from 'src/brandkit/logo/LogoExample'
 import LogoWithBackground from 'src/brandkit/logo/LogoWithBackground'
 import { Digital, Print } from 'src/brandkit/logo/Minimums'
-import { H1, H3 } from 'src/fonts/Fonts'
+import { H1, H4 } from 'src/fonts/Fonts'
 import { I18nProps, NameSpaces, Trans, withNamespaces } from 'src/i18n'
 import { ScreenProps, ScreenSizes, withScreenSize } from 'src/layout/ScreenSize'
 import LogoLightBg from 'src/logos/LogoLightBg'
@@ -44,15 +44,13 @@ export default React.memo(function Logo() {
 })
 
 const Overview = withNamespaces(NameSpaces.brand)(
-  withScreenSize<I18nProps>(function _Overview({ t, screen }: I18nProps & ScreenProps) {
+  withScreenSize(function _Overview({ t, screen }: I18nProps & ScreenProps) {
     const glyphAreaStyle = screen === ScreenSizes.DESKTOP ? styles.pilar : styles.square
     return (
       <View style={styles.container}>
         <View style={styles.gap}>
           <H1 style={standardStyles.elementalMarginBottom}>{t('logo.title')}</H1>
-          <Text style={[fonts.p, standardStyles.elementalMarginBottom]}>
-            {t('logo.overviewCopy')}
-          </Text>
+          <H4 style={[standardStyles.elementalMarginBottom]}>{t('logo.overviewCopy')}</H4>
           <Button
             kind={BTN.PRIMARY}
             text={t('logo.overviewBtn')}
@@ -62,7 +60,7 @@ const Overview = withNamespaces(NameSpaces.brand)(
           <Text
             style={[fonts.p, standardStyles.blockMarginBottom, standardStyles.elementalMarginTop]}
           >
-            <Trans i18nKey="logo.license">
+            <Trans ns={NameSpaces.brand} i18nKey="logo.license">
               <InlineAnchor href={menuItems.CODE_OF_CONDUCT.link}>here</InlineAnchor>
             </Trans>
           </Text>
diff --git a/packages/web/src/brandkit/Typography.tsx b/packages/web/src/brandkit/Typography.tsx
index e02cf6f89c2..6fca26cf630 100644
--- a/packages/web/src/brandkit/Typography.tsx
+++ b/packages/web/src/brandkit/Typography.tsx
@@ -39,7 +39,7 @@ export default React.memo(function Typography() {
 })
 
 const Overview = withNamespaces(NameSpaces.brand)(
-  React.memo(function _Overview({ t }: I18nProps) {
+  React.memo(function _Overview({ t, i18n }: I18nProps) {
     return (
       <View>
         <PageHeadline
@@ -50,7 +50,7 @@ const Overview = withNamespaces(NameSpaces.brand)(
         <View style={brandStyles.gap}>
           <Text style={fonts.h5}>{t('typography.facesTitle')}</Text>
           <Text style={[fonts.p, standardStyles.elementalMargin]}>
-            <Trans i18nKey={'typography.facesText'}>
+            <Trans ns={NameSpaces.brand} i18nKey={'typography.facesText'}>
               <InlineAnchor href="https://medium.com/celohq/the-why-of-the-celo-coin-part-1-of-3-5e5701805847">
                 philosophy
               </InlineAnchor>
@@ -79,7 +79,7 @@ const TYPEFACES = [
   { font: fonts.h2, name: 'Heading Two', data: fontInfo.h2 },
   { font: fonts.h3, name: 'Heading Three', data: fontInfo.h3 },
   { font: fonts.h4, name: 'Heading Four', data: fontInfo.h4 },
-  { font: fonts.h5, name: 'Heading Five', data: fontInfo.h5a },
+  { font: fonts.h5, name: 'Heading Five', data: fontInfo.h5 },
   { font: fonts.h6, name: 'Heading Six', data: fontInfo.h6 },
   { font: fonts.p, name: 'Body', data: fontInfo.p },
   { font: fonts.legal, name: 'Small', data: fontInfo.legal },
diff --git a/packages/web/src/community/CodeOfConduct.tsx b/packages/web/src/community/CodeOfConduct.tsx
index 6d910353367..a8cc1f870c9 100644
--- a/packages/web/src/community/CodeOfConduct.tsx
+++ b/packages/web/src/community/CodeOfConduct.tsx
@@ -4,7 +4,7 @@ import defaultContent from 'src/../static/locales/en/codeofconduct.json'
 import { IntegratingAnimation } from 'src/community/connect/CodeOfConduct'
 import { H1, Li, Ul } from 'src/fonts/Fonts'
 import OpenGraph from 'src/header/OpenGraph'
-import { I18nProps, Trans, withNamespaces } from 'src/i18n'
+import { I18nProps, NameSpaces, Trans, withNamespaces } from 'src/i18n'
 import { Cell, GridRow, Spans } from 'src/layout/GridRow'
 import SideTitledSection from 'src/layout/SideTitledSection'
 import Button, { BTN } from 'src/shared/Button.3'
@@ -39,7 +39,7 @@ export class CodeOfConduct extends React.Component<I18nProps> {
           <SideTitledSection
             title={t('OpenSource')}
             text={
-              <Trans i18nKey={'OpenSourceText'}>
+              <Trans ns={NameSpaces.codeofconduct} i18nKey={'OpenSourceText'}>
                 {
                   'A supplemental goal of this Code of Conduct is to increase open source citizenship by encouraging participants to recognize and strengthen the relationships between our actions and their effects on our community.\n\n Communities mirror the societies in which they exist and positive action is essential to counteract the many forms of inequality and abuses of power that exist in society.\n\n If you see someone who is making an extra effort to ensure our community is welcoming, friendly, and encourages all participants to contribute to the fullest extent, let us know by email '
                 }
@@ -66,7 +66,7 @@ export class CodeOfConduct extends React.Component<I18nProps> {
           <SideTitledSection
             title={t('Reporting')}
             text={
-              <Trans i18nKey="ReportingText">
+              <Trans ns={NameSpaces.codeofconduct} i18nKey="ReportingText">
                 If you are subject to or witness unacceptable behavior, or have any other concerns,
                 please notify <CommunityEmail /> as soon as possible.
               </Trans>
@@ -75,7 +75,7 @@ export class CodeOfConduct extends React.Component<I18nProps> {
           <SideTitledSection
             title={t('Grievances')}
             text={
-              <Trans i18nKey="GrievancesText">
+              <Trans ns={NameSpaces.codeofconduct} i18nKey="GrievancesText">
                 If you feel you have been falsely or unfairly accused of violating this Code of
                 Conduct, you should notify <CommunityEmail /> with a concise description of your
                 grievance.
@@ -85,7 +85,7 @@ export class CodeOfConduct extends React.Component<I18nProps> {
           <SideTitledSection
             title={t('License')}
             text={
-              <Trans i18nKey={'LicenseText'}>
+              <Trans ns={NameSpaces.codeofconduct} i18nKey={'LicenseText'}>
                 This Code of Conduct is distributed under a{' '}
                 <Button
                   href={'https://creativecommons.org/licenses/by-sa/3.0/'}
diff --git a/packages/web/src/dev/Cover.tsx b/packages/web/src/dev/Cover.tsx
index bb6c2bd5f55..8bc48480678 100644
--- a/packages/web/src/dev/Cover.tsx
+++ b/packages/web/src/dev/Cover.tsx
@@ -3,7 +3,7 @@ import { Image, StyleSheet, Text, View } from 'react-native'
 import Fade from 'react-reveal/Fade'
 import Transceive from 'src/dev/Transceive'
 import { H2, H3, H4 } from 'src/fonts/Fonts'
-import { I18nProps, Trans, withNamespaces } from 'src/i18n'
+import { I18nProps, NameSpaces, Trans, withNamespaces } from 'src/i18n'
 import { Cell, GridRow, Spans } from 'src/layout/GridRow'
 import Button, { BTN, SIZE } from 'src/shared/Button.3'
 import { CeloLinks } from 'src/shared/menu-items'
@@ -52,14 +52,14 @@ const CoverComponent = React.memo(function Cover({ t }: I18nProps) {
         </Cell>
         <Cell span={Spans.half}>
           <H4 style={[textStyles.invert, standardStyles.elementalMarginBottom]}>
-            <Trans i18nKey={'purposeText'}>
+            <Trans ns={NameSpaces.dev} i18nKey={'purposeText'}>
               <Text href={CeloLinks.discourse} style={styles.colorEmphasis}>
                 2 million Celo Gold in rewards.
               </Text>*
             </Trans>
           </H4>
           <Text style={[fonts.p, textStyles.invert]}>
-            <Trans i18nKey={'purposeAsterisk'}>
+            <Trans ns={NameSpaces.dev} i18nKey={'purposeAsterisk'}>
               <Link href={CeloLinks.stakeOffTerms}>Terms and Conditions</Link>
             </Trans>
           </Text>
diff --git a/packages/web/src/dev/FaucetPage.tsx b/packages/web/src/dev/FaucetPage.tsx
index d6623df64a3..692237501d9 100644
--- a/packages/web/src/dev/FaucetPage.tsx
+++ b/packages/web/src/dev/FaucetPage.tsx
@@ -39,7 +39,7 @@ class FaucetPage extends React.Component<I18nProps, State> {
           <SideTitledSection
             title={t('getTestnetAddress')}
             text={
-              <Trans i18nKey={'getTestnetText'}>
+              <Trans ns={NameSpaces.faucet} i18nKey={'getTestnetText'}>
                 <InlineAnchor href={CeloLinks.walletApp}>INVITE</InlineAnchor>{' '}
                 <InlineAnchor href={CeloLinks.tutorial}>CLI</InlineAnchor>
               </Trans>
@@ -48,7 +48,7 @@ class FaucetPage extends React.Component<I18nProps, State> {
           <SideTitledSection
             title={t('haveAnAccount')}
             text={
-              <Trans i18nKey={'haveAccountText'}>
+              <Trans ns={NameSpaces.faucet} i18nKey={'haveAccountText'}>
                 You can access an existing account from the Celo Wallet by pressing `Import It` on
                 the first screen and entering your seed phrase.
               </Trans>
diff --git a/packages/web/src/i18n.ts b/packages/web/src/i18n.ts
index b3e44ceb1bb..80044a5b2bf 100644
--- a/packages/web/src/i18n.ts
+++ b/packages/web/src/i18n.ts
@@ -7,6 +7,7 @@ export const Trans = NextI18NextInstance.Trans
 export interface I18nProps {
   t: TFunction
   i18n: I18n
+  tReady: boolean
 }
 
 export default NextI18NextInstance
diff --git a/packages/web/src/shared/Footer.3.tsx b/packages/web/src/shared/Footer.3.tsx
index a891ece2440..38416172e58 100644
--- a/packages/web/src/shared/Footer.3.tsx
+++ b/packages/web/src/shared/Footer.3.tsx
@@ -140,7 +140,7 @@ const Details = React.memo(function _Details({ t }: { t: I18nProps['t'] }) {
       </Responsive>
       <Responsive medium={[textStyles.left, styles.detailsText, fonts.legal]}>
         <Text style={[textStyles.center, styles.detailsText, fonts.legal]}>
-          <Trans i18nKey={'footerReadMoreTerms'}>
+          <Trans ns={NameSpaces.common} i18nKey={'footerReadMoreTerms'}>
             <InlineAnchor href={menu.TERMS.link}>Terms of Service</InlineAnchor>
           </Trans>
         </Text>

From 400d3bde60206c2a95488eb0670306aab46caea3 Mon Sep 17 00:00:00 2001
From: Connor McEwen <connor.mcewen@gmail.com>
Date: Fri, 13 Dec 2019 10:24:39 -0800
Subject: [PATCH 2/2] remove array

---
 packages/web/src/brandkit/Logo.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web/src/brandkit/Logo.tsx b/packages/web/src/brandkit/Logo.tsx
index 6ff57515c10..430a9c2b03c 100644
--- a/packages/web/src/brandkit/Logo.tsx
+++ b/packages/web/src/brandkit/Logo.tsx
@@ -50,7 +50,7 @@ const Overview = withNamespaces(NameSpaces.brand)(
       <View style={styles.container}>
         <View style={styles.gap}>
           <H1 style={standardStyles.elementalMarginBottom}>{t('logo.title')}</H1>
-          <H4 style={[standardStyles.elementalMarginBottom]}>{t('logo.overviewCopy')}</H4>
+          <H4 style={standardStyles.elementalMarginBottom}>{t('logo.overviewCopy')}</H4>
           <Button
             kind={BTN.PRIMARY}
             text={t('logo.overviewBtn')}