LaconicNetwork/mars-v2-frontend
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/mars-protocol/mars-v2-frontend into develop

Browse Source 
# Conflicts:
#	src/components/Trade/TradeChart/OsmosisTheGraphDataFeed.ts
This commit is contained in:
Linkie Link 2023-10-14 18:09:22 +02:00
commit a507e9060c
No known key found for this signature in database
GPG Key ID: 5318B0F2564D38EA
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Earn/Farm/FarmIntro.tsx
View File

@ -28,7 +28,7 @@ export default function FarmIntro() {
leftIcon={<PlusSquared />} leftIcon={<PlusSquared />}
onClick={(e) => { onClick={(e) => {
e.preventDefault() e.preventDefault()
window.open(DocURL.ROVER_INTRO_URL, '_blank') window.open(DocURL.FARM_INTRO_URL, '_blank')
}} }}
color='secondary' color='secondary'
/> />

1
src/types/enums/docURL.ts
View File

@ -3,6 +3,7 @@ export enum DocURL {
BORROW_LENDING_URL = 'https://docs.marsprotocol.io/docs/learn/mars-v2/borrow', BORROW_LENDING_URL = 'https://docs.marsprotocol.io/docs/learn/mars-v2/borrow',
COOKIE_POLICY_URL = 'https://docs.marsprotocol.io/docs/overview/legal/cookie-policy', COOKIE_POLICY_URL = 'https://docs.marsprotocol.io/docs/overview/legal/cookie-policy',
DOCS_URL = 'https://docs.marsprotocol.io/', DOCS_URL = 'https://docs.marsprotocol.io/',
FARM_INTRO_URL = 'https://docs.marsprotocol.io/docs/learn/tutorials/farming/farming-intro',
MANAGE_ACCOUNT_URL = 'https://docs.marsprotocol.io/docs/learn/tutorials/credit-accounts/credit-accounts-intro', MANAGE_ACCOUNT_URL = 'https://docs.marsprotocol.io/docs/learn/tutorials/credit-accounts/credit-accounts-intro',
ROVER_INTRO_URL = 'https://docs.marsprotocol.io/docs/learn/mars-v2/credit-accounts', ROVER_INTRO_URL = 'https://docs.marsprotocol.io/docs/learn/mars-v2/credit-accounts',
PRIVACY_POLICY_URL = 'https://docs.marsprotocol.io/docs/overview/legal/privacy-policy', PRIVACY_POLICY_URL = 'https://docs.marsprotocol.io/docs/overview/legal/privacy-policy',