[DDW-81] Improve redirecting logic of network store #723

DominikGuzei · 2018-02-15T15:27:43Z

This PR greatly simplifies the network status store and improves the booting UX:

Removes any redirecting / URL / screen handling logic from NetworkStatusStore
Introduces new Root route + component which handles the conditional logic of what to display based on various states
Show the loading spinner while waiting for the time difference request to finish (instead of showing 100% syncing message for 5 seconds)
The original URL is now preserved (because we are not doing any redirects), this means that you can now reload the app on sub-screens like "wallet / send" and it will return to the same 😉

All tests pass as before, also tested everything with API=etc and there are not lint or flow issues.

DominikGuzei · 2018-03-02T14:51:30Z

@nikolaglumac this is now also ready to be reviewed!

nikolaglumac · 2018-03-03T16:32:53Z

source/renderer/app/containers/etc/LoadingPage.js

@@ -32,7 +31,7 @@ export default class LoadingPage extends Component<InjectedProps> {
          allowedTimeDifference={ALLOWED_TIME_DIFFERENCE}
          isConnecting={isConnecting}
          syncPercentage={syncPercentage}
-          isLoadingDataForNextScreen={isLoadingWallets}
+          isLoadingDataForNextScreen={!isSyncing || isSynced}


@DominikGuzei I believe we should take this opportunity to refactor isSyncing and isSynced logic in the NetworkStatusStore: https://github.com/input-output-hk/daedalus/blob/development-webpack-fork/source/renderer/app/stores/NetworkStatusStore.js#L140-L151

nikolaglumac · 2018-03-03T16:34:20Z

source/renderer/app/stores/NetworkStatusStore.js

  }

