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.

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

Release 2023-04-04 #3035

Merged
merged 35 commits into from
Apr 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
75fa6af
fix: filter out corrupted accounts and continue wallet-migration
hcho112 Mar 2, 2023
7d01870
Merge pull request #3016 from near/wallet-migration-corrupt-accounts-fix
hcho112 Mar 5, 2023
6b10eab
fix: use accountWithDetails
andy-haynes Mar 6, 2023
85376d1
fix: set NETWORK_ID to a real value
andy-haynes Mar 6, 2023
200ee92
Merge pull request #3017 from near/fix/transfer-ignore-deleted-accounts
andy-haynes Mar 6, 2023
a0677f3
feat: added more partners on buy page
hcho112 Mar 14, 2023
52e5558
feat: removed unwanted partners
hcho112 Mar 19, 2023
88458f3
feat: remove okex from partners list
hcho112 Mar 19, 2023
2ba6251
feat: update banxa and alchemypay link url
hcho112 Mar 20, 2023
de27f7b
fix: remove test wallet name
hcho112 Mar 20, 2023
ab39165
Merge pull request #3019 from near/buy-page-update
hcho112 Mar 22, 2023
61aaa58
fix: filename case bug fix
hcho112 Mar 23, 2023
192e954
Merge pull request #3022 from near/buy-page-update
andy-haynes Mar 23, 2023
caf8125
feat: minor link update on buy page
hcho112 Mar 26, 2023
5cc545e
chore: update @near-wallet-selector package to 7.9.2
hcho112 Mar 27, 2023
3e3760c
feat: handling error upon migrating accounts that are all invalid
hcho112 Mar 27, 2023
4e56a08
fix: Allow to re-open wallet-migration account export modal
hcho112 Mar 27, 2023
d5be4db
fix: During the route change, close account-export modal with minor u…
hcho112 Mar 27, 2023
97a6ce0
fix: handling implicit account character ellipsis
hcho112 Mar 27, 2023
1f9c9ae
fix: Replacing the button label to next
hcho112 Mar 28, 2023
1108ef4
fix: implicit account text overflow on clean key step
hcho112 Mar 28, 2023
c908c53
NODE_URL for development to be consistent with near-cli #3028
Mar 28, 2023
3b6c68d
fix: replace the button lable to contniue
hcho112 Mar 28, 2023
8e51f41
Merge pull request #3030 from near/ONB-42
hcho112 Mar 28, 2023
6fcae6f
Merge pull request #3025 from near/ONB-40
andy-haynes Mar 29, 2023
9b6c5d2
Merge pull request #3029 from soonnear/master
andy-haynes Mar 29, 2023
c93b566
fix: sending correct private key on export to another wallet
hcho112 Mar 29, 2023
4dd2371
chore: syntax improvement
hcho112 Mar 29, 2023
8ac57c3
Merge pull request #3031 from near/account-export-wrong-key
andy-haynes Mar 29, 2023
228e062
Merge pull request #3023 from near/buy-page-update-2
andy-haynes Mar 29, 2023
2106801
Merge pull request #3024 from near/wallet-migration-ux-improvements
andy-haynes Mar 29, 2023
e5270cd
feat: wallet-migration related ux bug fix and improvements
hcho112 Mar 31, 2023
debe3b6
Merge pull request #3033 from near/wallet-migration-ux-improvements2
andy-haynes Mar 31, 2023
585f9a8
feat: preemptively delete 2FA keys, ignoring failures from too recent…
andy-haynes Apr 3, 2023
e6b905c
Merge pull request #3034 from near/feat/preemptive-request-delete
andy-haynes Apr 5, 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
38 changes: 19 additions & 19 deletions packages/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,25 @@
},
"dependencies": {
"@ledgerhq/hw-transport-u2f": "^5.34.0",
"@near-wallet-selector/account-export": "^7.8.2",
"@near-wallet-selector/coin98-wallet": "^7.8.2",
"@near-wallet-selector/core": "^7.8.2",
"@near-wallet-selector/default-wallets": "^7.8.2",
"@near-wallet-selector/here-wallet": "^7.8.2",
"@near-wallet-selector/ledger": "^7.8.2",
"@near-wallet-selector/math-wallet": "^7.8.2",
"@near-wallet-selector/meteor-wallet": "^7.8.2",
"@near-wallet-selector/modal-ui": "^7.8.2",
"@near-wallet-selector/my-near-wallet": "^7.8.2",
"@near-wallet-selector/near-wallet": "^7.8.2",
"@near-wallet-selector/nearfi": "^7.8.2",
"@near-wallet-selector/neth": "^7.8.2",
"@near-wallet-selector/nightly": "^7.8.2",
"@near-wallet-selector/nightly-connect": "^7.8.2",
"@near-wallet-selector/opto-wallet": "^7.8.2",
"@near-wallet-selector/sender": "^7.8.2",
"@near-wallet-selector/wallet-connect": "^7.8.2",
"@near-wallet-selector/welldone-wallet": "^7.8.2",
"@near-wallet-selector/account-export": "^7.9.2",
"@near-wallet-selector/coin98-wallet": "^7.9.2",
"@near-wallet-selector/core": "^7.9.2",
"@near-wallet-selector/default-wallets": "^7.9.2",
"@near-wallet-selector/here-wallet": "^7.9.2",
"@near-wallet-selector/ledger": "^7.9.2",
"@near-wallet-selector/math-wallet": "^7.9.2",
"@near-wallet-selector/meteor-wallet": "^7.9.2",
"@near-wallet-selector/modal-ui": "^7.9.2",
"@near-wallet-selector/my-near-wallet": "^7.9.2",
"@near-wallet-selector/near-wallet": "^7.9.2",
"@near-wallet-selector/nearfi": "^7.9.2",
"@near-wallet-selector/neth": "^7.9.2",
"@near-wallet-selector/nightly": "^7.9.2",
"@near-wallet-selector/nightly-connect": "^7.9.2",
"@near-wallet-selector/opto-wallet": "^7.9.2",
"@near-wallet-selector/sender": "^7.9.2",
"@near-wallet-selector/wallet-connect": "^7.9.2",
"@near-wallet-selector/welldone-wallet": "^7.9.2",
"@near-wallet/feature-flags": "^0.2.0",
"@reduxjs/toolkit": "1.6.2",
"@sentry/browser": "^6.4.1",
Expand Down
8 changes: 7 additions & 1 deletion packages/frontend/src/components/Routing.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ import { StakingContainer } from './staking/StakingContainer';
import Swap from './swap/Swap';
import Terms from './terms/Terms';
import '../index.css';
import WalletMigration from './wallet-migration/WalletMigration';
import { getMigrationStep } from './wallet-migration/utils';
import WalletMigration, { WALLET_MIGRATION_VIEWS } from './wallet-migration/WalletMigration';
const { fetchTokenFiatValues, getTokenWhiteList } = tokenFiatValueActions;

const {
Expand Down Expand Up @@ -305,6 +306,11 @@ class Routing extends Component {
handleTransferClick = () => {

this.setState({ openTransferPopup: true });
const migrationStep = getMigrationStep();

if (window?.ExportModal?.show && ![WALLET_MIGRATION_VIEWS.LOG_OUT, WALLET_MIGRATION_VIEWS.VERIFYING].includes(migrationStep)) {
window?.ExportModal?.show();
}
}

closeTransferPopup = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
import React from 'react';
import { Translate } from 'react-localize-redux';
import styled from 'styled-components';

import Container from '../../../common/styled/Container.css';
import SetupSeedPhraseForm from '../../SetupSeedPhraseForm';

const AccountIdContainer = styled.div`
overflow: hidden;
text-overflow: ellipsis;
font-weight: 800;
`;

export default ({
passPhrase,
refreshPhrase,
Expand All @@ -16,7 +23,7 @@ export default ({
<Container className='small-centered border' style={style}>
<h1><Translate id='setupSeedPhrase.pageTitle' /></h1>
{
accountId && (<h2><b>{accountId}</b></h2>)
accountId && (<h2><AccountIdContainer>{accountId}</AccountIdContainer></h2>)
}
<h2><Translate id='setupSeedPhrase.pageText' /></h2>
<SetupSeedPhraseForm
Expand Down
28 changes: 26 additions & 2 deletions packages/frontend/src/components/buy/BuyNear.js
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,32 @@ export function BuyNear({ match, location, history }) {
isWhitelabel ? PayMethods.transak : null,
PayMethods.utorg,
PayMethods.nearPay,
PayMethods.onRamper,
PayMethods.mercuryo,
PayMethods.banxa,
PayMethods.alchemyPay,

].filter((v) => !!v);

const bridgeMethods = [
PayMethods.rainbow,
PayMethods.allbridge,
PayMethods.wormhole,
PayMethods.multichain,
];

const exchangeMethods = [
PayMethods.binance,
PayMethods.binanceUs,
PayMethods.huobi,
PayMethods.kraken,
PayMethods.coinbase,
PayMethods.okx,
PayMethods.bitstamp,
PayMethods.upbit,
PayMethods.coinDCX,
];

return (
<StyledContainer>
<FormButton
Expand All @@ -245,15 +269,15 @@ export function BuyNear({ match, location, history }) {
<FundingCard
title='buyNear.bridgeTokens'
subTitle='buyNear.bridgeSubTitle'
actions={[PayMethods.rainbow]}
actions={bridgeMethods}
/>
<FundingCard title='buyNear.supportedExchanges'
subTitle='buyNear.supportedSubTitle'
link={{
url: 'https://coinmarketcap.com/currencies/near-protocol/markets/',
title: 'buyNear.coinMarketLink'
}}
actions={[PayMethods.okex, PayMethods.binance, PayMethods.huobi, PayMethods.kraken]}
actions={exchangeMethods}
/>
</div>
</StyledContainer>
Expand Down
10 changes: 9 additions & 1 deletion packages/frontend/src/components/buy/FundingType.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@ const Button = styled.div`

const WrapperImg = styled.div`
display: flex;
min-width: 110px;
`;

const Image = styled.img`
height: 20px;
max-width: 150px;
${({ blackBackground }) => blackBackground && 'background: black;'}
`;

export const FundingType = ({
Expand All @@ -56,6 +63,7 @@ export const FundingType = ({
track,
disabled,
provideReferrer,
blackBackground = false,
}) => {
return (
<LinkWrap
Expand All @@ -67,7 +75,7 @@ export const FundingType = ({
>
<Wrapper>
<WrapperImg title={name}>
<img src={icon} alt={name} />
<Image src={icon} alt={name} blackBackground={blackBackground} />
</WrapperImg>
{disabled ? null : <Button />}
</Wrapper>
Expand Down
16 changes: 16 additions & 0 deletions packages/frontend/src/components/buy/assets/alchemyPay.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions packages/frontend/src/components/buy/assets/allBridge.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions packages/frontend/src/components/buy/assets/banxa.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading