sentry cleaning (#1894)

* fromTokenMinimalUnit * notification tx * getActiveTabUrl * _finishedCallback * getBlockExplorerName * iftx
MetaMask · Oct 20, 2020 · d936595 · d936595
1 parent c6d5090
commit d936595
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 9 deletions.
diff --git a/app/components/UI/Notification/index.js b/app/components/UI/Notification/index.js
@@ -254,11 +254,17 @@ class Notification extends PureComponent {
 				tx = paymentChannelTransaction
 					? { paymentChannelTransaction, transaction: {} }
 					: this.props.transactions.find(({ id }) => id === this.props.transaction.id);
-				const decoded = await decodeTransaction({ ...this.props, tx });
-				transactionElement = decoded[0];
-				transactionDetails = decoded[1];
-				const existingGasPrice = tx.transaction ? tx.transaction.gasPrice : '0x0';
-				this.existingGasPriceDecimal = parseInt(existingGasPrice === undefined ? '0x0' : existingGasPrice, 16);
+				// THIS NEEDS REFACTOR
+				if (tx) {
+					const decoded = await decodeTransaction({ ...this.props, tx });
+					transactionElement = decoded[0];
+					transactionDetails = decoded[1];
+					const existingGasPrice = tx.transaction ? tx.transaction.gasPrice : '0x0';
+					this.existingGasPriceDecimal = parseInt(
+						existingGasPrice === undefined ? '0x0' : existingGasPrice,
+						16
+					);
+				}
 			}
 			// eslint-disable-next-line react/no-did-update-set-state
 			await this.setState({

diff --git a/app/core/NotificationManager.js b/app/core/NotificationManager.js
@@ -161,7 +161,9 @@ class NotificationManager {
 		this._handleTransactionsWatchListUpdate(transactionMeta);
 		// If it fails we hide the pending tx notification
 		this._hideTransactionNotification(transactionMeta.id);
-		this._transactionsWatchTable[transactionMeta.transaction.nonce].length &&
+		const transaction = this._transactionsWatchTable[transactionMeta.transaction.nonce];
+		transaction &&
+			transaction.length &&
 			setTimeout(() => {
 				// Then we show the error notification
 				this._showNotification({

diff --git a/app/util/networks.js b/app/util/networks.js
@@ -108,5 +108,6 @@ export function getBlockExplorerName(blockExplorerUrl) {
 	const hostname = new URL(blockExplorerUrl).hostname;
 	if (!hostname) return undefined;
 	const tempBlockExplorerName = hostname.split('.')[0];
+	if (!tempBlockExplorerName || !tempBlockExplorerName[0]) return undefined;
 	return tempBlockExplorerName[0].toUpperCase() + tempBlockExplorerName.slice(1);
 }
diff --git a/app/util/number.js b/app/util/number.js
@@ -1,7 +1,7 @@
 /**
  * Collection of utility functions for consistent formatting and conversion
  */
-import { BN } from 'ethereumjs-util';
+import { addHexPrefix, BN } from 'ethereumjs-util';
 import convert from 'ethjs-unit';
 import { util } from '@metamask/controllers';
 import numberToBN from 'number-to-bn';
@@ -36,6 +36,7 @@ export function fromWei(value = 0, unit = 'ether') {
  * @returns {string} - String containing the new number
  */
 export function fromTokenMinimalUnit(minimalInput, decimals) {
+	minimalInput = addHexPrefix(Number(minimalInput).toString(16));
 	let minimal = numberToBN(minimalInput);
 	const negative = minimal.lt(new BN(0));
 	const base = toBN(Math.pow(10, decimals).toString());

diff --git a/app/util/number.test.js b/app/util/number.test.js
@@ -60,6 +60,13 @@ describe('Number utils :: fromTokenMinimalUnit', () => {
 		expect(fromTokenMinimalUnit(new BN('1337'), 0)).toEqual('1337');
 		expect(fromTokenMinimalUnit(new BN('1337'), 18)).toEqual('0.000000000000001337');
 	});
+
+	it('fromTokenMinimalUnit using exp number', () => {
+		expect(fromTokenMinimalUnit(1e22, 6)).toEqual('10000000000000000');
+		expect(fromTokenMinimalUnit(1e2, 6)).toEqual('0.0001');
+		expect(fromTokenMinimalUnit(1e16, 6)).toEqual('10000000000');
+		expect(fromTokenMinimalUnit(1e18, 18)).toEqual('1');
+	});
 });
 
 describe('Number utils :: toTokenMinimalUnit', () => {

diff --git a/app/util/transactions.js b/app/util/transactions.js
@@ -282,7 +282,7 @@ export async function getTransactionActionKey(transaction) {
  * @returns {string} - Transaction type message
  */
 export async function getActionKey(tx, selectedAddress, ticker, paymentChannelTransaction) {
-	if (tx.isTransfer) {
+	if (tx && tx.isTransfer) {
 		const selfSent = safeToChecksumAddress(tx.transaction.from) === selectedAddress;
 		const translationKey = selfSent ? 'transactions.self_sent_unit' : 'transactions.received_unit';
 		// Third party sending wrong token symbol
@@ -415,5 +415,9 @@ export function getNormalizedTxState(state) {
 }
 
 export function getActiveTabUrl({ browser = {} }) {
-	return browser.tabs && browser.activeTab ? browser.tabs.find(({ id }) => id === browser.activeTab).url : '';
+	let tab;
+	if (browser.tabs && browser.activeTab) {
+		tab = browser.tabs.find(({ id }) => id === browser.activeTab);
+	}
+	return tab ? tab.url : '';
 }