Merge pull request #2406 from DistributedCollective/development

* chore(deps): bump terser from 4.8.0 to 4.8.1 (#2347) Bumps [terser](https://github.com/terser/terser) from 4.8.0 to 4.8.1. - [Release notes](https://github.com/terser/terser/releases) - [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md) - [Commits](https://github.com/terser/terser/commits) --- updated-dependencies: - dependency-name: terser dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump undici from 5.0.0 to 5.5.1 (#2269) Bumps [undici](https://github.com/nodejs/undici) from 5.0.0 to 5.5.1. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](nodejs/undici@v5.0.0...v5.5.1) --- updated-dependencies: - dependency-name: undici dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Victor Creed <[email protected]> * chore(deps): bump undici from 5.5.1 to 5.10.0 (#2400) Bumps [undici](https://github.com/nodejs/undici) from 5.5.1 to 5.10.0. - [Release notes](https://github.com/nodejs/undici/releases) - [Commits](nodejs/undici@v5.5.1...v5.10.0) --- updated-dependencies: - dependency-name: undici dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * [Reward] - update text note in liquidClaimForm tab + remove unused note in feesEarnedClaimForm tab (#2401) * [Portfolio] - fix table header (when no data) (#2402) * feat: update XUSD lend pool rewards (#2405) * feat: update XUSD lend pool rewards * SOV-428 force redeploy * chore: cleanup unused promos Co-authored-by: Victor Creed <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Victor Creed <[email protected]> Co-authored-by: Pietro Maximoff <[email protected]>
DistributedCollective · Sep 5, 2022 · b83af86 · b83af86
2 parents 9218648 + adf2c30
commit b83af86
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 95 deletions.
diff --git a/README.md b/README.md
@@ -132,3 +132,4 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
 ## Licence
 
 The Sovryn DApp is open-sourced software licensed under the [MIT license](LICENSE).
+
diff --git a/src/app/components/Promotions/index.tsx b/src/app/components/Promotions/index.tsx
@@ -8,7 +8,7 @@ import { useTranslation } from 'react-i18next';
 import { translations } from 'locales/i18n';
 import { LiquidityPoolDictionary } from 'utils/dictionaries/liquidity-pool-dictionary';
 import styles from './index.module.scss';
-import { learnMoreLending, learnMoreYieldFarming } from 'utils/classifiers';
+import { learnMoreYieldFarming } from 'utils/classifiers';
 
 type PromotionsProps = {
   className?: string;
@@ -36,33 +36,6 @@ export const Promotions: React.FC<PromotionsProps> = ({
 
       <div className="tw-relative tw-mb-8 tw-mt-3">
         <PromotionsCarousel className="tw-w-full">
-          {/* <PromotionCard
-            appSection={AppSection.YieldFarm}
-            backgroundColor={PromotionColor.Orange}
-            title={t(translations.promotions.card1.title)}
-            duration={t(translations.promotions.card1.duration)}
-            text={t(translations.promotions.card1.text)}
-            learnMoreLink={learnMoreYieldFarming}
-            logoAsset1={Asset.MYNT}
-            logoAsset2={Asset.RBTC}
-            linkAsset={LiquidityPoolDictionary.get(Asset.MYNT, Asset.RBTC)?.key}
-            linkDataActionId={`landing-promo-learnmore-${Asset.MYNT}`}
-            className={cardClassName}
-            imageClassName={cardImageClassName}
-          /> */}
-          <PromotionCard
-            appSection={AppSection.Lend}
-            backgroundColor={PromotionColor.Yellow}
-            title={t(translations.promotions.card2.title)}
-            duration={t(translations.promotions.card2.duration)}
-            text={t(translations.promotions.card2.text)}
-            linkAsset={Asset.XUSD}
-            learnMoreLink={learnMoreLending}
-            logoAsset1={Asset.XUSD}
-            linkDataActionId={`landing-lend-promo-learnmore-${Asset.XUSD}`}
-            className={cardClassName}
-            imageClassName={cardImageClassName}
-          />
           <PromotionCard
             appSection={AppSection.YieldFarm}
             backgroundColor={PromotionColor.Yellow}
@@ -91,20 +64,6 @@ export const Promotions: React.FC<PromotionsProps> = ({
             className={cardClassName}
             imageClassName={cardImageClassName}
           />
-          {/* <PromotionCard
-            appSection={AppSection.YieldFarm}
-            backgroundColor={PromotionColor.Green}
-            title={t(translations.promotions.card5.title)}
-            duration={t(translations.promotions.card5.duration)}
-            text={t(translations.promotions.card5.text)}
-            learnMoreLink={learnMoreYieldFarming}
-            logoAsset1={Asset.ETH}
-            logoAsset2={Asset.RBTC}
-            linkAsset={LiquidityPoolDictionary.get(Asset.ETH, Asset.RBTC)?.key}
-            linkDataActionId={`landing-promo-learnmore-${Asset.ETH}`}
-            className={cardClassName}
-            imageClassName={cardImageClassName}
-          /> */}
         </PromotionsCarousel>
       </div>
     </div>

diff --git a/src/app/containers/VestedHistory/index.tsx b/src/app/containers/VestedHistory/index.tsx
@@ -5,6 +5,8 @@ import { SkeletonRow } from 'app/components/Skeleton/SkeletonRow';
 import { useGetVestedHistory } from 'app/hooks/staking/useGetVestedHistory';
 import { VestedHistoryContracts } from './components/VestedHistoryContracts';
 
+const DEFAULT_TABLE_COLUMNS_SIZE = 6;
+
 export function VestedHistory() {
   const { t } = useTranslation();
   const { data, loading } = useGetVestedHistory();
@@ -40,7 +42,7 @@ export function VestedHistory() {
         <tbody className="tw-mt-5 tw-font-body">
           {loading && (
             <tr key="loading">
-              <td colSpan={99}>
+              <td colSpan={DEFAULT_TABLE_COLUMNS_SIZE}>
                 <SkeletonRow
                   loadingText={t(translations.topUpHistory.loading)}
                 />
@@ -50,7 +52,10 @@ export function VestedHistory() {
 
           {isEmpty && (
             <tr key="empty">
-              <td className="tw-text-center" colSpan={99}>
+              <td
+                className="tw-text-center"
+                colSpan={DEFAULT_TABLE_COLUMNS_SIZE}
+              >
                 {t(translations.stake.history.emptyHistory)}
               </td>
             </tr>

diff --git a/src/app/pages/LendingPage/components/CurrencyContainer/CurrencyRow.tsx b/src/app/pages/LendingPage/components/CurrencyContainer/CurrencyRow.tsx
@@ -12,10 +12,7 @@ import LeftSection from './LeftSection';
 import { ActionButton } from 'app/components/Form/ActionButton';
 import { Asset } from 'types';
 import { Tooltip } from '@blueprintjs/core';
-import {
-  IPromotionLinkState,
-  PromotionColor,
-} from 'app/components/Promotions/components/PromotionCard/types';
+import { IPromotionLinkState } from 'app/components/Promotions/components/PromotionCard/types';
 import { useHistory, useLocation } from 'react-router-dom';
 import { DialogType } from '../../types';
 
@@ -140,7 +137,7 @@ const CurrencyRow: React.FC<ICurrencyRowProps> = ({
             onNonEmptyBalance={onNonEmptyBalance}
           />
         }
-        leftColor={asset === Asset.XUSD ? PromotionColor.Yellow : undefined}
+        leftColor={undefined}
         chartReady={true}
       />
 

diff --git a/src/app/pages/LendingPage/index.tsx b/src/app/pages/LendingPage/index.tsx
@@ -2,20 +2,10 @@ import React from 'react';
 import { Helmet } from 'react-helmet-async';
 import { useTranslation } from 'react-i18next';
 import { translations } from 'locales/i18n';
-import { Asset } from 'types';
 import { SkeletonRow } from '../../components/Skeleton/SkeletonRow';
 import { useAccount } from '../../hooks/useAccount';
 import CurrencyContainer from './components/CurrencyContainer';
 import { HistoryTable } from './components/HistoryTable';
-import { getNextMonday } from '../../../utils/dateHelpers';
-import { PromotionCard } from 'app/components/Promotions/components/PromotionCard';
-import {
-  AppSection,
-  PromotionColor,
-} from 'app/components/Promotions/components/PromotionCard/types';
-import { learnMoreLending } from 'utils/classifiers';
-
-const date = getNextMonday();
 
 const LendingPage: React.FC = () => {
   const { t } = useTranslation();
@@ -31,26 +21,9 @@ const LendingPage: React.FC = () => {
         />
       </Helmet>
       <div className="tw-max-w-screen-2xl tw-mx-auto tw-container 2xl:tw-px-0 tw-w-full">
-        <PromotionCard
-          appSection={AppSection.Lend}
-          backgroundColor={PromotionColor.Yellow}
-          title={t(translations.promotions.card2.title)}
-          text={t(translations.promotions.card2.text)}
-          duration={t(translations.liquidityMining.recalibration, {
-            date,
-          })}
-          linkAsset={Asset.XUSD}
-          learnMoreLink={learnMoreLending}
-          logoAsset1={Asset.XUSD}
-          linkDataActionId={`lend-promo-learnmore-${Asset.XUSD}`}
-          className="tw-mt-3"
-          imageClassName="tw-transform tw-scale-85"
-        />
-
-        <div className={'tw-max-w-screen-2xl tw-mx-auto tw-mt-5'}>
+        <div className="tw-max-w-screen-2xl tw-mx-auto tw-mt-11">
           <CurrencyContainer />
         </div>
-
         <div className="tw-mt-12">
           <div className="tw-px-3 tw-text-lg">
             {t(translations.lendingPage.historyTable.title)}

diff --git a/src/locales/en/translation.json b/src/locales/en/translation.json
@@ -1626,11 +1626,10 @@
       "claimDisabled": "There is not enough SOV in the StakingRewardsProxy contract to facilitate a claim of rewards at this time. Therefore, to avoid a loss of gas fee by initiating a transaction that will inevitably fail, the CLAIM button has been disabled. Be assured that the team is aware and funds should be replenished shortly."
     },
     "liquidClaimForm": {
-      "note": "Claiming your rewards automatically adds them your SOV portfolio balance.",
+      "note": "Claiming your rewards automatically adds them to your SOV portfolio balance.",
       "learn": "Learn more"
     },
     "feesEarnedClaimForm": {
-      "note": "Claiming your rewards automatically adds them your <0/> portfolio balance.",
       "learn": "Learn more",
       "asset": "Asset",
       "amount": "Amount",

diff --git a/src/locales/pt_br/translation.json b/src/locales/pt_br/translation.json
@@ -1629,7 +1629,6 @@
       "learn": "Saiba mais"
     },
     "feesEarnedClaimForm": {
-      "note": "Ao reivindicar seus Dividendos/Comissão, eles automaticamente são adicionados no seu saldo <0/> no portfólio.",
       "learn": "Saiba mais",
       "asset": "Ativo",
       "amount": "Quantidade",

diff --git a/yarn.lock b/yarn.lock
@@ -26619,15 +26619,7 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@^0.5.17, source-map-support@^0.5.19:
+source-map-support@^0.5.16, source-map-support@^0.5.17, source-map-support@^0.5.19, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19:
   version "0.5.21"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
@@ -27856,9 +27848,9 @@ terser-webpack-plugin@^1.4.3:
     worker-farm "^1.7.0"
 
 terser@^4.1.2, terser@^4.6.2, terser@^4.6.3:
-  version "4.8.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
-  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
+  integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
   dependencies:
     commander "^2.20.0"
     source-map "~0.6.1"
@@ -28607,9 +28599,9 @@ [email protected]:
   integrity sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==
 
 undici@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/undici/-/undici-5.0.0.tgz#3c1e08c7f0df90c485d5d8dbb0517e11e34f2090"
-  integrity sha512-VhUpiZ3No1DOPPQVQnsDZyfcbTTcHdcgWej1PdFnSvOeJmOVDgiOHkunJmBLfmjt4CqgPQddPVjSWW0dsTs5Yg==
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.10.0.tgz#dd9391087a90ccfbd007568db458674232ebf014"
+  integrity sha512-c8HsD3IbwmjjbLvoZuRI26TZic+TSEe8FPMLLOkN1AfYRhdjnKBU6yL+IwcSCbdZiX4e5t0lfMDLDCqj4Sq70g==
 
 unfetch@^4.2.0:
   version "4.2.0"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -132,3 +132,4 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
		## Licence

		The Sovryn DApp is open-sourced software licensed under the [MIT license](LICENSE).