Merge dev to master #177
Merged
Merge dev to master #177
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # yarn.lock
# Conflicts: # yarn.lock
# Conflicts: # package.json
# Conflicts: # public/locales/en.json
Move messages to JSON on swap page
# Conflicts: # public/locales/en.json
Hotfix/preformance improve
# Conflicts: # package.json
Move text messages of landing page to JSON and remove unnecessary text messages
# Conflicts: # src/components/AreaChart/AreaChart.tsx # src/components/TransactionsTable/TransactionsTable.tsx # src/pages/AnalyticsPage/AnalyticsLiquidityChart.tsx # src/pages/AnalyticsPairDetails/AnalyticsPairChart.tsx # src/pages/AnalyticsTokenDetails/AnalyticsTokenChart.tsx # src/pages/FarmPage/FarmPage.tsx # src/pages/FarmPage/FarmRewards.tsx # src/pages/FarmPage/FarmsList.tsx # src/pages/LandingPage/BuyFiatSection.tsx # src/pages/LandingPage/HeroSection.tsx # src/pages/LandingPage/SwapSection.tsx # src/pages/LandingPage/TradingInfo.tsx # src/pages/PoolsPage/PoolsPage.tsx # src/pages/PoolsPage/SupplyLiquidity.tsx # src/pages/PoolsPage/YourLiquidityPools.tsx # src/pages/SwapPage/LiquidityPoolRow.tsx # src/pages/SwapPage/LiquidityPools.tsx # src/pages/SwapPage/SwapInfoTx.tsx # src/pages/SwapPage/SwapMain.tsx # src/pages/SwapPage/SwapPage.tsx # src/pages/SwapPage/SwapProChartTrade.tsx # src/pages/SwapPage/SwapProFilter.tsx # src/pages/SwapPage/SwapProInfo.tsx
Separate css styles
Move text messages of dragons page to JSON
# Conflicts: # public/locales/en.json
vJune11.refactoring
Move text messages on analytics pages to JSON
Deploying with
|
| Latest commit: |
05a8e07
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://d072a53e.interface-v2.pages.dev |
FriskyHamTitz
approved these changes
Jun 2, 2022
FriskyHamTitz
added
the
Passed PR Review
sameepsi
approved these changes
Jun 6, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.