-  setup() {
+  async setup() {


@DominikGuzei can you explain what is the reason for async here?

nikolaglumac · 2018-03-03T16:36:11Z

source/renderer/app/stores/NetworkStatusStore.js

+      this._updateSyncProgress, SYNC_PROGRESS_INTERVAL
+    );
+    if (environment.isAdaApi()) {
+      this._updateLocalTimeDifferencePollInterval = setInterval(


@DominikGuzei I fear this update is in collision with the following improvement: #719

No it isn't the code is even better now, you have to read through it carefully 😉

nikolaglumac · 2018-03-03T16:38:22Z

source/renderer/app/stores/NetworkStatusStore.js

-    Logger.debug('Stopped polling local time difference');
-    if (this._timeDifferencePollInterval) clearInterval(this._timeDifferencePollInterval);
+  _updateLocalTimeDifferenceWhenConnected = async () => {
+    if (this.isConnected) await this._updateLocalTimeDifference();


@DominikGuzei this call should be made only in case of environment.isAdaApi()

nikolaglumac

@DominikGuzei we should discuss how to proceed with this PR on Monday. This part of the application is very sensitive (as you already know) and I think we should re-define how to handle all the cases.

…-handling-in-network-store

nikolaglumac · 2018-04-25T11:42:10Z

@DominikGuzei can you please merge in latest develop in your branch? I will review this PR after you do that. Thanks!

nikolaglumac · 2018-05-14T11:28:14Z

@DominikGuzei please merge in latest develop so that this one can finally be reviewed :) Thanks!

DominikGuzei · 2018-05-25T13:52:25Z

@nikolaglumac i fixed the conflicts with latest develop branch and all tests pass! Please review carefully as these are nice improvements.

…ork-store

nikolaglumac · 2018-06-06T10:26:55Z

Let's wait with merging this PR until the 1.3 release cut off date.

DominikGuzei · 2018-06-21T13:47:16Z

@nikolaglumac this is ready for review (again)

nikolaglumac · 2018-06-21T13:52:10Z

@DominikGuzei reviewing it now! (again)

Issues fixed

…ork-store

nikolaglumac

Great work @DominikGuzei!
The only issue is that if you have no wallets and you try top open Ada redemption screen from the application menu you end up on the Add wallet screen :(

nikolaglumac · 2018-06-21T15:47:21Z

source/renderer/app/stores/ada/AdaRedemptionStore.js

@@ -62,6 +62,7 @@ export default class AdaRedemptionStore extends Store {
    ipcRenderer.on(PARSE_REDEMPTION_CODE.ERROR, this._onParseError);
    this.registerReactions([
      this._resetRedemptionFormValuesOnAdaRedemptionPageLoad,
+      this._redirectToAddWalletBeforeRedemption,


@DominikGuzei I don't think we need this redirect anymore as handle this case by showing special content on the Ada redemption screen.

nikolaglumac · 2018-06-21T15:47:34Z

source/renderer/app/stores/ada/AdaRedemptionStore.js

@@ -299,4 +300,12 @@ export default class AdaRedemptionStore extends Store {
    this.decryptionKey = null;
  };

+  _redirectToAddWalletBeforeRedemption = () => {


@DominikGuzei this is not needed anymore!

…ork-store

…ttps://github.com/input-output-hk/daedalus into chore/ddw-81-improve-url-handling-in-network-store

DominikGuzei · 2018-06-22T10:27:23Z

@nikolaglumac the issues with ada redemption page are fixed now!

nikolaglumac

Looks and works great 🎉
Approved 👍

nikolaglumac · 2018-06-22T11:05:17Z

@DominikGuzei awesome work! This PR is ready to be merged as soon as CI is done ;)

[DDW-81] simplify app booting logic

72be2ce

DominikGuzei added the chore label Feb 15, 2018

DominikGuzei requested review from nikolaglumac, darko-mijic and tomislavhoracek February 15, 2018 15:27

DominikGuzei added 3 commits March 2, 2018 15:28

[DDW-81] fix merge conflicts with latest base branch

c894d77

[DDW-81] fix remaining issues in network status store

4453137

[DDW-81] added changelog entry

edae0f6

nikolaglumac changed the title ~~[DDW-81] simplify app booting logic~~ Chore/ddw 81 Improve redirecting logic of network store Mar 3, 2018

[DDW-81] Remove duplicated code on Loading page

6a10800

nikolaglumac reviewed Mar 3, 2018

View reviewed changes

nikolaglumac previously requested changes Mar 3, 2018

View reviewed changes

Merge branch 'development-webpack-fork' into chore/ddw-81-improve-url…

20e600a

…-handling-in-network-store

nikolaglumac added the WIP label Mar 21, 2018

nikolaglumac changed the base branch from development-webpack-fork to develop March 27, 2018 22:10

[DDW-81] Merge in latest develop and fix conflicts

072741d

[DDW-81] merge-in latest develop

edaea6b

DominikGuzei removed the WIP label May 25, 2018

DominikGuzei added 2 commits May 25, 2018 16:09

[DDW-81] remove unnecessary redirecting logic

795bbb8

[DDW-81] remove unnecessary async decorator

24622ed

nikolaglumac assigned DominikGuzei May 27, 2018

nikolaglumac changed the title ~~Chore/ddw 81 Improve redirecting logic of network store~~ [DDW-81] Improve redirecting logic of network store May 27, 2018

Merges in latest develop

b1be23c

DominikGuzei removed the WIP label Jun 2, 2018

Merge branch 'develop' into chore/ddw-81-improve-url-handling-in-netw…

c2a2d6d

…ork-store

nikolaglumac added the DO NOT MERGE label Jun 6, 2018

nikolaglumac added WIP and removed DO NOT MERGE labels Jun 14, 2018

[DDW-81] fix conflicts with latest develop

b71fe8d

DominikGuzei removed the WIP label Jun 21, 2018

[DDW-81] fix ada redemption menu logic

67e5fa6

Merge branch 'develop' into chore/ddw-81-improve-url-handling-in-netw…

bec0152

…ork-store

nikolaglumac suggested changes Jun 21, 2018

View reviewed changes

Merge branch 'develop' into chore/ddw-81-improve-url-handling-in-netw…

646a749

…ork-store

nikolaglumac added the WIP label Jun 21, 2018

nikolaglumac and others added 4 commits June 21, 2018 18:28

Merge branch 'develop' into chore/ddw-81-improve-url-handling-in-netw…

326b7b3

…ork-store

Merge branch 'develop' into chore/ddw-81-improve-url-handling-in-netw…

9991d52

…ork-store

[DDW-81] fix remaining issues with ada redemption feature

19f6a12

Merge branch 'chore/ddw-81-improve-url-handling-in-network-store' of h…

9148053

…ttps://github.com/input-output-hk/daedalus into chore/ddw-81-improve-url-handling-in-network-store

DominikGuzei removed the WIP label Jun 22, 2018

[DDW-81] Fix flow warning and make Root container work for ETC

c667c7f

nikolaglumac approved these changes Jun 22, 2018

View reviewed changes

nikolaglumac merged commit dc58c73 into develop Jun 22, 2018

nikolaglumac deleted the chore/ddw-81-improve-url-handling-in-network-store branch June 22, 2018 11:30

nikolaglumac added the release-0.12.0 label Oct 1, 2018

This was referenced Oct 16, 2018

Release/0.12.0 #1127

Closed

Release/0.12.0 #1130

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DDW-81] Improve redirecting logic of network store #723

[DDW-81] Improve redirecting logic of network store #723

DominikGuzei commented Feb 15, 2018

DominikGuzei commented Mar 2, 2018

nikolaglumac Mar 3, 2018

nikolaglumac Mar 3, 2018

nikolaglumac Mar 3, 2018

DominikGuzei May 25, 2018 •

edited

Loading

nikolaglumac Mar 3, 2018

nikolaglumac left a comment

nikolaglumac commented Apr 25, 2018

nikolaglumac commented May 14, 2018

DominikGuzei commented May 25, 2018

nikolaglumac commented Jun 6, 2018

DominikGuzei commented Jun 21, 2018

nikolaglumac commented Jun 21, 2018

nikolaglumac left a comment

nikolaglumac Jun 21, 2018

nikolaglumac Jun 21, 2018

DominikGuzei commented Jun 22, 2018

nikolaglumac left a comment

nikolaglumac commented Jun 22, 2018

[DDW-81] Improve redirecting logic of network store #723

[DDW-81] Improve redirecting logic of network store #723

Conversation

DominikGuzei commented Feb 15, 2018

DominikGuzei commented Mar 2, 2018

nikolaglumac Mar 3, 2018

Choose a reason for hiding this comment

nikolaglumac Mar 3, 2018

Choose a reason for hiding this comment

nikolaglumac Mar 3, 2018

Choose a reason for hiding this comment

DominikGuzei May 25, 2018 • edited Loading

Choose a reason for hiding this comment

nikolaglumac Mar 3, 2018

Choose a reason for hiding this comment

nikolaglumac left a comment

Choose a reason for hiding this comment

nikolaglumac commented Apr 25, 2018

nikolaglumac commented May 14, 2018

DominikGuzei commented May 25, 2018

nikolaglumac commented Jun 6, 2018

DominikGuzei commented Jun 21, 2018

nikolaglumac commented Jun 21, 2018

nikolaglumac left a comment

Choose a reason for hiding this comment

nikolaglumac Jun 21, 2018

Choose a reason for hiding this comment

nikolaglumac Jun 21, 2018

Choose a reason for hiding this comment

DominikGuzei commented Jun 22, 2018

nikolaglumac left a comment

Choose a reason for hiding this comment

nikolaglumac commented Jun 22, 2018

DominikGuzei May 25, 2018 •

edited

Loading