chore: 👷 update years, fix conflicts

Author: gamalielhere

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2015 - 2021 MyEtherWallet
+Copyright (c) 2015 - 2022 MyEtherWallet
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

changelog/devop-3696.md

@@ -0,0 +1 @@
+* Added toBNSafe that safely converts numbers to BN

changelog/fix-3697.md

@@ -0,0 +1 @@
+fetch tokens when network is changed

changelog/fix-3705.md

@@ -0,0 +1 @@
+fix icons and link in module confirmation, hide notification dropdown if theres no notifications

package-lock.json

@@ -96,7 +96,7 @@ div {
   padding: 0;
   margin: 0;
   font-size: 1rem;
-  line-height: 1.357rem;
+  // line-height: 1.357rem;
   font-weight: 400;
 }
 

src/assets/styles/GlobalStyles.scss

@@ -1,4 +1,6 @@
 import BigNumber from 'bignumber.js';
+import { isNull, isUndefined } from 'lodash';
+import { toBN } from 'web3-utils';
 import { fromWei } from 'web3-utils';
 /**
  * ---------------------------------
@@ -478,12 +480,26 @@ const getRoundNumber = (value, round, hasTrailingZeros = false) => {
   };
 };
 
+/*****************************************
+ * handeles edgecases for web3 util toBN
+ * @param {number} number - expects number, handles non numbers
+ * @return {BigNumber} BN from web3
+ *****************************************/
+
+const toBNSafe = number => {
+  if (isNaN(number) || isNull(number) || isUndefined(number) || number === '')
+    number = 0;
+  number = toBN(new BigNumber(number).toFixed(0));
+  return number;
+};
+
 export {
   formatIntegerToString,
   formatIntegerValue,
   formatFloatingPointValue,
   formatFiatValue,
   formatBalanceEthValue,
   formatPercentageValue,
-  formatGasValue
+  formatGasValue,
+  toBNSafe
 };

src/core/helpers/numberFormatHelper.js

@@ -1,4 +1,4 @@
-import { toBN } from 'web3-utils';
+import { toBNSafe } from '@/core/helpers/numberFormatHelper';
 
 const setOnlineStatus = function ({ commit, dispatch }, val) {
   if (val) dispatch('wallet/setWeb3Instance', null, { root: true });
@@ -13,14 +13,16 @@ const updateGasPrice = function ({ rootState, dispatch, getters, state }) {
   const web3 = rootState.wallet.web3;
   if (!getters.isEIP1559SupportedNetwork) {
     return web3.eth.getGasPrice().then(res => {
-      const modifiedGasPrice = toBN(res).muln(
+      const modifiedGasPrice = toBNSafe(res).muln(
         getters.network.type.gasPriceMultiplier
       );
       return dispatch('setGasPrice', modifiedGasPrice.toString());
     });
   }
   return web3.eth.getGasPrice().then(gasPrice => {
-    const priorityFee = toBN(gasPrice).sub(toBN(state.eip1559.baseFeePerGas));
+    const priorityFee = toBNSafe(gasPrice).sub(
+      toBNSafe(state.eip1559.baseFeePerGas)
+    );
     return dispatch('setMaxPriorityFeePerGas', priorityFee);
   });
 };
@@ -31,8 +33,9 @@ const setGasPrice = function ({ commit }, gasPrice) {
 const setGasPriceType = function ({ commit }, type) {
   commit('SET_GAS_PRICE_TYPE', type);
 };
-const setNetwork = function ({ commit }, networkObj) {
+const setNetwork = function ({ commit, dispatch }, networkObj) {
   commit('SET_NETWORK', networkObj);
+  dispatch('swap/resetPrefetch', null, { root: true });
 };
 const addLocalContract = function ({ commit }, localContract) {
   commit('ADD_LOCAL_CONTRACT', localContract);

src/core/store/global/actions.js

@@ -5,4 +5,7 @@
 const setSwapTokens = function ({ commit }, tokens) {
   commit('SET_SWAP_TOKENS', tokens);
 };
-export default { setSwapTokens };
+const resetPrefetch = function ({ commit }) {
+  commit('SET_PREFETCH', false);
+};
+export default { setSwapTokens, resetPrefetch };

src/core/store/swap/actions.js

@@ -3,4 +3,8 @@ const SET_SWAP_TOKENS = async function (state, tokens) {
   state.prefetched = true;
 };
 
-export default { SET_SWAP_TOKENS };
+const SET_PREFETCH = async function (state, prefetch) {
+  state.prefetched = prefetch;
+};
+
+export default { SET_SWAP_TOKENS, SET_PREFETCH };