Merge pull request #59 from HaloDAO/hdb-11-and-12

Applying this commit will update the discord link and replace mentions of "APY" to "APR"
xave-finance · Aug 17, 2021 · c5e092f · c5e092f
2 parents 5c03e54 + 2ed4e1d
commit c5e092f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Support
-    url: https://discord.gg/EwFs3Pp
+    url: https://discord.com/invite/halodao
     about: Please ask and answer questions here
   - name: List a token
     url: https://github.com/Uniswap/default-token-list#adding-a-token

diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ An open source interface for HaloDAO -- a protocol for decentralized exchange of
 - Website: [halodao.com](https://halodao.com/)
 - Interface: [dev.app.halodao.com](https://dev.app.halodao.com)
 - Twitter: [@HaloDAOOfficial](https://twitter.com/HaloDAOFinance)
-- Discord: [HaloDAO](https://discord.gg/uAgZvXg7)
+- Discord: [HaloDAO](https://discord.com/invite/halodao)
 
 ## Accessing the HaloDAO Interface
 

diff --git a/public/locales/en.json b/public/locales/en.json
@@ -115,6 +115,7 @@
   "harvest": "Harvest",
   "max": "MAX",
   "apy": "APY",
+  "apr": "APR",
   "new": "New",
   "emptyStateTitleInFarm": "Let's get farming!",
   "emptyStateTitleInVest": "Let's get vesting!",

diff --git a/src/components/Farm/FarmPoolCard.tsx b/src/components/Farm/FarmPoolCard.tsx
@@ -639,7 +639,7 @@ export default function FarmPoolCard({ poolInfo, tokenPrice, isActivePool }: Far
             <StyledTextForValue fontWeight={600}>{poolInfo.pair}</StyledTextForValue>
           </StyledRowFixed>
           <StyledRowFixed width="13%">
-            <LabelText className="first">{t('apy')}:</LabelText>
+            <LabelText className="first">{t('apr')}:</LabelText>
             <StyledTextForValue>{isActivePool ? poolAPY : t('inactive')}</StyledTextForValue>
           </StyledRowFixed>
           <StyledRowFixed width="18%">

diff --git a/src/components/Farm/FarmPoolTable.tsx b/src/components/Farm/FarmPoolTable.tsx
@@ -50,7 +50,7 @@ const FarmPoolTable = ({ poolsInfo, tokenPrice }: FarmPoolTableProps) => {
                     <TYPE.thHeader style={{ justifySelf: 'flex-start' }}>{t('pool')}</TYPE.thHeader>
                   </RowFixed>
                   <RowFixed width="13%">
-                    <TYPE.thHeader style={{ justifySelf: 'flex-start' }}>{t('apy')}</TYPE.thHeader>
+                    <TYPE.thHeader style={{ justifySelf: 'flex-start' }}>{t('apr')}</TYPE.thHeader>
                   </RowFixed>
                   <RowFixed width="18%">
                     <TYPE.thHeader style={{ justifySelf: 'flex-start' }}>{t('totalPoolValue')}</TYPE.thHeader>

diff --git a/src/components/Menu/index.tsx b/src/components/Menu/index.tsx
@@ -116,7 +116,7 @@ export default function Menu() {
             <Code size={14} />
             Code
           </MenuItem> */}
-          <MenuItem id="link" href="https://discord.gg/gqKxuGdX">
+          <MenuItem id="link" href="https://discord.com/invite/halodao">
             <MessageCircle size={14} />
             Discord
           </MenuItem>

diff --git a/src/pages/HaloHalo/index.tsx b/src/pages/HaloHalo/index.tsx
@@ -274,7 +274,7 @@ export default function HaloHalo() {
             </RowBetweenCard>
             <RowBetween id="haloHaloAPY">
               The longer you keep xRNBW, the more RNBW you can claim later on (
-              {haloHaloAPY > 0 ? formatNumber(haloHaloAPY, NumberFormat.percent) + ' APY' : 'APY pending'}). Claim
+              {haloHaloAPY > 0 ? formatNumber(haloHaloAPY, NumberFormat.percent) + ' APR' : 'APR pending'}). Claim
               anytime but lose out on monthly RNBW vesting multiples.
             </RowBetween>
           </CardSection>