Skip to content
This repository has been archived by the owner on Mar 23, 2023. It is now read-only.

fix: check against display type and network ids only #3129

Merged
merged 2 commits into from Nov 27, 2020
Merged

fix: check against display type and network ids only #3129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0044f22
fix: check against display type and network ids only
dated Nov 26, 2020
48c5fbb
Merge branch 'develop' into fix/wallter-filters-CU-at0njt
dated Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/domains/dashboard/pages/Dashboard/Dashboard.tsx
View file
Open in desktop
Expand Up @@ -148,12 +148,13 @@ export const Dashboard = ({ balances }: DashboardProps) => {
});

useEffect(() => {
const dashboardConfigurationClone = (({ viewType, ...rest }) => rest)(dashboardConfiguration);

defaultDashboardConfiguration.selectedNetworkIds = defaultDashboardConfiguration.selectedNetworkIds.sort();
dashboardConfigurationClone.selectedNetworkIds = dashboardConfigurationClone.selectedNetworkIds.sort();

setActiveFilter(!isEqual(defaultDashboardConfiguration, dashboardConfigurationClone));
setActiveFilter(
defaultDashboardConfiguration.walletsDisplayType !== dashboardConfiguration.walletsDisplayType ||
!isEqual(
[...defaultDashboardConfiguration.selectedNetworkIds].sort(),
[...dashboardConfiguration.selectedNetworkIds].sort(),
),
);
}, [defaultDashboardConfiguration, dashboardConfiguration]);

useEffect(
Expand Down
20 changes: 10 additions & 10 deletions src/domains/dashboard/pages/Dashboard/__snapshots__/Dashboard.test.tsx.snap
View file
Open in desktop
Expand Up @@ -481,7 +481,7 @@ exports[`Dashboard should change wallet view type from grid to list 1`] = `
class="group"
>
<div
class="LayoutControls__ControlButton-j2iwgi-0 gyDdjy"
class="LayoutControls__ControlButton-j2iwgi-0 iyqmGf"
>
<div
class="sc-AxirZ eEbZjj"
Expand Down Expand Up @@ -3264,7 +3264,7 @@ exports[`Dashboard should fetch more transactions 1`] = `
class="group"
>
<div
class="LayoutControls__ControlButton-j2iwgi-0 gyDdjy"
class="LayoutControls__ControlButton-j2iwgi-0 iyqmGf"
>
<div
class="sc-AxirZ eEbZjj"
Expand Down Expand Up @@ -5577,7 +5577,7 @@ exports[`Dashboard should hide portfolio view 1`] = `
class="group"
>
<div
class="LayoutControls__ControlButton-j2iwgi-0 gyDdjy"
class="LayoutControls__ControlButton-j2iwgi-0 iyqmGf"
>
<div
class="sc-AxirZ eEbZjj"
Expand Down Expand Up @@ -7675,7 +7675,7 @@ exports[`Dashboard should hide transaction view 1`] = `
class="group"
>
<div
class="LayoutControls__ControlButton-j2iwgi-0 gyDdjy"
class="LayoutControls__ControlButton-j2iwgi-0 iyqmGf"
>
<div
class="sc-AxirZ eEbZjj"
Expand Down Expand Up @@ -8603,7 +8603,7 @@ exports[`Dashboard should open detail modal on transaction row click 1`] = `
class="group"
>
<div
class="LayoutControls__ControlButton-j2iwgi-0 gyDdjy"
class="LayoutControls__ControlButton-j2iwgi-0 iyqmGf"
>
<div
class="sc-AxirZ eEbZjj"
Expand Down Expand Up @@ -11989,7 +11989,7 @@ exports[`Dashboard should render portfolio chart 1`] = `
class="group"
>
<div
class="LayoutControls__ControlButton-j2iwgi-0 gyDdjy"
class="LayoutControls__ControlButton-j2iwgi-0 iyqmGf"
>
<div
class="sc-AxirZ eEbZjj"
Expand Down Expand Up @@ -13682,7 +13682,7 @@ exports[`Dashboard should render portfolio percentage bar 1`] = `
class="group"
>
<div
class="LayoutControls__ControlButton-j2iwgi-0 gyDdjy"
class="LayoutControls__ControlButton-j2iwgi-0 iyqmGf"
>
<div
class="sc-AxirZ eEbZjj"
Expand Down Expand Up @@ -15375,7 +15375,7 @@ exports[`Dashboard should render wallets 1`] = `
class="group"
>
<div
class="LayoutControls__ControlButton-j2iwgi-0 gyDdjy"
class="LayoutControls__ControlButton-j2iwgi-0 iyqmGf"
>
<div
class="sc-AxirZ eEbZjj"
Expand Down Expand Up @@ -19548,7 +19548,7 @@ exports[`Dashboard should select an option in the wallets display type 1`] = `
class="group"
>
<div
class="LayoutControls__ControlButton-j2iwgi-0 gyDdjy"
class="LayoutControls__ControlButton-j2iwgi-0 iyqmGf"
>
<div
class="sc-AxirZ eEbZjj"
Expand Down Expand Up @@ -21489,7 +21489,7 @@ exports[`Dashboard should show transaction view 1`] = `
class="group"
>
<div
class="LayoutControls__ControlButton-j2iwgi-0 gyDdjy"
class="LayoutControls__ControlButton-j2iwgi-0 iyqmGf"
>
<div
class="sc-AxirZ eEbZjj"
Expand Down