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/HLS/Staking/Table/Columns/Manage.tsx
#	src/components/Modals/HLS/Deposit/index.tsx
#	src/components/Modals/HLS/Deposit/useStakingController.tsx
#	src/components/Modals/HLS/Manage/ChangeLeverage.tsx
#	src/components/Modals/HLS/Manage/Deposit.tsx
#	src/components/Modals/HLS/Manage/index.tsx
#	src/components/Modals/HLS/index.tsx
#	src/components/Tooltip/index.tsx
#	src/hooks/useUpdatedAccount/index.ts
#	src/store/slices/broadcast.ts
#	src/types/interfaces/store/broadcast.d.ts
This commit is contained in:
Linkie Link 2023-11-12 13:32:57 +01:00
commit 964c82e8d2
No known key found for this signature in database
GPG Key ID: 5318B0F2564D38EA
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Modals/HLS/Manage/Deposit.tsx
View File

@ -185,7 +185,7 @@ export default function Deposit(props: Props) {
maxText='In Wallet'
/>
<Divider className='my-6' />
<div className='flex flex-wrap flex-1 items-center justify-between'>
<div className='flex flex-wrap items-center justify-between flex-1'>
<div>
<Text className='w-full mb-1'>Keep leverage</Text>
<Text size='xs' className='text-white/50'>

1
src/constants/assets.ts
View File

@ -154,6 +154,7 @@ export const ASSETS: Asset[] = [
isBorrowEnabled: true,
isAutoLendEnabled: true,
pythPriceFeedId: 'eaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
pythHistoryFeedId: 'Crypto.USDC/USD',
poolId: ENV.NETWORK === NETWORK.DEVNET ? 678 : 1221,
pythHistoryFeedId: 'Crypto.USDC/USD',
},

1
src/hooks/useUpdatedAccount/index.ts
View File

@ -41,6 +41,7 @@ export function useUpdatedAccount(account?: Account) {
const [removedLends, removeLends] = useState<BNCoin[]>([])
const [addedTrades, addTrades] = useState<BNCoin[]>([])
const [leverage, setLeverage] = useState<number>(0)
const removeDepositAndLendsByDenom = useCallback(
(denom: string) => {
if (!account) return

7
validate-env.js
View File

@ -36,8 +36,11 @@ if (!process.env.NEXT_PUBLIC_VAULT_APR) {
if (!process.env.NEXT_PUBLIC_PARAMS) {
throw 'NEXT_PUBLIC_PARAMS is not defined'
}
if (!process.env.NEXT_PUBLIC_CANDLES_ENDPOINT) {
throw 'NEXT_PUBLIC_CANDLES_ENDPOINT is not defined'
if (!process.env.NEXT_PUBLIC_CANDLES_ENDPOINT_PYTH) {
throw 'NEXT_PUBLIC_CANDLES_ENDPOINT_PYTH is not defined'
}
if (!process.env.NEXT_PUBLIC_CANDLES_ENDPOINT_THE_GRAPH) {
throw 'NEXT_PUBLIC_CANDLES_ENDPOINT_THE_GRAPH is not defined'
}
if (!process.env.CHARTING_LIBRARY_USERNAME) {
throw 'CHARTING_LIBRARY_USERNAME is not defined'