Fixing changelog

CHANGELOG.md

@@ -2222,8 +2222,6 @@ 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/v9.4.0...HEAD
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v9.3.0...HEAD
 [Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v9.5.0...HEAD
 [9.5.0]: https://github.com/MetaMask/metamask-extension/compare/v9.4.0...v9.5.0
 [9.4.0]: https://github.com/MetaMask/metamask-extension/compare/v9.3.0...v9.4.0

lavamoat/node/policy.json

@@ -223,6 +223,11 @@
         "js-tokens": true
       }
     },
+    "@babel/parser": {
+      "globals": {
+        "BigInt": true
+      }
+    },
     "@babel/plugin-proposal-async-generator-functions": {
       "packages": {
         "@babel/core": true,
@@ -869,6 +874,7 @@
     },
     "acorn": {
       "globals": {
+        "BigInt": true,
         "define": true
       }
     },
@@ -878,6 +884,9 @@
       }
     },
     "acorn-node": {
+      "globals": {
+        "BigInt": true
+      },
       "packages": {
         "acorn": true,
         "acorn-dynamic-import": true,
@@ -1661,7 +1670,10 @@
     "es-abstract": {
       "globals": {
         "AggregateError": true,
+        "Atomics": true,
+        "BigInt": true,
         "FinalizationRegistry": true,
+        "SharedArrayBuffer": true,
         "WeakRef": true
       },
       "packages": {
@@ -3078,6 +3090,7 @@
         "util.inspect": true
       },
       "globals": {
+        "BigInt": true,
         "HTMLElement": true
       }
     },

ui/components/app/dropdowns/network-dropdown.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
-import { mountWithRouter } from '../../../../../test/lib/render-helpers';
+import { mountWithRouter } from '../../../../test/lib/render-helpers';
 import ColorIndicator from '../../ui/color-indicator';
 import NetworkDropdown from './network-dropdown';
 import { DropdownMenuItem } from './dropdown';

ui/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container-container.test.js

@@ -21,7 +21,7 @@ jest.mock('react-redux', () => ({
   },
 }));
 
-jest.mock('../../../../../app/selectors', () => ({
+jest.mock('../../../../selectors', () => ({
   getBasicGasEstimateLoadingStatus: (s) =>
     `mockBasicGasEstimateLoadingStatus:${Object.keys(s).length}`,
   getRenderableBasicEstimateData: (s) =>
@@ -42,20 +42,20 @@ jest.mock('../../../../../app/selectors', () => ({
   isCustomPriceSafe: jest.fn().mockReturnValue(true),
 }));
 
-jest.mock('../../../../../app/store/actions', () => ({
+jest.mock('../../../../store/actions', () => ({
   hideModal: jest.fn(),
   setGasLimit: jest.fn(),
   setGasPrice: jest.fn(),
   updateTransaction: jest.fn(),
 }));
 
-jest.mock('../../../../../app/ducks/gas/gas.duck', () => ({
+jest.mock('../../../../ducks/gas/gas.duck', () => ({
   setCustomGasPrice: jest.fn(),
   setCustomGasLimit: jest.fn(),
   resetCustomData: jest.fn(),
 }));
 
-jest.mock('../../../../../app/ducks/send/send.duck', () => ({
+jest.mock('../../../../ducks/send/send.duck', () => ({
   hideGasButtonGroup: jest.fn(),
 }));
 

ui/components/app/whats-new-popup/whats-new-popup.js

@@ -8,7 +8,7 @@ import { useEqualityCheck } from '../../../hooks/useEqualityCheck';
 import Button from '../../ui/button';
 import Popover from '../../ui/popover';
 import { updateViewedNotifications } from '../../../store/actions';
-import { getTranslatedUINoficiations } from '../../../../../shared/notifications';
+import { getTranslatedUINoficiations } from '../../../../shared/notifications';
 import { getSortedNotificationsToShow } from '../../../selectors';
 
 function getActionFunctionById(id) {

ui/ducks/swaps/swaps.test.js

@@ -1,7 +1,7 @@
 import nock from 'nock';
 
 import { setSwapsLiveness } from '../../store/actions';
-import { setStorageItem } from '../../../lib/storage-helpers';
+import { setStorageItem } from '../../helpers/utils/storage-helpers';
 import * as swaps from './swaps';
 
 jest.mock('../../store/actions.js', () => ({

ui/hooks/useRetryTransaction.test.js

@@ -1,7 +1,7 @@
 import * as reactRedux from 'react-redux';
 import { renderHook } from '@testing-library/react-hooks';
 import sinon from 'sinon';
-import transactions from '../../../test/data/transaction-data.json';
+import transactions from '../../test/data/transaction-data.json';
 import { showSidebar } from '../store/actions';
 import * as methodDataHook from './useMethodData';
 import * as metricEventHook from './useMetricEvent';

ui/pages/first-time-flow/end-of-flow/end-of-flow.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import sinon from 'sinon';
-import { tick } from '../../../../../test/lib/tick';
+import { tick } from '../../../../test/lib/tick';
-import { mountWithRouter } from '../../../../../test/lib/render-helpers';
+import { mountWithRouter } from '../../../../test/lib/render-helpers';
 import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
 import EndOfFlowScreen from './end-of-flow.container';
 

ui/pages/first-time-flow/select-action/select-action.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import sinon from 'sinon';
-import { mountWithRouter } from '../../../../../test/lib/render-helpers';
+import { mountWithRouter } from '../../../../test/lib/render-helpers';
 import SelectAction from './select-action.container';
 
 describe('Selection Action', () => {

ui/pages/send/send-content/add-recipient/add-recipient.container.test.js

@@ -13,7 +13,7 @@ jest.mock('react-redux', () => ({
   },
 }));
 
-jest.mock('../../../../../app/selectors', () => ({
+jest.mock('../../../../selectors', () => ({
   getSendEnsResolution: (s) => `mockSendEnsResolution:${s}`,
   getSendEnsResolutionError: (s) => `mockSendEnsResolutionError:${s}`,
   getAddressBook: (s) => [{ name: `mockAddressBook:${s}` }],
@@ -24,7 +24,7 @@ jest.mock('../../../../../app/selectors', () => ({
   ],
 }));
 
-jest.mock('../../../../../app/store/actions', () => ({
+jest.mock('../../../../store/actions', () => ({
   updateSendTo: jest.fn(),
 }));
 

ui/pages/send/send-content/add-recipient/add-recipient.utils.test.js

@@ -7,16 +7,15 @@ import {
 } from '../../send.constants';
 import { getToErrorObject, getToWarningObject } from './add-recipient';
 
-jest.mock('../../../../../app/helpers/utils/util', () => ({
+jest.mock('../../../../helpers/utils/util', () => ({
   isDefaultMetaMaskChain: jest.fn().mockReturnValue(true),
   isEthNetwork: jest.fn().mockReturnValue(true),
   checkExistingAddresses: jest.fn().mockReturnValue(true),
   isValidAddress: jest.fn((to) => Boolean(to.match(/^[0xabcdef123456798]+$/u))),
-  isValidDomainName: jest.requireActual('../../../../../app/helpers/utils/util')
+  isValidDomainName: jest.requireActual('../../../../helpers/utils/util')
     .isValidDomainName,
-  isOriginContractAddress: jest.requireActual(
+  isOriginContractAddress: jest.requireActual('../../../../helpers/utils/util')
-    '../../../../../app/helpers/utils/util',
+    .isOriginContractAddress,
-  ).isOriginContractAddress,
 }));
 
 describe('add-recipient utils', () => {

ui/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.container.test.js

@@ -15,7 +15,7 @@ jest.mock('react-redux', () => ({
   },
 }));
 
-jest.mock('../../../../../../app/selectors', () => ({
+jest.mock('../../../../../selectors', () => ({
   getGasTotal: (s) => `mockGasTotal:${s}`,
   getSendToken: (s) => `mockSendToken:${s}`,
   getSendFromBalance: (s) => `mockBalance:${s}`,
@@ -28,11 +28,11 @@ jest.mock('./amount-max-button.utils.js', () => ({
   calcMaxAmount: (mockObj) => mockObj.val + 1,
 }));
 
-jest.mock('../../../../../../app/store/actions', () => ({
+jest.mock('../../../../../store/actions', () => ({
   setMaxModeTo: jest.fn(),
   updateSendAmount: jest.fn(),
 }));
-jest.mock('../../../../../../app/ducks/send/send.duck', () => ({
+jest.mock('../../../../../ducks/send/send.duck', () => ({
   updateSendErrors: jest.fn(),
 }));
 

ui/pages/send/send-content/send-amount-row/send-amount-row.container.test.js

@@ -28,12 +28,12 @@ jest.mock('../../send.utils', () => ({
   }),
 }));
 
-jest.mock('../../../../../app/store/actions', () => ({
+jest.mock('../../../../store/actions', () => ({
   setMaxModeTo: jest.fn(),
   updateSendAmount: jest.fn(),
 }));
 
-jest.mock('../../../../../app/ducks/send/send.duck', () => ({
+jest.mock('../../../../ducks/send/send.duck', () => ({
   updateSendErrors: jest.fn(),
 }));
 

ui/pages/send/send-content/send-gas-row/send-gas-row.container.test.js

@@ -26,7 +26,7 @@ jest.mock('react-redux', () => ({
   },
 }));
 
-jest.mock('../../../../../app/selectors', () => ({
+jest.mock('../../../../selectors', () => ({
   getSendMaxModeState: (s) => `mockMaxModeOn:${s}`,
 }));
 
@@ -37,18 +37,18 @@ jest.mock('../../send.utils.js', () => ({
   calcGasTotal: (gasLimit, gasPrice) => gasLimit + gasPrice,
 }));
 
-jest.mock('../../../../../app/store/actions', () => ({
+jest.mock('../../../../store/actions', () => ({
   showModal: jest.fn(),
   setGasPrice: jest.fn(),
   setGasTotal: jest.fn(),
   setGasLimit: jest.fn(),
 }));
 
-jest.mock('../../../../../app/ducks/send/send.duck', () => ({
+jest.mock('../../../../ducks/send/send.duck', () => ({
   showGasButtonGroup: jest.fn(),
 }));
 
-jest.mock('../../../../../app/ducks/gas/gas.duck', () => ({
+jest.mock('../../../../ducks/gas/gas.duck', () => ({
   resetCustomData: jest.fn(),
   setCustomGasPrice: jest.fn(),
   setCustomGasLimit: jest.fn(),

ui/pages/send/send-footer/send-footer.container.test.js

@@ -21,7 +21,7 @@ jest.mock('react-redux', () => ({
   },
 }));
 
-jest.mock('../../../../app/store/actions.js', () => ({
+jest.mock('../../../store/actions.js', () => ({
   addToAddressBook: jest.fn(),
   clearSend: jest.fn(),
   signTokenTx: jest.fn(),
@@ -29,7 +29,7 @@ jest.mock('../../../../app/store/actions.js', () => ({
   updateTransaction: jest.fn(),
 }));
 
-jest.mock('../../../../app/selectors/send.js', () => ({
+jest.mock('../../../selectors/send.js', () => ({
   getGasLimit: (s) => `mockGasLimit:${s}`,
   getGasPrice: (s) => `mockGasPrice:${s}`,
   getGasTotal: (s) => `mockGasTotal:${s}`,
@@ -48,7 +48,7 @@ jest.mock('../../../../app/selectors/send.js', () => ({
   getDefaultActiveButtonIndex: () => 0,
 }));
 
-jest.mock('../../../../app/selectors/custom-gas.js', () => ({
+jest.mock('../../../selectors/custom-gas.js', () => ({
   getRenderableEstimateDataForSmallButtonsFromGWEI: (s) => [
     { gasEstimateType: `mockGasEstimateType:${s}` },
   ],

ui/pages/send/send.component.test.js

@@ -4,7 +4,7 @@ import sinon from 'sinon';
 import {
   RINKEBY_CHAIN_ID,
   ROPSTEN_CHAIN_ID,
-} from '../../../../shared/constants/network';
+} from '../../../shared/constants/network';
 import SendTransactionScreen from './send.component';
 import * as util from './send.utils';
 

ui/pages/send/send.container.test.js

@@ -25,12 +25,12 @@ jest.mock('redux', () => ({
   compose: (_, arg2) => () => arg2(),
 }));
 
-jest.mock('../../../app/store/actions', () => ({
+jest.mock('../../store/actions', () => ({
   updateSendTokenBalance: jest.fn(),
   updateGasData: jest.fn(),
   setGasTotal: jest.fn(),
 }));
-jest.mock('../../../app/ducks/send/send.duck', () => ({
+jest.mock('../../ducks/send/send.duck', () => ({
   updateSendErrors: jest.fn(),
   resetSendState: jest.fn(),
 }));

ui/pages/swaps/actionable-message/actionable-message.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import ActionableMessage from '.';
 
 const createProps = (customProps = {}) => {

ui/pages/swaps/awaiting-swap/awaiting-swap.test.js

@@ -4,7 +4,7 @@ import configureMockStore from 'redux-mock-store';
 import {
   renderWithProvider,
   createSwapsMockStore,
-} from '../../../../../test/jest';
+} from '../../../../test/jest';
 import AwaitingSwap from '.';
 
 const createProps = (customProps = {}) => {

ui/pages/swaps/awaiting-swap/quotes-timeout-icon.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import QuotesTimeoutIcon from './quotes-timeout-icon';
 
 describe('QuotesTimeoutIcon', () => {

ui/pages/swaps/awaiting-swap/swap-failure-icon.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import SwapFailureIcon from './swap-failure-icon';
 
 describe('SwapFailureIcon', () => {

ui/pages/swaps/awaiting-swap/swap-success-icon.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import SwapSuccessIcon from './swap-success-icon';
 
 describe('SwapSuccessIcon', () => {

ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../../test/jest';
+import { renderWithProvider } from '../../../../../test/jest';
 import ViewOnEtherScanLink from '.';
 
 const createProps = (customProps = {}) => {

ui/pages/swaps/build-quote/build-quote.test.js

@@ -6,7 +6,7 @@ import {
   renderWithProvider,
   createSwapsMockStore,
   setBackgroundConnection,
-} from '../../../../../test/jest';
+} from '../../../../test/jest';
 import BuildQuote from '.';
 
 const middleware = [thunk];

ui/pages/swaps/countdown-timer/countdown-timer.test.js

@@ -4,7 +4,7 @@ import configureMockStore from 'redux-mock-store';
 import {
   renderWithProvider,
   createSwapsMockStore,
-} from '../../../../../test/jest';
+} from '../../../../test/jest';
 import CountdownTimer from '.';
 
 const createProps = (customProps = {}) => {

ui/pages/swaps/dropdown-input-pair/dropdown-input-pair.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import DropdownInputPair from '.';
 
 const createProps = (customProps = {}) => {

ui/pages/swaps/dropdown-search-list/dropdown-search-list.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import DropdownSearchList from '.';
 
 const createProps = (customProps = {}) => {

ui/pages/swaps/exchange-rate-display/exchange-rate-display.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import ExchangeRateDisplay from '.';
 
 const createProps = (customProps = {}) => {

ui/pages/swaps/fee-card/fee-card.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
-import { MAINNET_CHAIN_ID } from '../../../../../shared/constants/network';
+import { MAINNET_CHAIN_ID } from '../../../../shared/constants/network';
 import FeeCard from '.';
 
 const createProps = (customProps = {}) => {

ui/pages/swaps/fee-card/pig-icon.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import PigIcon from './pig-icon';
 
 describe('PigIcon', () => {

ui/pages/swaps/index.test.js

@@ -10,7 +10,7 @@ import {
   setBackgroundConnection,
   MOCKS,
   CONSTANTS,
-} from '../../../../test/jest';
+} from '../../../test/jest';
 import Swap from '.';
 
 const middleware = [thunk];

ui/pages/swaps/loading-swaps-quotes/aggregator-logo.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import AggregatorLogo from './aggregator-logo';
 
 const createProps = (customProps = {}) => {

ui/pages/swaps/loading-swaps-quotes/background-animation.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import BackgroundAnimation from './background-animation';
 
 describe('BackgroundAnimation', () => {

ui/pages/swaps/main-quote-summary/main-quote-summary.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import MainQuoteSummary from '.';
 
 const createProps = (customProps = {}) => {

ui/pages/swaps/main-quote-summary/quote-backdrop.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import QuotesBackdrop from './quote-backdrop';
 
 const createProps = (customProps = {}) => {

ui/pages/swaps/searchable-item-list/searchable-item-list.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import SearchableItemList from '.';
 
 const createProps = (customProps = {}) => {

ui/pages/swaps/select-quote-popover/select-quote-popover.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import SelectQuotePopover from '.';
 
 const createProps = (customProps = {}) => {

ui/pages/swaps/select-quote-popover/sort-list/sort-list.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../../test/jest';
+import { renderWithProvider } from '../../../../../test/jest';
 import SortList from './sort-list';
 
 const createProps = (customProps = {}) => {

ui/pages/swaps/slippage-buttons/slippage-buttons.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import SlippageButtons from '.';
 
 const createProps = (customProps = {}) => {

ui/pages/swaps/swaps-footer/swaps-footer.test.js

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { renderWithProvider } from '../../../../../test/jest';
+import { renderWithProvider } from '../../../../test/jest';
 import SwapsFooter from '.';
 
 const createProps = (customProps = {}) => {

ui/pages/unlock-page/unlock-page.component.test.js

@@ -2,7 +2,7 @@ import React from 'react';
 import sinon from 'sinon';
 import configureMockStore from 'redux-mock-store';
 import { fireEvent } from '@testing-library/react';
-import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import { renderWithProvider } from '../../../test/lib/render-helpers';
 import UnlockPage from './unlock-page.component';
 
 describe('Unlock Page Component', () => {

ui/selectors/selectors.test.js

@@ -1,4 +1,4 @@
-import mockState from '../../../test/data/mock-state.json';
+import mockState from '../../test/data/mock-state.json';
 import * as selectors from './selectors';
 
 describe('Selectors', () => {

ui/store/actionConstants.test.js

@@ -1,6 +1,6 @@
 import freeze from 'deep-freeze-strict';
 import reducers from '../ducks';
-import { NETWORK_TYPE_RPC } from '../../../shared/constants/network';
+import { NETWORK_TYPE_RPC } from '../../shared/constants/network';
 import * as actionConstants from './actionConstants';
 
 describe('Redux actionConstants', () => {