Skip to content

Commit

Permalink
Merge pull request leapwallet#73 from leapwallet/release-20240729-055842
Browse files Browse the repository at this point in the history
Release release-20240729-055842
  • Loading branch information
asanjeevrao authored Jul 29, 2024
2 parents ae830c8 + c5bf50a commit 22c1a6b
Show file tree
Hide file tree
Showing 103 changed files with 5,706 additions and 365 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,3 @@ apps/extension/.env.development.compass
.zed
.zed
apps/extension/staging-builds
apps/extension/src/components/header/header.tsx
1 change: 1 addition & 0 deletions apps/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
leap-cosmos-mobile/
demo
.DS_Store
1 change: 1 addition & 0 deletions apps/extension/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ canary-builds
canary-builds.zip
builds.zip
coverage
.DS_Store
2 changes: 1 addition & 1 deletion apps/extension/public/base_manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 3,
"name": "__NAME__",
"description": "__DESCRIPTION__",
"version": "0.13.0",
"version": "0.13.3",
"options_page": "index.html",
"web_accessible_resources": [
{
Expand Down
2 changes: 1 addition & 1 deletion apps/extension/public/compass/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 3,
"name": "Compass Wallet for Sei",
"description": "A crypto wallet for Sei Blockchain, brought to you by the Leap Wallet team.",
"version": "0.13.0",
"version": "0.13.3",
"options_page": "index.html",
"web_accessible_resources": [
{
Expand Down
2 changes: 1 addition & 1 deletion apps/extension/public/leap-cosmos/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 3,
"name": "Leap Cosmos Wallet",
"description": "A crypto wallet for Cosmos blockchains.",
"version": "0.13.0",
"version": "0.13.3",
"options_page": "index.html",
"web_accessible_resources": [
{
Expand Down
2 changes: 2 additions & 0 deletions apps/extension/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
useInitBetaNFTsCollections,
useInitChainCosmosSDK,
useInitChainInfosConfig,
useInitChainsApr,
useInitCoingeckoPrices,
useInitCompassSeiEvmConfig,
useInitCustomChannelsStore,
Expand Down Expand Up @@ -75,6 +76,7 @@ export default function App() {
useInitTheme()
useInitiateCurrencyPreference()
useInitCoingeckoPrices()
useInitChainsApr()

useInitHideAssets()
useInitHideSmallBalances()
Expand Down
20 changes: 19 additions & 1 deletion apps/extension/src/Routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ const Send = React.lazy(() => import('pages/send-v2'))
const Buy = React.lazy(() => import('pages/buy'))
const Sign = React.lazy(() => import('pages/sign/sign-transaction'))
const SignSeiEvm = React.lazy(() => import('pages/sign-sei-evm/SignSeiEvmTransaction'))
const Stake = React.lazy(() => import('pages/stake'))
const Stake = React.lazy(() => import('pages/stake-v2'))
const StakeInputPage = React.lazy(() => import('pages/stake-v2/StakeInputPage'))
const StakeTxnPage = React.lazy(() => import('pages/stake-v2/StakeTxnPage'))
const CancelUndelegation = React.lazy(() => import('pages/stake/CancelUndelegation'))
const ChooseValidator = React.lazy(() => import('pages/stake/ChooseValidator'))
const ValidatorDetails = React.lazy(() => import('pages/stake/ValidatorDetails'))
Expand Down Expand Up @@ -146,6 +148,14 @@ export default function AppRoutes(): JSX.Element {
</RequireAuth>
}
/>
<Route
path='stakeInput'
element={
<RequireAuth>
<StakeInputPage />
</RequireAuth>
}
/>
<Route
path='stakeValidatorDetails'
element={
Expand Down Expand Up @@ -330,6 +340,14 @@ export default function AppRoutes(): JSX.Element {
</RequireAuth>
}
/>
<Route
path='stake-pending-txn'
element={
<RequireAuth>
<StakeTxnPage />
</RequireAuth>
}
/>
<Route
path='manage-tokens'
element={
Expand Down
76 changes: 0 additions & 76 deletions apps/extension/src/components/Header/NewChainSupportTooltip.tsx

This file was deleted.

85 changes: 0 additions & 85 deletions apps/extension/src/components/Header/PageHeader.tsx

This file was deleted.

2 changes: 0 additions & 2 deletions apps/extension/src/components/Header/index.ts

This file was deleted.

32 changes: 32 additions & 0 deletions apps/extension/src/components/Skeletons/StakeSkeleton.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
import React from 'react'
import Skeleton from 'react-loading-skeleton'

export function AmountCardSkeleton() {
return (
<div className='flex rounded-2xl bg-white-100 dark:bg-gray-950 gap-y-4 flex-col p-4 w-full'>
<Skeleton count={1} width={100} height={16} />
<div>
<Skeleton count={1} width={50} height={30} />
<Skeleton count={1} width={75} height={20} />
</div>
<Skeleton count={1} borderRadius={16} height={70} />
</div>
)
}

export default function StakeCardSkeleton() {
return (
<div className='flex-1 p-7 gap-y-4 min-w-[344px]'>
Expand All @@ -10,3 +23,22 @@ export default function StakeCardSkeleton() {
</div>
)
}

export function YouStakeSkeleton() {
return (
<div className='flex rounded-2xl bg-white-100 dark:bg-gray-950 gap-y-1.5 flex-col p-4 w-full'>
<Skeleton width={100} height={20} />
<Skeleton width={336} height={40} />
<Skeleton width={100} height={24} />
</div>
)
}

export function ValidatorItemSkeleton() {
return (
<div className='flex items-center px-4 py-3 bg-white-100 dark:bg-gray-950 w-full rounded-2xl gap-x-4'>
<Skeleton circle={true} width={28} height={28} className='!z-0' />
<Skeleton count={1} width={100} height={16} className='!z-0' />
</div>
)
}
26 changes: 26 additions & 0 deletions apps/extension/src/components/Skeletons/ValidatorListSkeleton.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import React from 'react'
import Skeleton from 'react-loading-skeleton'

export function ValidatorListItemSkeleton() {
return (
<div className='flex items-center px-4 py-3 bg-white-100 dark:bg-gray-900 w-full rounded-2xl my-2'>
<Skeleton circle={true} width={28} height={28} className='z-0' />
<div className='w-[120px] ml-2'>
<Skeleton count={1} className='z-0' />
<Skeleton count={1} className='z-0' />
</div>
</div>
)
}

export default function ValidatorListSkeleton() {
return (
<>
<ValidatorListItemSkeleton />
<ValidatorListItemSkeleton />
<ValidatorListItemSkeleton />
<ValidatorListItemSkeleton />
<ValidatorListItemSkeleton />
</>
)
}
2 changes: 1 addition & 1 deletion apps/extension/src/components/bottom-nav/BottomNav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ export default function BottomNav({ label, disabled: disabledAll }: BottomNavPro
{
label: BottomNavLabel.Stake,
icon: 'monetization_on',
path: '/stake',
path: '/stake?pageSource=bottomNav',
show: true,
disabled: activeChainInfo?.disableStaking,
shouldRedirect: activeChain === 'initia',
Expand Down
10 changes: 3 additions & 7 deletions apps/extension/src/components/gas-price-options/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -226,16 +226,12 @@ const GasPriceOptions = ({
}

if (hasToCalculateDynamicFee && feeTokenData) {
let isIbcDenom = false
let feeDenom = feeTokenData.denom?.coinMinimalDenom ?? ''
if (feeTokenData.ibcDenom?.toLowerCase().startsWith('ibc/')) {
isIbcDenom = true
feeDenom = feeTokenData.ibcDenom ?? feeDenom
}

const gasPriceStep = await getFeeMarketGasPricesSteps(
feeTokenData.denom?.coinMinimalDenom ?? '',
feeTokenData.gasPriceStep,
isIbcDenom,
)
const gasPriceStep = await getFeeMarketGasPricesSteps(feeDenom, feeTokenData.gasPriceStep)
setFeeTokenData(() => ({ ...feeTokenData, gasPriceStep: gasPriceStep }))
}
}
Expand Down
7 changes: 3 additions & 4 deletions apps/extension/src/components/gas-price-options/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,14 @@ export async function updateFeeTokenData({
captureException(error)
}
} else if (hasToCalculateDynamicFee && foundFeeTokenData) {
let isIbcDenom = false
let feeDenom = foundFeeTokenData.denom?.coinMinimalDenom ?? ''
if (foundFeeTokenData.ibcDenom?.toLowerCase().startsWith('ibc/')) {
isIbcDenom = true
feeDenom = foundFeeTokenData.ibcDenom ?? feeDenom
}

const gasPriceStep = await getFeeMarketGasPricesSteps(
foundFeeTokenData.denom?.coinMinimalDenom ?? '',
feeDenom,
foundFeeTokenData.gasPriceStep,
isIbcDenom,
)

feeTokenDataToSet = { ...foundFeeTokenData, gasPriceStep }
Expand Down
Loading

0 comments on commit 22c1a6b

Please sign in to comment.