From 6038a1f3f5a748e9e5b3a1ac692d1e633034ac06 Mon Sep 17 00:00:00 2001 From: Whymarrh Whitby Date: Thu, 22 Oct 2020 14:37:02 -0230 Subject: [PATCH] Fix dot-notation issues (#9679) Refs #9663 This change enables `dot-notation` and fixes the issues raised by the rule. --- .eslintrc.js | 1 - ui/app/helpers/utils/token-util.js | 4 ++-- ui/app/selectors/permissions.js | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index bdff3a676..58a4c5d36 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -93,7 +93,6 @@ module.exports = { 'node/no-unpublished-import': 'off', 'node/no-unpublished-require': 'off', 'node/no-unsupported-features/node-builtins': 'off', - 'dot-notation': 'off', 'mocha/max-top-level-suites': 'off', }, diff --git a/ui/app/helpers/utils/token-util.js b/ui/app/helpers/utils/token-util.js index cacfe6af2..700f5f9c8 100644 --- a/ui/app/helpers/utils/token-util.js +++ b/ui/app/helpers/utils/token-util.js @@ -148,7 +148,7 @@ export function calcTokenValue (value, decimals) { * @returns {string | undefined} A lowercase address string. */ export function getTokenAddressParam (tokenData = {}) { - const value = tokenData?.args?.['_to'] || tokenData?.args?.[0] + const value = tokenData?.args?._to || tokenData?.args?.[0] return value?.toString().toLowerCase() } @@ -160,7 +160,7 @@ export function getTokenAddressParam (tokenData = {}) { * @returns {string | undefined} A decimal string value. */ export function getTokenValueParam (tokenData = {}) { - return tokenData?.args?.['_value']?.toString() + return tokenData?.args?._value?.toString() } export function getTokenValue (tokenParams = []) { diff --git a/ui/app/selectors/permissions.js b/ui/app/selectors/permissions.js index 32f4e0be1..dc5821b6b 100644 --- a/ui/app/selectors/permissions.js +++ b/ui/app/selectors/permissions.js @@ -210,7 +210,7 @@ export function getAccountToConnectToActiveTab (state) { export function getOrderedConnectedAccountsForActiveTab (state) { const { activeTab, metamask: { permissionsHistory } } = state - const permissionsHistoryByAccount = permissionsHistory[activeTab.origin]?.['eth_accounts']?.accounts + const permissionsHistoryByAccount = permissionsHistory[activeTab.origin]?.eth_accounts?.accounts const orderedAccounts = getMetaMaskAccountsOrdered(state) const connectedAccounts = getPermittedAccountsForCurrentTab(state)