Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix string in EN #1558

Merged

Conversation

bitcoinuser
Copy link
Contributor

Change from Action to Amount

Change from Action to Amount
@creed-victor creed-victor merged commit 56896f5 into DistributedCollective:development Jul 27, 2021
soulBit added a commit that referenced this pull request Aug 24, 2021
* [BuySovPage] remove dropped content

* [BuySovPage] update InfoBar

* [BuySovPage] update Onboarding and Features

* [BuySovPage] fix, headings, fix issues with the onboarding

* add landingPage container.

* Add Welcome section

* Add Total value locked section

* Promotions section - initial commit (PromotionsCarousel)

* add landing page ArbitrageOpportunity.

* add LendingAssets to LandingPage.

* PromotionsCard initial version

* add top amm pools.

* fix landing ui issue.

* Promotions - PromotionCard adjustments

* Promotions section adjustments

* Fix string in EN (#1558)

Change from Action to Amount

* Add new string PT-BR (#1552)

* Add new string PT-BR

Added the string of: #1549

* Minor change

* New string

* Minor change

* Update src/locales/pt_br/translation.json

* Minor change

* Fix

* [Swap] - added footer (#1561)

* changed v1 pool smart-contracts (#1566)

* Feat/1492  webpack optimization eslint and thread-loader (#1510)

* [Webpack] replace eslint-loader with eslint-webpack-plugin, update eslint-dependencies

* [Webpack] use thread-loader for js/ts

* [Webpack] fix ESLintPlugin config

* [useAnalytics] export useCookie's static functions to be used in useAnalytics

* yarn.lock update

Co-authored-by: Victor Creed <[email protected]>

* Align buttons in margin trade dialog (#1497)

* Align buttons in margin trade dialog

* [Portfolio] - fix #1555

Co-authored-by: soulBit <[email protected]>
Co-authored-by: pietro-maximoff <[email protected]>
Co-authored-by: Victor Creed <[email protected]>

* Change Vesting Schedule to Type (#1557)

* removes dummy MOC lending contract (#1567)

* [Lend] - disabled buttons (deposit, withdraw) if user is not connected #1506 (#1565)

* Initial rework of TradingVolume section

* TradingVolume section and welcome title adjustments

* fix arbitrage assets logo.

* Implement promotion links to specific modals

* update tokens icons.

* fix Arbitrage list issue.

* update isNullOrUndefined.

* add isValidArbitrage function.

* Promotion cards adjustments

* fix isNullOrUndefined null check.

* add validation to ArbitrageOpportunity data.

* fix Arbitrage list issue. (#1590)

* fix Arbitrage list issue.

* update isNullOrUndefined.

* add isValidArbitrage function.

* fix isNullOrUndefined null check.

* Cross chain Deposits & Withdrawals (#1347)

* add stepper component.

* add babelfish steps to stepper.

* add stepper animations.

* chain selector

* make stepper reusable

* improve stepper.

* add network select babelfish

* add tokens to babelfish flow.

* add babelfish deposit components.

* add Processing step.

* imporve babelfish components.

* implement transition animation

* increase animation time

* improve transition modal.

* fix back btn action.

* update chain selector ui.

* update token selector design.

* add transition to bridge deposit.

* improve reviewStep and amount selector.

* add stepper to cross-chain deposit.

* remove Babelfish unused components.

* fix stepper values.

* cross-chain deposit transactions

* bsc and mainnet token contracts added

* merged master

* mainnet assets + withdraw assets

* merged animations

* add babelfish icon.

* improve chainSelector ui.

* add asset balance to Token selector.

* improve bridge steps ui.

* fix deposit compelete ui.

* add backbutton to cross-chain deposit.

* fix deposit network detection.

* fixes receiver address

* improve bridge deposit ui.

* fix cross-chain issues.

* fix cross-chain deposit issues.

* fixes xusd aggregator bug

* fix ReturnToPortfolio wallet connect.

* cross-bridge withdrawal

* remove return to wallet stop from withdraw flow.

* improve return to portfolio.

* fix cross-chain sidebar position.

* fix bridge issue.

* fix ui size.

* apply new sovryn wallet changes to frontend.
Co-authored-by: Dustin Hagemeier <[email protected]>

* [Webpack] fix duplicate react version when linking packages

* [Webpack] add link to a related react github issue

* add wallet selector step to babelfish deposit flow

* Added new sovryn/react-wallet library version.

* fix code review.

* [Portfolio] - fix #1555

* Bump wallet dependency version

* some of review fixes

* fix babelfish backgrond color.

* fix wallet selector disconnect.

* fix bridge transaltion issues.

* fix bridgeDeposit buttons.

* fix babelfish withdraw design.

* fix sizing.

* add all BridgeDeposit component translations.

* add BridgeWithdrawPage translations.

* fix typo.

* fix PR comments.

* Upgraded wallet version (#1586)

* upgraded wallet version - support for software wallets on test mode.

* enable software wallet from env

* keep metamask connected on cross-chain deposits (#1588)

Co-authored-by: Victor Creed <[email protected]>

* fix cross chain deposit disconnect wallet.

* fix bridge deposit/withdraw design issues.

* fix bridge notSupported text.

* fix cross chain wallet logo issue.

* return to profile ledger.

Co-authored-by: rick23p <[email protected]>
Co-authored-by: Victor Creed <[email protected]>
Co-authored-by: boltsr <[email protected]>
Co-authored-by: ShynRou <[email protected]>
Co-authored-by: soulBit <[email protected]>
Co-authored-by: Peiman Naderi <[email protected]>
Co-authored-by: pietro-maximoff <[email protected]>
Co-authored-by: Victor Creed <[email protected]>
Co-authored-by: Rick <[email protected]>

* Promotion cards - asset logos

* Fix margin trade promotion links

* Fix/cross chain (#1596)

* fixes linter "import/no-anonymous-default-export" issue

* portoflio button styling fix

* Feat/388 remove bootstrap (#1528)

* [Styling] remove react-bootstrap

* [Styling] remove bootstrap and remove in css usages

* [Styling] add bootstrap compatibility styles

* [Styling] change bootstrap classes to tailwind

* [Styling] change bootstrap classes to tailwind 2

* [Styling] change bootstrap classes to tailwind 3

* [Styling] change bootstrap classes to tailwind 4

* [Styling] change bootstrap classes to tailwind 5

* [Styling] change bootstrap classes to tailwind 6; sr-only

* [Styling] change bootstrap classes to tailwind 7, fix table header

* [Styling] revert changed negative margins

* [Styling] fix SwapForm AssetSelector

* [Styling] fix FormSelect border

* [Styling] fix bg-secondary changes, fix TradingVolume

* [Styling] fix max width usages especially for modals

* [Styling] re-add bootstrap default heading styling

* [Styling] use tailwind for RewardPage

* [Styling] fixed TableTransactionStatus and some forgotten StyledComponents

* [Styling] re-apply commit 3dcd68d

* Feat/1494 replace moment (#1569)

* [DateLocalization] replace moment with dayjs

* [DateLocalization] remove IgnorePlugin moment locale hack

* [StakingDateSelector] fix typos and typings

* Remove antd package

* [Trading Chart] Fix border

Co-authored-by: Soul Bit <[email protected]>

* update assets.

* update lending assets design.

* Feat/1496 remove dead code (#1564)

* [Cleanup] remove out commented code

* [Cleanup] remove unused utils

* [Cleanup] remove unused files in app/pages

* [Cleanup]  remove WhitelistedNotifications and it's hook

* [Cleanup] remove unused files in app/containers

* [Cleanup] remove unused files in app/components

* [Cleanup] remove empty unused app/hooks/useSwapToUsdRate

* [Cleanup] remove unused package sentry

* [Cleanup] remove out commented jsx

* [Cleanup] re-add unused app/components/Form components

* [Cleanup] re-add unused app/pages/OriginsLaunchpad

* [Cleanup] re-add unused code in MarginTradePage TradeDialog

Co-authored-by: Soul Bit <[email protected]>

* update amm balance table design.

* Disable claim button on reward SOV when tx is in progress (#1600)

Co-authored-by: tiltom <[email protected]>

* add new landing footer.

* Remove eslint-disable comments (#1578)

* [Cleanup] remove eslint-ignore and fix react-hook usage

* [Cleanup] remove eslint-ignore in NetworkDialog and fix corresponding issues

* [Cleanup] remove eslint-ignore and fix issues

* [Cleanup] remove eslint-ignore, add immediate option to useInterval

* [Cleanup] remove eslint-ignore and fix issue, add useCallbacks

* [Cleanup] fix unused imports and missing, useless useEffect dependencies

* [Cleanup] fix self introduced TradingChart crash

* [Cleanup] fix code style issues

* [Cleanup] fix code style issues

* [Cleanup] fix further code style issues

Co-authored-by: Soul Bit <[email protected]>

* Feat/1496 ban ts ignore (#1570)

* [ESLint] enable @typescript-eslint/ban-ts-comment, fix vscode eslint error

* [ESLint] remove ts-ignore and fix underlying web3-eth-contract version conflict

Co-authored-by: Victor Creed <[email protected]>

* update lock.

* update lock.

* finish TVL and Lend borrow table.

* improve landing page.

* disable stats page.

* fix responsive issues.

* improve landing page responsive and styles.

* [BuySOV] fix styling issues caused by global CSS changes

* [browsers] update supported browsers and add a table to readme (#1601)

* fix: contract writer failing to send transactions

* fix for margin trading issue

* add landing banner origin fish sale.

* Show connected user wallet address in babelfish flows (#1599)

* feat(babelfish): show user wallet in babelfish deposit and withdraw flows

* fix(babelfish): remove eth as native coin on rsk chain

* Fix/cross chain issue (#1606)

* add switchNetwork to wallet selector.

* #157-amount = bridge fee, disable withdraw/deposit

* handle defaults metamask switch network.

* fix PR comments.

* add warning to bridge widthraw amount selector.

* feat(babelbish): add posibility to use different block explorers for networks in LinkToExplorer component

Co-authored-by: Rick <[email protected]>
Co-authored-by: rick23p <[email protected]>

* finish landing page banner.

* fix landing page issues.

* add apy to amm pools.

* fix amm pool apy.

* fix apy issue in amm balance.

* [LendingPage] fix HistoryTable timestamp type mismatch (#1613)

* [LendingPage] fix HistoryTable timestamp type mismatch

* [LendingPage] change interface to represent api result

* fix ArbitrageOpportunity image.

* fix linkAsset issue in promotions.

* update origin fish banner title.

* Update testnet lockedSOV, AMM contract addresses

* Fix BNB amm testnet address

* [Lend] Fix profit display calculation

* add CryptocurrencyPrices component.

* fix TradingVolume data.

* [Staking] - update MAX Stake Length

* [Staking] - fix for date extending

* fix landing page responsive issues.

* fix PR comments.

* fix landing page promotion overflow.

* fix promotion center.

* [Landing] Update copy and links for promos

* [Buy SOV] Fix Lend CTA copy

* [Buy SOV] Remove unused imports/comment

* Feat/user wallet on babelfish (#1614)

* feat(babelfish): show user wallet in babelfish deposit and withdraw flows

* fix(babelfish): remove eth as native coin on rsk chain

* Fix/cross chain issue (#1606)

* add switchNetwork to wallet selector.

* #157-amount = bridge fee, disable withdraw/deposit

* handle defaults metamask switch network.

* fix PR comments.

* add warning to bridge widthraw amount selector.

* fix Stepper styles.

* fix babelfish not showing lines.

* change insufficientDaily text.

Co-authored-by: Victor Creed <[email protected]>
Co-authored-by: Victor Creed <[email protected]>

* cross chain responsive design improvements.

* Force rebuild

* Fix Buy Sov modal title

* Hide cross chain for release

* Fix/crypto price (#1634)

* improve priceChange in tables.

Co-authored-by: soulBit <[email protected]>

Co-authored-by: ShynRou <[email protected]>
Co-authored-by: rick23p <[email protected]>
Co-authored-by: tiltom <[email protected]>
Co-authored-by: bitcoinuser <[email protected]>
Co-authored-by: Pietro MaximOFF <[email protected]>
Co-authored-by: Victor Creed <[email protected]>
Co-authored-by: Victor Creed <[email protected]>
Co-authored-by: pietro-maximoff <[email protected]>
Co-authored-by: Rick <[email protected]>
Co-authored-by: Rytis Grincevičius <[email protected]>
Co-authored-by: boltsr <[email protected]>
Co-authored-by: Peiman Naderi <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants