fixup ethjs upgrade

Author: legobeat

app/components/UI/Swaps/QuotesView.js

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import PropTypes from 'prop-types';
-import Eth from 'ethjs-query';
+import Eth from '@metamask/ethjs-query';
 import {
   View,
   StyleSheet,

app/components/Views/confirmations/SendFlow/Confirm/index.js

@@ -11,7 +11,7 @@ import {
 import { connect } from 'react-redux';
 import { getSendFlowTitle } from '../../../../UI/Navbar';
 import PropTypes from 'prop-types';
-import Eth from 'ethjs-query';
+import Eth from '@metamask/ethjs-query';
 import {
   renderFromWei,
   renderFromTokenMinimalUnit,

app/components/Views/confirmations/components/ApproveTransactionReview/index.js

@@ -6,7 +6,7 @@ import {
   Linking,
   ScrollView,
 } from 'react-native';
-import Eth from 'ethjs-query';
+import Eth from '@metamask/ethjs-query';
 import ActionView, { ConfirmButtonState } from '../../../../UI/ActionView';
 import PropTypes from 'prop-types';
 import { getApproveNavbar } from '../../../../UI/Navbar';

app/components/Views/confirmations/components/TransactionReview/index.js

@@ -1,5 +1,5 @@
+import Eth from '@metamask/ethjs-query';
 import { withNavigation } from '@react-navigation/compat';
-import Eth from 'ethjs-query';
 import PropTypes from 'prop-types';
 import React, { PureComponent } from 'react';
 import { Animated, ScrollView, StyleSheet, View } from 'react-native';

app/lib/ens-ipfs/resolver.js

@@ -1,6 +1,6 @@
 import namehash from 'eth-ens-namehash';
-import Eth from 'ethjs-query';
-import EthContract from 'ethjs-contract';
+import Eth from '@metamask/ethjs-query';
+import EthContract from '@metamask/ethjs-contract';
 import registryAbi from './contracts/registry';
 import resolverAbi from './contracts/resolver';
 import contentHash from 'content-hash';

app/util/ENSUtils.js

@@ -1,5 +1,5 @@
 import Engine from '../core/Engine';
-import ENS from 'ethjs-ens';
+import ENS from '@metamask/ethjs-ens';
 import { toLowerCaseEquals } from '../util/general';
 import {
   ChainId,

app/util/number/index.js

@@ -3,7 +3,7 @@
  */
 import { BN, stripHexPrefix } from 'ethereumjs-util';
 import { utils as ethersUtils } from 'ethers';
-import convert from 'ethjs-unit';
+import convert from '@metamask/ethjs-unit';
 import {
   BNToHex,
   hexToBN as controllerHexToBN,

patches/@metamask+ethjs-contract+0.4.1.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@metamask/ethjs-contract/package.json b/node_modules/@metamask/ethjs-contract/package.json
+index 4991d59..8343099 100644
+--- a/node_modules/@metamask/ethjs-contract/package.json
++++ b/node_modules/@metamask/ethjs-contract/package.json
+@@ -194,7 +194,7 @@
+     "rpc"
+   ],
+   "license": "MIT",
+-  "main": "lib/index.js",
++  "main": "src/index.js",
+   "name": "@metamask/ethjs-contract",
+   "peerDependencies": {
+     "@babel/runtime": "^7.0.0"

patches/@metamask+ethjs-query+0.7.1.patch

@@ -0,0 +1,13 @@
+diff --git a/node_modules/@metamask/ethjs-query/package.json b/node_modules/@metamask/ethjs-query/package.json
+index 14e1062..6860d86 100644
+--- a/node_modules/@metamask/ethjs-query/package.json
++++ b/node_modules/@metamask/ethjs-query/package.json
+@@ -2,7 +2,7 @@
+   "name": "@metamask/ethjs-query",
+   "version": "0.7.1",
+   "description": "A simple query layer for the Ethereum RPC.",
+-  "main": "lib/index.js",
++  "main": "src/index.js",
+   "files": [
+     "dist",
+     "internals",