Skip to content

Commit

Permalink
Merge pull request #308 from lidofinance/develop
Browse files Browse the repository at this point in the history
Merge develop to main
  • Loading branch information
jake4take authored Mar 26, 2024
2 parents f411c31 + 06429db commit 45b7faf
Show file tree
Hide file tree
Showing 7 changed files with 189 additions and 6 deletions.
87 changes: 86 additions & 1 deletion assets/icons/l2-swap-dark.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
87 changes: 86 additions & 1 deletion assets/icons/l2-swap-light.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export const RPCAvailabilityCheckResultBox = () => {
return (
<Wrap>
<Text weight={700} size="xs" color="accentContrast">
You are currently using the IPFS widget&apos;s version.
You are currently using the IPFS widget version.
</Text>
<LinkArrow href={IPFS_INFO_URL}>What is IPFS</LinkArrow>
{isRPCAvailable && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ const dexWithdrawalMap: DexWithdrawalIntegrationMap = {
link: (amount, token) =>
`https://bebop.xyz/trade?network=ethereum&buy=0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE&sell=${getAddress(
getTokenAddress(CHAINS.Mainnet, token),
)}&sellAmounts=${formatEther(amount)}`,
)}&sellAmounts=${formatEther(amount)}&source=lido`,
},
} as const;

Expand Down
14 changes: 13 additions & 1 deletion features/wsteth/wrap/hooks/use-wrap-tx-processing.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ import { useCurrentStaticRpcProvider } from 'shared/hooks/use-current-static-rpc
import { getFeeData } from 'utils/getFeeData';

import type { WrapFormInputType } from '../wrap-form-context';
import { applyGasLimitRatio } from 'features/stake/stake-form/utils';
import {
MockLimitReachedError,
applyGasLimitRatio,
} from 'features/stake/stake-form/utils';

import { enableQaHelpers } from 'utils/qa';

export const getGasParameters = async (
provider: StaticJsonRpcBatchProvider,
Expand Down Expand Up @@ -48,6 +53,13 @@ export const useWrapTxProcessing = () => {
);
}
} else {
if (
enableQaHelpers &&
window.localStorage.getItem('mockLimitReached') === 'true'
) {
throw new MockLimitReachedError('Stake limit reached');
}

const wstethTokenAddress = getTokenAddress(chainId, TOKENS.WSTETH);
if (isMultisig) {
return providerWeb3.getSigner().sendUncheckedTransaction({
Expand Down
2 changes: 1 addition & 1 deletion shared/banners/l2-banner/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const Wrapper = styled.div`

export const L2Icons = styled.div`
display: block;
width: 188px;
width: 214px;
height: 32px;
background-image: url(${({ theme }) =>
theme.name === 'dark' ? IconsDark : IconsLight});
Expand Down
1 change: 1 addition & 0 deletions utils/get-bebop-rate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const getBebopRate = async (
taker_address: ESTIMATE_ACCOUNT,
sell_amounts: amount.toString(),
approval_type: 'Standard',
source: 'lido',
});

const data = await standardFetcher<BebopGetQuotePartial>(
Expand Down

0 comments on commit 45b7faf

Please sign in to comment.