m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #17472 from MetaMask/Version-v10.24.2

Browse Source 
Version v10.24.2 RC
This commit is contained in:
Dan J Miller 2023-01-30 17:21:16 -08:00 committed by GitHub
commit fdeb1e9dc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 79 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
## [10.24.2]
### Fixed
- Fix incorrect network information after switching networks when "Show balance and token price checker" is toggled off ([#17450](https://github.com/MetaMask/metamask-extension/pull/17450))
- Improve rendering time of signTypedData confirmation screens for large payloads ([#17432](https://github.com/MetaMask/metamask-extension/pull/17432))
## [10.24.1]
### Added
- Ensure app name appears for Taiwanese language speakers in the extension stores ([#17304](https://github.com/MetaMask/metamask-extension/pull/17304))
@ -3427,7 +3432,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Uncategorized
- Added the ability to restore accounts from seed words.
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.24.1...HEAD
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.24.2...HEAD
[10.24.2]: https://github.com/MetaMask/metamask-extension/compare/v10.24.1...v10.24.2
[10.24.1]: https://github.com/MetaMask/metamask-extension/compare/v10.24.0...v10.24.1
[10.24.0]: https://github.com/MetaMask/metamask-extension/compare/v10.23.3...v10.24.0
[10.23.3]: https://github.com/MetaMask/metamask-extension/compare/v10.23.2...v10.23.3

3
package.json
View File

@ -1,6 +1,6 @@
{
"name": "metamask-crx",
"version": "10.24.1",
"version": "10.24.2",
"private": true,
"repository": {
"type": "git",
@ -90,6 +90,7 @@
"**/redux-devtools-instrument/symbol-observable": "^2.0.3",
"**/rxjs/symbol-observable": "^2.0.3",
"analytics-node/axios": "^0.21.2",
"cookiejar": "^2.1.4",
"ganache-core/lodash": "^4.17.21",
"netmask": "^2.0.1",
"pubnub/superagent-proxy": "^3.0.0",

3
test/data/mock-state.json
View File

@ -74,7 +74,8 @@
"network": "5",
"provider": {
"type": "rpc",
"chainId": "0x5"
"chainId": "0x5",
"ticker": "ETH"
},
"keyrings": [
{

4
ui/components/app/transaction-activity-log/transaction-activity-log.container.test.js
View File

@ -18,6 +18,9 @@ describe('TransactionActivityLog container', () => {
conversionRate: 280.45,
nativeCurrency: 'ETH',
frequentRpcListDetail: [],
provider: {
ticker: 'ETH',
},
},
};
@ -43,6 +46,7 @@ describe('TransactionActivityLog container', () => {
],
provider: {
rpcUrl: 'https://customnetwork.com/',
ticker: 'ETH',
},
},
};

30
ui/components/ui/token-input/token-input.component.test.js
View File

@ -16,6 +16,9 @@ describe('TokenInput Component', () => {
metamask: {
currentCurrency: 'usd',
conversionRate: 231.06,
provider: {
ticker: 'ETH',
},
},
};
const store = configureMockStore()(mockStore);
@ -62,6 +65,9 @@ describe('TokenInput Component', () => {
const mockStore = {
metamask: {
currentCurrency: 'usd',
provider: {
ticker: 'ETH',
},
conversionRate: 231.06,
},
};
@ -106,6 +112,9 @@ describe('TokenInput Component', () => {
metamask: {
currentCurrency: 'usd',
conversionRate: 231.06,
provider: {
ticker: 'ETH',
},
},
};
const store = configureMockStore()(mockStore);
@ -152,6 +161,9 @@ describe('TokenInput Component', () => {
metamask: {
currentCurrency: 'usd',
conversionRate: 231.06,
provider: {
ticker: 'ETH',
},
},
};
const store = configureMockStore()(mockStore);
@ -200,6 +212,9 @@ describe('TokenInput Component', () => {
metamask: {
currentCurrency: 'usd',
conversionRate: 231.06,
provider: {
ticker: 'ETH',
},
},
};
const store = configureMockStore()(mockStore);
@ -262,6 +277,9 @@ describe('TokenInput Component', () => {
metamask: {
currentCurrency: 'usd',
conversionRate: 231.06,
provider: {
ticker: 'ETH',
},
},
};
const store = configureMockStore()(mockStore);
@ -315,6 +333,9 @@ describe('TokenInput Component', () => {
metamask: {
currentCurrency: 'usd',
conversionRate: 231.06,
provider: {
ticker: 'ETH',
},
},
};
const store = configureMockStore()(mockStore);
@ -370,6 +391,9 @@ describe('TokenInput Component', () => {
metamask: {
currentCurrency: 'usd',
conversionRate: 231.06,
provider: {
ticker: 'ETH',
},
},
};
const store = configureMockStore()(mockStore);
@ -425,6 +449,9 @@ describe('TokenInput Component', () => {
metamask: {
currentCurrency: 'usd',
conversionRate: 231.06,
provider: {
ticker: 'ETH',
},
},
};
const store = configureMockStore()(mockStore);
@ -472,6 +499,9 @@ describe('TokenInput Component', () => {
metamask: {
currentCurrency: 'usd',
conversionRate: 231.06,
provider: {
ticker: 'ETH',
},
},
};
const store = configureMockStore()(mockStore);

3
ui/ducks/confirm-transaction/confirm-transaction.duck.test.js
View File

@ -290,6 +290,9 @@ describe('Confirm Transaction Duck', () => {
metamask: {
conversionRate: 468.58,
currentCurrency: 'usd',
provider: {
ticker: 'ETH',
},
},
confirmTransaction: {
ethTransactionAmount: '1',

6
ui/ducks/metamask/metamask.js
View File

@ -10,6 +10,7 @@ import {
accountsWithSendEtherInfoSelector,
checkNetworkAndAccountSupports1559,
getAddressBook,
getUseCurrencyRateCheck,
} from '../../selectors';
import { updateTransactionGasFees } from '../../store/actions';
import { setCustomGasLimit, setCustomGasPrice } from '../gas/gas.duck';
@ -308,7 +309,10 @@ export function getConversionRate(state) {
}
export function getNativeCurrency(state) {
return state.metamask.nativeCurrency;
const useCurrencyRateCheck = getUseCurrencyRateCheck(state);
return useCurrencyRateCheck
? state.metamask.nativeCurrency
: state.metamask.provider.ticker;
}
export function getSendHexDataFeatureFlagState(state) {

16
ui/ducks/metamask/metamask.test.js
View File

@ -40,10 +40,12 @@ describe('MetaMask Reducers', () => {
currentBlockGasLimit: '0x4c1878',
conversionRate: 1200.88200327,
nativeCurrency: 'ETH',
useCurrencyRateCheck: true,
network: '5',
provider: {
type: 'testnet',
chainId: '0x5',
ticker: 'TestETH',
},
accounts: {
'0xfdea65c8e26263f6d9a1b5de9555d2931a33b825': {
@ -308,9 +310,21 @@ describe('MetaMask Reducers', () => {
});
describe('getNativeCurrency()', () => {
it('should return the ticker symbol of the selected network', () => {
it('should return nativeCurrency when useCurrencyRateCheck is true', () => {
expect(getNativeCurrency(mockState)).toStrictEqual('ETH');
});
it('should return the ticker symbol of the selected network when useCurrencyRateCheck is false', () => {
expect(
getNativeCurrency({
...mockState,
metamask: {
...mockState.metamask,
useCurrencyRateCheck: false,
},
}),
).toStrictEqual('TestETH');
});
});
describe('getSendHexDataFeatureFlagState()', () => {

5
ui/pages/send/gas-display/gas-display.js
View File

@ -67,9 +67,8 @@ export default function GasDisplay({ gasError }) {
);
const useCurrencyRateCheck = useSelector(getUseCurrencyRateCheck);
const { useNativeCurrencyAsPrimaryCurrency } = useSelector(getPreferences);
const { nativeCurrency, provider, unapprovedTxs } = useSelector(
(state) => state.metamask,
);
const { provider, unapprovedTxs } = useSelector((state) => state.metamask);
const nativeCurrency = provider.ticker;
const { confirmTransaction } = useSelector((state) => state);
const { txData } = confirmTransaction;
const { txParams = {} } = txData;

10
ui/pages/send/send-content/__snapshots__/send-content.component.test.js.snap
View File

@ -31,10 +31,8 @@ exports[`SendContent Component render should match snapshot 1`] = `
<div
class="send-v2__asset-dropdown__asset-icon"
>
<img
alt=""
class="identicon"
src="./images/eth_logo.svg"
<div
class="identicon__image-border"
style="height: 36px; width: 36px; border-radius: 18px;"
/>
</div>
@ -43,9 +41,7 @@ exports[`SendContent Component render should match snapshot 1`] = `
>
<div
class="send-v2__asset-dropdown__symbol"
>
ETH
</div>
/>
<div
class="send-v2__asset-dropdown__name"
>

3
ui/selectors/selectors.js
View File

@ -831,8 +831,9 @@ export const getMemoizedMetadataContractName = createDeepEqualSelector(
getTokenList,
(_tokenList, address) => address,
(tokenList, address) => {
const checksumHexAddress = toChecksumHexAddress(address);
const entry = Object.values(tokenList).find((identity) =>
isEqualCaseInsensitive(identity.address, toChecksumHexAddress(address)),
isEqualCaseInsensitive(identity.address, checksumHexAddress),
);
return entry && entry.name !== '' ? entry.name : '';
},

8
yarn.lock
View File

@ -9228,10 +9228,10 @@ cookie@0.4.0:
resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
cookiejar@^2.1.0, cookiejar@^2.1.1:
version "2.1.3"
resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.3.tgz#fc7a6216e408e74414b90230050842dacda75acc"
integrity sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==
cookiejar@^2.1.0, cookiejar@^2.1.1, cookiejar@^2.1.4:
version "2.1.4"
resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz#ee669c1fea2cf42dc31585469d193fef0d65771b"
integrity sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==
cookies@~0.8.0:
version "0.8.0"