Merge a74bdfea20 into release/next-js

bin/solid.pill

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4e32eeec968ae3deed6c20656d0ec7c987f11ac57b420ce785898fffdf4e0704
-size 9664920
+oid sha256:59285407abdc63642ff71384d922f63f4b2c82b3a0daa3673a861c97c59e292f
+size 9729397

pkg/arvo/app/glob.hoon

@@ -5,7 +5,7 @@
 /-  glob
 /+  default-agent, verb, dbug
 |%
-++  hash  0v5.b7cjf.2kc12.85sng.lkqav.7sn0k
+++  hash  0v1.4ujsp.698kt.ojftv.7jual.4hhu5
 +$  state-0  [%0 hash=@uv glob=(unit (each glob:glob tid=@ta))]
 +$  all-states
   $%  state-0

pkg/arvo/app/landscape/index.html

@@ -24,6 +24,6 @@
     <div id="portal-root"></div>
     <script src="/~landscape/js/channel.js"></script>
     <script src="/~landscape/js/session.js"></script>
-    <script src="/~landscape/js/bundle/index.130e5aa60a0ef2217701.js"></script>
+    <script src="/~landscape/js/bundle/index.e821c1b85987caabfb1f.js"></script>
   </body>
 </html>

pkg/interface/src/views/App.js

@@ -178,6 +178,7 @@ class App extends React.Component {
                 ship={this.ship}
                 api={this.api}
                 subscription={this.subscription}
+                connection={this.state.connection}
               />
             </ErrorBoundary>
           </Router>

pkg/interface/src/views/apps/launch/app.js

@@ -46,10 +46,22 @@ const ScrollbarLessBox = styled(Box)`
 const tutSelector = f.pick(['tutorialProgress', 'nextTutStep', 'hideGroups']);
 
 export default function LaunchApp(props) {
+  const connection = { props };
   const baseHash = useLaunchState(state => state.baseHash);
   const [hashText, setHashText] = useState(baseHash);
   const [exitingTut, setExitingTut] = useState(false);
+  const seen = useSettingsState(s => s?.tutorial?.seen) ?? true;
   const associations = useMetadataState(s => s.associations);
+  const contacts = useContactState(state => state.contacts);
+  const hasLoaded = useMemo(() => Boolean(connection === "connected"), [connection]);
+  const notificationsCount = useHarkState(state => state.notificationsCount);
+  const calmState = useSettingsState(selectCalmState);
+  const { hideUtilities } = calmState;
+  const { tutorialProgress, nextTutStep } = useLocalState(tutSelector);
+  let { hideGroups } = useLocalState(tutSelector);
+  !hideGroups ? { hideGroups } = calmState : null;
+
+  const waiter = useWaitForProps({ ...props, associations });
   const hashBox = (
     <Box
       position={["relative", "absolute"]}
@@ -88,14 +100,6 @@ export default function LaunchApp(props) {
     }
   }, [query]);
 
-  const calmState = useSettingsState(selectCalmState);
-  const { hideUtilities } = calmState;
-  const { tutorialProgress, nextTutStep } = useLocalState(tutSelector);
-  let { hideGroups } = useLocalState(tutSelector);
-  !hideGroups ? { hideGroups } = calmState : null;
-
-  const waiter = useWaitForProps({ ...props, associations });
-
   const { modal, showModal } = useModal({
     position: 'relative',
     maxWidth: '350px',
@@ -141,14 +145,14 @@ export default function LaunchApp(props) {
           </Box>
           <Text mb="3" lineHeight="tall" fontWeight="medium">Welcome</Text>
           <Text mb="3" lineHeight="tall">
-            You have been invited to use Landscape, an interface to chat 
+            You have been invited to use Landscape, an interface to chat
             and interact with communities
             <br />
             Would you like a tour of Landscape?
           </Text>
           <Row gapX="2" justifyContent="flex-end">
             <Button
-              backgroundColor="washedGray" 
+              backgroundColor="washedGray"
               onClick={() => setExitingTut(true)}
             >Skip</Button>
             <StatelessAsyncButton primary onClick={onContinue}>
@@ -158,17 +162,12 @@ export default function LaunchApp(props) {
         </Col>
       )}
   });
-  const contacts = useContactState(state => state.contacts);
-  const hasLoaded = useMemo(() => Object.keys(contacts).length > 0, [contacts]);
-
-  const notificationsCount = useHarkState(state => state.notificationsCount);
 
   useEffect(() => {
-    const seenTutorial = _.get(props.settings, ['tutorial', 'seen'], true);
-    if(hasLoaded && !seenTutorial && tutorialProgress === 'hidden') {
+    if(hasLoaded && !seen && tutorialProgress === 'hidden') {
       showModal();
     }
-  }, [props.settings, hasLoaded]);
+  }, [seen, hasLoaded]);
 
   return (
     <>