Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow navigating away from unknown room view #213

Merged
merged 1 commit into from
Apr 14, 2023

Conversation

ashfame
Copy link
Member

@ashfame ashfame commented Mar 30, 2023

In this PR:

  • We bring some change from our fork by updating dependency to the latest master tag. I supposed we would keep them incrementing as needed and tag it when we are ready to release a new version of Chatrix.
  • Fix a path which needed to be changed post merge of sync-worker work in our hydrogen fork.
  • Override UnknownRoomViewModel class to define a different closeUrl() for single room mode
Header with back arrow link shown now Screen shown after you click the back arrow
Screenshot 2023-03-31 at 12 18 14 AM Screenshot 2023-03-31 at 12 18 25 AM

@ashfame ashfame added this to the 0.8 milestone Mar 30, 2023
@ashfame ashfame requested a review from psrpinto March 30, 2023 20:21
@ashfame ashfame self-assigned this Mar 30, 2023
@ashfame
Copy link
Member Author

ashfame commented Mar 30, 2023

@psrpinto Build currently fails because it doesn't have that temporary fix we did in Hydrogen for skipping manifest.json

diff --git a/Users/ashfame/git/hydrogen-web/scripts/build-plugins/service-worker.js b/Users/ashfame/git/chatrix/node_modules/hydrogen-web/scripts/build-plugins/service-worker.js
index 0b66c88..0f52f26 100644
--- a/Users/ashfame/git/hydrogen-web/scripts/build-plugins/service-worker.js
+++ b/Users/ashfame/git/chatrix/node_modules/hydrogen-web/scripts/build-plugins/service-worker.js
@@ -73,6 +73,10 @@ const NON_PRECACHED_JS = [
 function isPreCached(asset) {
     const {name, fileName} = asset;

+    if ( !name ) {
+        return false;
+    }
+
     // For sync-worker.js and sync-worker.js.map, `name` isn't set, so we must rely on `fileName` only.

@psrpinto
Copy link
Member

@ashfame #214 fixes the build issue. Once that one gets merged to main, we can rebase this on main and it should build.

@psrpinto psrpinto force-pushed the allow_navigating_away_from_unknown_room_view branch from 0dbc276 to 2573be5 Compare April 14, 2023 14:26
@psrpinto
Copy link
Member

I rebased with main to get the build fixes, didn't make any other changes.

@psrpinto psrpinto merged commit 019588e into main Apr 14, 2023
@psrpinto psrpinto deleted the allow_navigating_away_from_unknown_room_view branch April 14, 2023 14:30
@psrpinto psrpinto mentioned this pull request Apr 14, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants