feat: Add Safe route for dashboard #3759

usame-algan · 2022-04-05T09:47:02Z

What it solves

Part of #3693

How this PR fixes it

Changes the Safe dashboard route from /app/home to /app/<safe address>/home and loads the Dashboard component inside SafeContainer so that it has access to transaction data.

Navigates the user to the Dashboard if:

A safe is selected from the Sidebar
A safe is created
A safe is loaded
A safe is removed and there is an available safe
ROOT is opened if last viewed Safe exists

How to test it

Open the Safe App
Select a Safe from the Sidebar
Observe that the Dashboard is visible
Create a new Safe
Observe being navigated to the Dashboard
Load an existing Safe
Observe being navigated to the Dashboard
Remove a safe while having another safe on the same network
Observe being navigated to the Dashboard
Open / while having a last viewed Safe
Observe being navigated to the Dashboard
Open / while in Inkognito mode
Observe being navigated to Welcome page

github-actions · 2022-04-05T09:47:18Z

CLA Assistant Lite All Contributors have signed the CLA.

github-actions · 2022-04-05T09:49:49Z

ESLint Summary View Full Report

Annotations are provided inline on the Files Changed tab. You can also see all annotations that were generated on the annotations page.

Type	Occurrences	Fixable
Errors	0	0
Warnings	0	0
Ignored	1	N/A

Result: ✅ success
Annotations: 0 total

^{Report generated by eslint-plus-action}

iamacook

Have you done a global search for ASSETS_BALANCES? I think there could be a few other places where we open to the balances page.

iamacook · 2022-04-05T09:50:15Z

src/routes/index.tsx

@@ -88,7 +89,7 @@ const Routes = (): React.ReactElement => {
        }}
      />

-      <Route component={Home} exact path={HOME_ROUTE} />
+      <Route component={Home} exact path={[HOME_ROUTE, SAFE_ROUTES.DASHBOARD]} />


This component will need to know whether it's on an 'addressed route'.

Do you think we should send a flag here or determine it within the component? Within the component we could just check for the existence of the param in the URL.

Checking the URL sounds like a good idea! We will need it for some of the render logic i.e. to display the Add Safe/Load Safe Widget. I suggest we do that in a future PR once we have some of the Widgets ready.

usame-algan · 2022-04-05T09:54:24Z

Have you done a global search for ASSETS_BALANCES? I think there could be a few other places where we open to the balances page.

Good question! Currently, we navigate the user to the Balances view when a Safe is added, loaded or when they delete a safe (and are navigated to the next available safe). In those cases, we could also navigate to the Dashboard instead. What do you think?

github-actions · 2022-04-05T09:55:26Z

Deployment links

🟠 Rinkeby	⚪ Mainnet	🟣 Polygon	🟡 BSC	⚫ Arbitrum	🟢 Gnosis Chain

iamacook · 2022-04-05T09:56:15Z

Good question! Currently, we navigate the user to the Balances view when a Safe is added, loaded or when they delete a safe (and are navigated to the next available safe). In those cases, we could also navigate to the Dashboard instead. What do you think?

I think the dashboard is the entry page for the Safe. We could later let the user to define this themselves.

usame-algan · 2022-04-05T10:26:42Z

I think the dashboard is the entry page for the Safe. We could later let the user to define this themselves.

Agreed, I updated the places where the user was navigated to the Balances view to go to the Dashboard instead.

iamacook

Looks good to me!

DiogoSoaress

I can still navigate to /app/home without being redirected to the SAFE_ROUTES.DASHBOARD

src/routes/index.tsx

…ions

DiogoSoaress

Looks good to me!

iamacook · 2022-04-05T13:29:26Z

src/routes/safe/container/index.tsx

@@ -21,6 +21,7 @@ export const ADDRESS_BOOK_TAB_BTN_TEST_ID = 'address-book-tab-btn'
 export const SAFE_VIEW_NAME_HEADING_TEST_ID = 'safe-name-heading'
 export const TRANSACTIONS_TAB_NEW_BTN_TEST_ID = 'transactions-tab-new-btn'

+const Home = React.lazy(() => import('src/routes/Home'))


Picky, but please remove React.. You've imported it purely for this lazy load.

iamacook · 2022-04-05T13:30:12Z

src/routes/safe/container/index.tsx

