From 79343c5f23021a821af0f8d2b905d8a74a9ad8b8 Mon Sep 17 00:00:00 2001 From: Erik Marks Date: Thu, 29 Oct 2020 21:19:34 -0700 Subject: [PATCH 1/2] Update custom RPC network dropdown icons --- ui/app/components/app/dropdowns/network-dropdown.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/app/components/app/dropdowns/network-dropdown.js b/ui/app/components/app/dropdowns/network-dropdown.js index 8907fe12a4e9..14c5b66355d4 100644 --- a/ui/app/components/app/dropdowns/network-dropdown.js +++ b/ui/app/components/app/dropdowns/network-dropdown.js @@ -106,7 +106,7 @@ class NetworkDropdown extends Component { return reversedRpcListDetail.map((entry) => { const { rpcUrl, chainId, ticker = 'ETH', nickname = '' } = entry - const currentRpcTarget = ( + const isCurrentRpcTarget = ( provider.type === 'rpc' && rpcUrl === provider.rpcUrl ) @@ -128,15 +128,15 @@ class NetworkDropdown extends Component { }} > { - currentRpcTarget + isCurrentRpcTarget ? :
} - + { - currentRpcTarget + isCurrentRpcTarget ? null : ( Date: Thu, 29 Oct 2020 21:57:24 -0700 Subject: [PATCH 2/2] Fix failing unit test --- ui/app/components/app/dropdowns/tests/network-dropdown.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/app/components/app/dropdowns/tests/network-dropdown.test.js b/ui/app/components/app/dropdowns/tests/network-dropdown.test.js index 750e74bd4fea..6897e942ae22 100644 --- a/ui/app/components/app/dropdowns/tests/network-dropdown.test.js +++ b/ui/app/components/app/dropdowns/tests/network-dropdown.test.js @@ -91,7 +91,7 @@ describe('Network Dropdown', function () { }) it('checks background color for sixth NetworkDropdownIcon', function () { - assert.equal(wrapper.find(NetworkDropdownIcon).at(5).prop('innerBorder'), '1px solid #9b9b9b') + assert.equal(wrapper.find(NetworkDropdownIcon).at(5).prop('backgroundColor'), '#d6d9dc') // "Custom network grey" }) it('checks dropdown for frequestRPCList from state', function () {