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.

Sign up for GitHub

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

Jump to bottom

Merge main into dev #2608

Merged
merged 3 commits into from
Jul 15, 2023
Merged

Merge main into dev #2608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36efa20
v7.4.1
platschi Jul 13, 2023
e8efa5f
v7.4.2
platschi Jul 14, 2023
9426c4a
V7.4.2 (#2607)
LeifuChen Jul 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion packages/app/src/queries/rates/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@

export const FOREX_BASE_API_URL = 'https://api.exchangerate.host/latest'

export const DEFAULT_PYTH_TV_ENDPOINT = 'https://pyth-api.vintage-orange-muffin.com/v2/history'
export const DEFAULT_PYTH_TV_ENDPOINT =

Check warning on line 6 in packages/app/src/queries/rates/constants.ts

View check run for this annotation

Codecov / codecov/patch

packages/app/src/queries/rates/constants.ts#L6 

Added line #L6 was not covered by tests
'https://benchmarks.pyth.network/v1/shims/tradingview/history'
8 changes: 8 additions & 0 deletions packages/app/src/sections/dashboard/Stake/EscrowTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
selectStakedEscrowedKwentaBalanceV2,
selectTotalVestable,
selectTotalVestableV2,
selectUnstakedEscrowedKwentaBalance,
} from 'state/staking/selectors'
import media from 'styles/media'

Expand All @@ -24,6 +25,7 @@ const EscrowTab = () => {
const apyV2 = useAppSelector(selectAPYV2)
const stakedEscrowedKwentaBalance = useAppSelector(selectStakedEscrowedKwentaBalance)
const stakedEscrowedKwentaBalanceV2 = useAppSelector(selectStakedEscrowedKwentaBalanceV2)
const unstakedEscrowedKwentaBalance = useAppSelector(selectUnstakedEscrowedKwentaBalance)
const totalVestable = useAppSelector(selectTotalVestable)
const totalVestableV2 = useAppSelector(selectTotalVestableV2)

Expand Down Expand Up @@ -57,6 +59,11 @@ const EscrowTab = () => {
title: t('dashboard.stake.portfolio.escrow.staked'),
value: formatNumber(stakedEscrowedKwentaBalance, { suggestDecimals: true }),
},
{
key: 'staking-v1-staked',
title: t('dashboard.stake.portfolio.escrow.unstaked'),
value: formatNumber(unstakedEscrowedKwentaBalance, { suggestDecimals: true }),
},
{
key: 'staking-v1-vestable',
title: t('dashboard.stake.portfolio.escrow.vestable'),
Expand All @@ -72,6 +79,7 @@ const EscrowTab = () => {
t,
totalVestable,
totalVestableV2,
unstakedEscrowedKwentaBalance,
]
)

Expand Down
19 changes: 11 additions & 8 deletions packages/app/src/sections/shared/Layout/AppLayout/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { FC } from 'react'
import styled from 'styled-components'

import { FlexDivCol } from 'components/layout/flex'
import { MobileHiddenView } from 'components/Media'

import Banner from '../../HomeLayout/Banner'
Expand All @@ -12,14 +13,16 @@ import WalletButtons from './WalletButtons'
const Header: FC = () => {
return (
<MobileHiddenView>
<Container>
<LogoNav>
<Logo />
<Nav />
</LogoNav>
<WalletButtons />
</Container>
<Banner />
<FlexDivCol>
<Container>
<LogoNav>
<Logo />
<Nav />
</LogoNav>
<WalletButtons />
</Container>
<Banner />
</FlexDivCol>
</MobileHiddenView>
)
}
Expand Down
1 change: 1 addition & 0 deletions packages/app/src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,7 @@
"title-v2": "Escrow V2",
"title-v1": "Escrow V1",
"staked": "Staked",
"unstaked": "Unstaked",
"vestable": "Vestable"
},
"rewards": {
Expand Down
Loading