@@ -87,6 +88,7 @@ const Container = (): React.ReactElement => {
  return (
    <>
      <Switch>
+        <Route exact path={SAFE_ROUTES.DASHBOARD} render={() => wrapInSuspense(<Home />, null)} />


wrapInSuspense has a default fallback of null already.

Good catch! Will remove it from the others as well.

iamacook · 2022-04-05T13:41:35Z

src/routes/safe/container/index.tsx

@@ -1,5 +1,5 @@
 import { GenericModal, Loader } from '@gnosis.pm/safe-react-components'
-import { useState, lazy, useEffect } from 'react'
+import React, { useState, lazy, useEffect } from 'react'


You don't need to import React.

…t reference

feat: Add safe specific dashboard route

9f980f1

usame-algan requested review from katspaugh and DiogoSoaress April 5, 2022 09:47

iamacook reviewed Apr 5, 2022

View reviewed changes

fix: Redirect user to Dashboard when adding/loading/removing a safe

cf56450

iamacook approved these changes Apr 5, 2022

View reviewed changes

DiogoSoaress suggested changes Apr 5, 2022

View reviewed changes

src/routes/index.tsx Outdated Show resolved Hide resolved

usame-algan added 2 commits April 5, 2022 15:15

fix: Remove old dashboard route

c71a125

fix: Move Dashboard component inside SafeContainer to access transact…

04851d6

…ions

usame-algan changed the title ~~feat: Add safe specific dashboard route~~ feat: Add Safe route for dashboard Apr 5, 2022

DiogoSoaress approved these changes Apr 5, 2022

View reviewed changes

iamacook reviewed Apr 5, 2022

View reviewed changes

usame-algan requested a review from iamacook April 5, 2022 13:38

iamacook approved these changes Apr 5, 2022

View reviewed changes

fix: Remove null fallback for wrapInSuspense, remove unnecessary Reac…

a37f8ff

…t reference

usame-algan force-pushed the dashboard-routes branch from 5ff4e80 to a37f8ff Compare April 5, 2022 13:44

usame-algan merged commit ece833b into epic-dashboard Apr 5, 2022

usame-algan deleted the dashboard-routes branch April 5, 2022 13:55

github-actions bot locked and limited conversation to collaborators Apr 5, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Add Safe route for dashboard #3759

feat: Add Safe route for dashboard #3759

usame-algan commented Apr 5, 2022 •

edited

Loading

github-actions bot commented Apr 5, 2022

github-actions bot commented Apr 5, 2022 •

edited

Loading

iamacook left a comment

iamacook Apr 5, 2022

usame-algan Apr 5, 2022

usame-algan commented Apr 5, 2022

github-actions bot commented Apr 5, 2022

iamacook commented Apr 5, 2022

usame-algan commented Apr 5, 2022

iamacook left a comment

DiogoSoaress left a comment

DiogoSoaress left a comment

iamacook Apr 5, 2022

iamacook Apr 5, 2022

usame-algan Apr 5, 2022

iamacook Apr 5, 2022

feat: Add Safe route for dashboard #3759

feat: Add Safe route for dashboard #3759

Conversation

usame-algan commented Apr 5, 2022 • edited Loading

What it solves

How this PR fixes it

How to test it

github-actions bot commented Apr 5, 2022

github-actions bot commented Apr 5, 2022 • edited Loading

ESLint Summary View Full Report

iamacook left a comment

Choose a reason for hiding this comment

iamacook Apr 5, 2022

Choose a reason for hiding this comment

usame-algan Apr 5, 2022

Choose a reason for hiding this comment

usame-algan commented Apr 5, 2022

github-actions bot commented Apr 5, 2022

Deployment links

iamacook commented Apr 5, 2022

usame-algan commented Apr 5, 2022

iamacook left a comment

Choose a reason for hiding this comment

DiogoSoaress left a comment

Choose a reason for hiding this comment

DiogoSoaress left a comment

Choose a reason for hiding this comment

iamacook Apr 5, 2022

Choose a reason for hiding this comment

iamacook Apr 5, 2022

Choose a reason for hiding this comment

usame-algan Apr 5, 2022

Choose a reason for hiding this comment

iamacook Apr 5, 2022

Choose a reason for hiding this comment

usame-algan commented Apr 5, 2022 •

edited

Loading

github-actions bot commented Apr 5, 2022 •

edited

Loading