Merge remote-tracking branch 'origin/release/2021-5-27' into lf/hark-boxing

2024-12-21 01:41:37 +03:00 · 2021-05-18 10:46:31 +10:00 · 2021-05-18 10:46:31 +10:00 · 55ad8e22ae
commit 55ad8e22ae
parent 3755afab3f 5a1cb84192
99 changed files with 912 additions and 333 deletions
--- a/.github/workflows/typescript-check.yml
+++ b/.github/workflows/typescript-check.yml
@ -0,0 +1,14 @@
+name: typescript-check
+
+on:
+  pull_request:
+    paths:
+      - 'pkg/interface/**'
+
+jobs:
+  typescript-check:
+    runs-on: ubuntu-latest
+    name: "Check pkg/interface types"
+    steps:
+      - uses: actions/checkout@v2
+      - run: cd 'pkg/interface' && npm i && npm run tsc
--- a/pkg/arvo/app/glob.hoon
+++ b/pkg/arvo/app/glob.hoon
@ -5,7 +5,7 @@
 /-  glob
 /+  default-agent, verb, dbug
 |%
-++  hash  0v4.vrvkt.4gcnm.dgg5o.e73d6.kqnaq
++  hash  0v2.rvlfs.f97fq.hjrpe.d3h68.n54sj
 +$  state-0  [%0 hash=@uv glob=(unit (each glob:glob tid=@ta))]
 +$  all-states
  $%  state-0
--- a/pkg/arvo/app/landscape/index.html
+++ b/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.f252a9afb6e952de19c9.js"></script>
+    <script src="/~landscape/js/bundle/index.a6842e8d167b4e66a4e0.js"></script>
  </body>
 </html>
--- a/pkg/interface/package-lock.json
+++ b/pkg/interface/package-lock.json
@ -1551,6 +1551,15 @@
      "integrity": "sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==",
      "dev": true
    },
+    "@types/mdast": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz",
+      "integrity": "sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==",
+      "dev": true,
+      "requires": {
+        "@types/unist": "*"
+      }
+    },
    "@types/minimatch": {
      "version": "3.0.3",
      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
@ -6643,9 +6652,9 @@
      "dev": true
    },
    "immer": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-8.0.1.tgz",
-      "integrity": "sha512-aqXhGP7//Gui2+UrEtvxZxSquQVXTpZ7KDxfCcKAF3Vysvw0CViVaW9RZ1j1xlIYqaaaipBoqdqeibkc18PNvA=="
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-9.0.2.tgz",
+      "integrity": "sha512-mkcmzLtIfSp40vAqteRr1MbWNSoI7JE+/PB36FNPoSfJ9RQRmNKuTYCjKkyXyuq3Dgn07HuJBrwJd4ZSk2yUbw=="
    },
    "import-fresh": {
      "version": "3.3.0",
@ -10804,6 +10813,16 @@
      "resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
      "integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA=="
    },
+    "ts-mdast": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ts-mdast/-/ts-mdast-1.0.0.tgz",
+      "integrity": "sha512-FmT5GbMU629/ty64741v7TdO8jm5xW09okr2VNExkLuRk5ngjKIDdn/woTB8lDtcgCMRS8lUNubImen0MkdF6g==",
+      "dev": true,
+      "requires": {
+        "@types/mdast": "^3.0.3",
+        "@types/unist": "^2.0.3"
+      }
+    },
    "tslib": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz",
@ -12185,9 +12204,9 @@
      }
    },
    "zustand": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/zustand/-/zustand-3.3.1.tgz",
-      "integrity": "sha512-o0rgrBsi29nCkPHdhtkAHisCIlmRUoXOV+1AmDMeCgkGG0i5edFSpGU0KiZYBvFmBYycnck4Z07JsLYDjSET9g=="
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/zustand/-/zustand-3.5.1.tgz",
+      "integrity": "sha512-7J56Ve814z4zap71iaKFD+t65LFI//jEq/Vf55BTSVqJZCm+w9rov8OMBg+YSwIPQk54bfoIWHTrOWuAbpEDMw=="
    }
  }
 }
--- a/pkg/interface/package.json
+++ b/pkg/interface/package.json
@ -22,7 +22,7 @@
    "css-loader": "^3.6.0",
    "file-saver": "^2.0.5",
    "formik": "^2.1.5",
-    "immer": "^8.0.1",
+    "immer": "^9.0.2",
    "lodash": "^4.17.21",
    "moment": "^2.29.1",
    "mousetrap": "^1.6.5",
@ -56,7 +56,7 @@
    "workbox-recipes": "^6.0.2",
    "workbox-routing": "^6.0.2",
    "yup": "^0.29.3",
-    "zustand": "^3.3.1"
+    "zustand": "^3.5.0"
  },
  "devDependencies": {
    "@babel/core": "^7.12.10",
@ -91,6 +91,7 @@
    "react-hot-loader": "^4.13.0",
    "sass": "^1.32.5",
    "sass-loader": "^8.0.2",
+    "ts-mdast": "^1.0.0",
    "typescript": "^4.2.4",
    "webpack": "^4.46.0",
    "webpack-cli": "^3.3.12",
--- a/pkg/interface/src/logic/api/contacts.ts
+++ b/pkg/interface/src/logic/api/contacts.ts
@ -1,6 +1,9 @@
 import { Patp } from '@urbit/api';
 import { ContactEditField } from '@urbit/api/contacts';
 import _ from 'lodash';
+import {edit} from '../reducers/contact-update';
+import {doOptimistically} from '../state/base';
+import useContactState from '../state/contact';
 import { StoreState } from '../store/type';
 import BaseApi from './base';

@ -26,13 +29,14 @@ export default class ContactsApi extends BaseApi<StoreState> {
    {add-group: {ship, name}}
    {remove-group: {ship, name}}
    */
-    return this.storeAction({
+    const action = {
      edit: {
        ship,
        'edit-field': editField,
        timestamp: Date.now()
      }
-    });
+    }
+    doOptimistically(useContactState, action, this.storeAction.bind(this), [edit])
  }

  allowShips(ships: Patp[]) {
--- a/pkg/interface/src/logic/api/hark.ts
+++ b/pkg/interface/src/logic/api/hark.ts
@ -1,7 +1,10 @@
 import { Association, GraphNotifDescription, IndexedNotification, NotifIndex } from '@urbit/api';
+import BigIntOrderedMap from '@urbit/api/lib/BigIntOrderedMap';
 import { BigInteger } from 'big-integer';
 import { getParentIndex } from '../lib/notification';
 import { dateToDa, decToUd } from '../lib/util';
+import {reduce} from '../reducers/hark-update';
+import {doOptimistically, optReduceState} from '../state/base';
 import useHarkState from '../state/hark';
 import { StoreState } from '../store/type';
 import BaseApi from './base';
@ -51,8 +54,15 @@ export class HarkApi extends BaseApi<StoreState> {
    });
  }

-  archive(time: BigInteger, index: NotifIndex) {
-    return this.actOnNotification('archive', time, index);
+  async archive(intTime: BigInteger, index: NotifIndex) {
+    const time = decToUd(intTime.toString());
+    const action = {
+      archive: {
+        time,
+        index
+      }
+    };
+    await doOptimistically(useHarkState, action, this.harkAction.bind(this), [reduce])
  }

  read(time: BigInteger, index: NotifIndex) {
@ -81,15 +91,15 @@ export class HarkApi extends BaseApi<StoreState> {
  }

  markCountAsRead(association: Association, parent: string, description: GraphNotifDescription) {
-    return this.harkAction(
-      {  'read-count': {
+    const action = {  'read-count': {
         graph: {
        graph: association.resource,
        group: association.group,
        description,
        index: parent
      } }
-    });
+    };
+    doOptimistically(useHarkState, action, this.harkAction.bind(this), [reduce]);
  }

  markEachAsRead(association: Association, parent: string, child: string, description: GraphNotifDescription, mod: string) {
--- a/pkg/interface/src/logic/lib/formGroup.ts
+++ b/pkg/interface/src/logic/lib/formGroup.ts
@ -6,13 +6,15 @@ interface IFormGroupContext {
  onDirty: (id: string, touched: boolean) => void;
  onErrors: (id: string, errors: boolean) => void;
  submitAll: () => Promise<any>;
+  addReset: (id: string, r: any) => any;
 }

 const fallback: IFormGroupContext = {
  addSubmit: () => {},
  onDirty: () => {},
  onErrors: () => {},
-  submitAll: () => Promise.resolve()
+  submitAll: () => Promise.resolve(),
+  addReset: () => {}
 };

 export const FormGroupContext = React.createContext(fallback);
--- a/pkg/interface/src/logic/lib/hark.ts
+++ b/pkg/interface/src/logic/lib/hark.ts
@ -1,7 +1,8 @@
-import { IndexedNotification, NotificationGraphConfig, Unreads } from '@urbit/api';
+import { GraphNotifIndex, GroupNotifIndex, IndexedNotification, NotificationGraphConfig, Post, Unreads } from '@urbit/api';
 import bigInt, { BigInteger } from 'big-integer';
 import _ from 'lodash';
 import f from 'lodash/fp';
+import { pluralize } from './util';

 export function getLastSeen(
  unreads: Unreads,
@ -58,3 +59,56 @@ export function getNotificationKey(time: BigInteger, notification: IndexedNotifi
  return `${base}-unknown`;
 }

+
+export function notificationReferent(not: IndexedNotification) {
+  if('graph' in not.index) {
+    return not.index.graph.graph;
+  } else {
+    return not.index.group.group;
+  }
+}
+export function describeNotification(notification: IndexedNotification) {
+  function group(idx: GroupNotifIndex) {
+    switch (idx.description) {
+      case 'add-members':
+        return 'joined';
+      case 'remove-members':
+        return 'left';
+      default:
+        return idx.description;
+    }
+  }
+  function graph(idx: GraphNotifIndex, plural: boolean, singleAuthor: boolean) {
+    const isDm = idx.graph.startsWith('dm--');
+    switch (idx.description) {
+      case 'post':
+        return singleAuthor ? 'replied to you' : 'Your post received replies';
+      case 'link':
+        return `New link${plural ? 's' : ''} in`;
+      case 'comment':
+        return `New comment${plural ? 's' : ''} on`;
+      case 'note':
+        return `New Note${plural ? 's' : ''} in`;
+        // @ts-ignore
+      case 'edit-note':
+        return `updated ${pluralize('note', plural)} in`;
+      case 'mention':
+        return singleAuthor ? 'mentioned you in' : 'You were mentioned in';
+      case 'message':
+        if (isDm) {
+          return 'messaged you';
+        }
+        return `New message${plural ? 's' : ''} in`;
+      default:
+        return idx.description;
+    }
+  }
+  if('group' in notification.index) {
+    return group(notification.index.group);
+  } else if('graph' in notification.index) {
+    // @ts-ignore needs better type guard
+    const contents = notification.notification?.contents?.graph ?? [] as Post[];
+    return graph(notification.index.graph, contents.length > 1, _.uniq(_.map(contents, 'author')).length === 1)
+
+  }
+}
--- a/pkg/interface/src/logic/lib/publish.ts
+++ b/pkg/interface/src/logic/lib/publish.ts
@ -76,7 +76,7 @@ export function editPost(rev: number, noteId: BigInteger, title: string, body: s
  return nodes;
 }

-export function getLatestRevision(node: GraphNode): [number, string, string, Post] {
+export function getLatestRevision(node: GraphNode): [number, string, any, Post] {
  const empty = [1, '', '', buntPost()] as [number, string, string, Post];
  const revs = node.children?.get(bigInt(1));
  if(!revs) {
--- a/pkg/interface/src/logic/lib/shortcutContext.tsx
+++ b/pkg/interface/src/logic/lib/shortcutContext.tsx
@ -0,0 +1,70 @@
+import React, {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
+import _ from 'lodash';
+import { getChord } from '~/logic/lib/util';
+
+type Handler = (e: KeyboardEvent) => void;
+const fallback: ShortcutContextProps = {
+  add: () => {},
+  remove: () => {},
+};
+
+
+export const ShortcutContext = createContext(fallback);
+export interface ShortcutContextProps {
+  add: (cb: (e: KeyboardEvent) => void, key: string) => void;
+  remove: (cb: (e: KeyboardEvent) => void, key: string) => void;
+}
+export function ShortcutContextProvider({ children }) {
+  const [shortcuts, setShortcuts] = useState({} as Record<string, Handler>);
+  const handlerRef = useRef<Handler>(() => {});
+
+  const add = useCallback((cb: Handler, key: string) => {
+    setShortcuts((s) => ({ ...s, [key]: cb }));
+  }, []);
+  const remove = useCallback((cb: Handler, key: string) => {
+    setShortcuts((s) => (key in s ? _.omit(s, key) : s));
+  }, []);
+
+  useEffect(() => {
+    function onKeypress(e: KeyboardEvent) {
+      handlerRef.current(e);
+    }
+    document.addEventListener('keypress', onKeypress);
+    return () => {
+      document.removeEventListener('keypress', onKeypress);
+    };
+  }, []);
+
+  useEffect(() => {
+    handlerRef.current = function (e: KeyboardEvent) {
+      const chord = getChord(e);
+      shortcuts?.[chord]?.(e);
+    };
+  }, [shortcuts]);
+
+  const value = useMemo(() => ({ add, remove }), [add, remove])
+
+  return (
+    <ShortcutContext.Provider value={value}>
+      {children}
+    </ShortcutContext.Provider>
+  );
+}
+
+export function useShortcut(key: string, cb: Handler) {
+  const { add, remove } = useContext(ShortcutContext);
+  useEffect(() => {
+    add(cb, key);
+    return () => {
+      remove(cb, key);
+    };
+  }, [key, cb]);
+}
--- a/pkg/interface/src/logic/lib/useCopy.ts
+++ b/pkg/interface/src/logic/lib/useCopy.ts
@ -1,7 +1,7 @@
 import { useCallback, useMemo, useState } from 'react';
 import { writeText } from './util';

-export function useCopy(copied: string, display?: string) {
+export function useCopy(copied: string, display?: string, replaceText?: string) {
  const [didCopy, setDidCopy] = useState(false);
  const doCopy = useCallback(() => {
    writeText(copied);
@ -11,7 +11,7 @@ export function useCopy(copied: string, display?: string) {
    }, 2000);
  }, [copied]);

-  const copyDisplay = useMemo(() => (didCopy ? 'Copied' : display), [
+  const copyDisplay = useMemo(() => (didCopy ? (replaceText ?? 'Copied') : display), [
    didCopy,
    display
  ]);
--- a/pkg/interface/src/logic/lib/useLocalStorageState.ts
+++ b/pkg/interface/src/logic/lib/useLocalStorageState.ts
@ -17,7 +17,7 @@ interface SetStateFunc<T> {
 }
 // See microsoft/typescript#37663 for filed bug
 type SetState<T> = T extends any ? SetStateFunc<T> : never;
-export function useLocalStorageState<T>(key: string, initial: T) {
+export function useLocalStorageState<T>(key: string, initial: T): any {
  const [state, _setState] = useState(() => retrieve(key, initial));

  useEffect(() => {
--- a/pkg/interface/src/logic/lib/util.tsx
+++ b/pkg/interface/src/logic/lib/util.tsx
@ -2,13 +2,16 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import _ from 'lodash';
 import { patp2dec } from 'urbit-ob';
 import f, { compose, memoize } from 'lodash/fp';
-import bigInt, { BigInteger } from 'big-integer';
 import { Association, Contact, Patp } from '@urbit/api';
 import produce, { enableMapSet } from 'immer';
 import useSettingsState from '../state/settings';
 /* eslint-disable max-lines */
 import anyAscii from 'any-ascii';
-import { IconRef } from '~/types';
+import { sigil as sigiljs, stringRenderer } from '@tlon/sigil-js';
+import bigInt, { BigInteger } from 'big-integer';
+import { foregroundFromBackground } from '~/logic/lib/sigil';
+import { IconRef, Workspace } from '~/types';
+import useContactState from '../state/contact';

 enableMapSet();

@ -47,6 +50,42 @@ export function parentPath(path: string) {
  return _.dropRight(path.split('/'), 1).join('/');
 }

+/**
+ * undefined -> initial
+ * null -> disabled feed
+ * string -> enabled feed
+ */
+export function getFeedPath(association: Association): string | null | undefined {
+  const { metadata } = association;
+  if(metadata.config && 'group' in metadata?.config && metadata.config?.group) {
+    if ('resource' in metadata.config.group) {
+      return metadata.config.group.resource;
+    }
+    return null;
+  }
+  return undefined;
+}
+
+export const getChord = (e: KeyboardEvent) => {
+  let chord = [e.key];
+  if(e.metaKey) {
+    chord.unshift('meta');
+  }
+  if(e.ctrlKey) {
+    chord.unshift('ctrl');
+  }
+  return chord.join('+');
+}
+
+export function getResourcePath(workspace: Workspace, path: string, joined: boolean, mod: string) {
+  const base = workspace.type === 'group'
+    ? `/~landscape${workspace.group}`
+    : workspace.type === 'home'
+    ? `/~landscape/home`
+    : `/~landscape/messages`;
+  return `${base}/${joined ? 'resource' : 'join'}/${mod}${path}`
+}
+
 const DA_UNIX_EPOCH = bigInt('170141184475152167957503069145530368000'); // `@ud` ~1970.1.1
 const DA_SECOND = bigInt('18446744073709551616'); // `@ud` ~s1
 export function daToUnix(da: BigInteger) {
@ -103,6 +142,13 @@ export function clamp(x: number, min: number, max: number) {
  return Math.max(min, Math.min(max, x));
 }

+/**
+ * Euclidean modulo
+ */
+export function modulo(x: number, mod: number) {
+  return x < 0 ? (x % mod + mod) % mod : x % mod;
+}
+
 // color is a #000000 color
 export function adjustHex(color: string, amount: number): string {
  return f.flow(
@ -249,14 +295,20 @@ export function cite(ship: string): string {
  return `~${patp}`;
 }

+export function stripNonWord(string: string): string {
+  return string.replace(/[^\p{L}\p{N}\p{Z}]/gu, '');
+}
+
 export function alphabeticalOrder(a: string, b: string) {
-  return a.toLowerCase().localeCompare(b.toLowerCase());
+  return stripNonWord(a).toLowerCase().trim().localeCompare(stripNonWord(b).toLowerCase().trim());
 }

 export function lengthOrder(a: string, b: string) {
  return b.length - a.length;
 }

+export const keys = <T extends {}>(o: T) => Object.keys(o) as (keyof T)[];
+
 //  TODO: deprecated
 export function alphabetiseAssociations(associations: any) {
  const result = {};
@ -431,6 +483,7 @@ export const useHovering = (): useHoveringInterface => {
 export function withHovering<T>(Component: React.ComponentType<T>) {
  return React.forwardRef((props, ref) => {
    const { hovering, bind } = useHovering();
+    // @ts-ignore needs type signature on return?
    return <Component ref={ref} hovering={hovering} bind={bind} {...props} />
  })
 }
@ -447,3 +500,22 @@ export function getItemTitle(association: Association): string {
  return association.metadata.title ?? association.resource ?? '';
 }

+export const svgDataURL = (svg) => 'data:image/svg+xml;base64,' + btoa(svg);
+
+export const svgBlobURL = (svg) => URL.createObjectURL(new Blob([svg], { type: 'image/svg+xml' }));
+
+export const favicon = () => {
+  let background = '#ffffff';
+  const contacts = useContactState.getState().contacts;
+  if (contacts.hasOwnProperty(`~${window.ship}`)) {
+    background = `#${uxToHex(contacts[`~${window.ship}`].color)}`;
+  }
+  const foreground = foregroundFromBackground(background);
+  const svg = sigiljs({
+    patp: window.ship,
+    renderer: stringRenderer,
+    size: 16,
+    colors: [background, foreground]
+  });
+  return svg;
+}
--- a/pkg/interface/src/logic/reducers/contact-update.ts
+++ b/pkg/interface/src/logic/reducers/contact-update.ts
@ -1,4 +1,4 @@
-import { ContactUpdate } from '@urbit/api';
+import { ContactUpdate, deSig } from '@urbit/api';
 import _ from 'lodash';
 import { reduceState } from '../state/base';
 import useContactState, { ContactState } from '../state/contact';
@ -52,9 +52,9 @@ const remove = (json: ContactUpdate, state: ContactState): ContactState => {
  return state;
 };

-const edit = (json: ContactUpdate, state: ContactState): ContactState => {
+export const edit = (json: ContactUpdate, state: ContactState): ContactState => {
  const data = _.get(json, 'edit', false);
-  const ship = `~${data.ship}`;
+  const ship = `~${deSig(data.ship)}`;
  if (
    data &&
    (ship in state.contacts)
--- a/pkg/interface/src/logic/reducers/graph-update.ts
+++ b/pkg/interface/src/logic/reducers/graph-update.ts
@ -102,6 +102,7 @@ const addGraph = (json, state: GraphState): GraphState => {
  const data = _.get(json, 'add-graph', false);
  if (data) {
    if (!('graphs' in state)) {
+      // @ts-ignore investigate zustand types
      state.graphs = {};
    }

@ -122,6 +123,7 @@ const removeGraph = (json, state: GraphState): GraphState => {
  const data = _.get(json, 'remove-graph', false);
  if (data) {
    if (!('graphs' in state)) {
+      // @ts-ignore investigate zustand types
      state.graphs = {};
    }
    const resource = data.ship + '/' + data.name;
@ -279,7 +281,7 @@ const removePosts = (json, state: GraphState): GraphState => {
      } else {
        const child = graph.get(index[0]);
        if (child) {
-          return graph.set(index[0], produce((draft) => {
+          return graph.set(index[0], produce((draft: any) => {
            draft.children = _remove(draft.children, index.slice(1));
          }));
        }
--- a/pkg/interface/src/logic/reducers/hark-update.ts
+++ b/pkg/interface/src/logic/reducers/hark-update.ts
@ -8,8 +8,10 @@ import { BigInteger } from 'big-integer';
 import _ from 'lodash';
 import { compose } from 'lodash/fp';
 import { makePatDa } from '~/logic/lib/util';
+import { describeNotification } from '../lib/hark';
 import { reduceState } from '../state/base';
 import useHarkState, { HarkState } from '../state/hark';
+import useMetadataState from '../state/metadata';

 export const HarkReducer = (json: any) => {
  const data = _.get(json, 'harkUpdate', false);
@ -20,24 +22,32 @@ export const HarkReducer = (json: any) => {
  const graphHookData = _.get(json, 'hark-graph-hook-update', false);
  if (graphHookData) {
    reduceState<HarkState, any>(useHarkState, graphHookData, [
+      // @ts-ignore investigate zustand types
      graphInitial,
+      // @ts-ignore investigate zustand types
      graphIgnore,
+      // @ts-ignore investigate zustand types
      graphListen,
+      // @ts-ignore investigate zustand types
      graphWatchSelf,
+      // @ts-ignore investigate zustand types
      graphMentions
    ]);
  }
  const groupHookData = _.get(json, 'hark-group-hook-update', false);
  if (groupHookData) {
    reduceState<HarkState, any>(useHarkState, groupHookData, [
+      // @ts-ignore investigate zustand types
      groupInitial,
+      // @ts-ignore investigate zustand types
      groupListen,
+      // @ts-ignore investigate zustand types
      groupIgnore
    ]);
  }
 };

-function reduce(data, state) {
+export function reduce(data, state) {
  const reducers = [
    calculateCount,
    read,
@ -196,7 +206,7 @@ function readSince(json: any, state: HarkState): HarkState {

 function unreadSince(json: any, state: HarkState): HarkState {
  const data = _.get(json, 'unread-count');
-  if(data) {
+  if (data) {
    updateUnreadCount(state, data.index, u => u + 1);
  }
  return state;
@ -314,7 +324,7 @@ function removeNotificationFromUnread(state: HarkState, index: NotifIndex, time:
  }
 }

-function updateNotificationStats(state: HarkState, index: NotifIndex, statField: 'unreads' | 'last', f: (x: number) => number) {
+function updateNotificationStats(state: HarkState, index: NotifIndex, statField: 'unreads' | 'last', f: (x: number) => number, notify = false) {
    if('graph' in index) {
      const curr: any = _.get(state.unreads.graph, [index.graph.graph, index.graph.index, statField], 0);
      _.set(state.unreads.graph, [index.graph.graph, index.graph.index, statField], f(curr));
@ -330,6 +340,20 @@ function added(json: any, state: HarkState): HarkState {
    const { index, notification } = data;
    const [fresh, stale] = _.partition(state.unreadNotes, ({ index: idx }) => !notifIdxEqual(index, idx));
    state.unreadNotes = [...fresh, { index, notification }];
+
+    if ('Notification' in window && !useHarkState.getState().doNotDisturb) {
+      const description = describeNotification(data);
+      const meta = useMetadataState.getState();
+      const referent = 'graph' in data.index ? meta.associations.graph[data.index.graph.graph]?.metadata?.title ?? data.index.graph : meta.associations.groups[data.index.group.group]?.metadata?.title ?? data.index.group;
+      new Notification(`${description} ${referent}`, {
+        tag: 'landscape',
+        image: '/img/favicon.png',
+        icon: '/img/favicon.png',
+        badge: '/img/favicon.png',
+        renotify: true
+      });
+    }
+
  }
  return state;
 }
@ -368,7 +392,7 @@ function notifIdxEqual(a: NotifIndex, b: NotifIndex) {
    return (
      a.graph.graph === b.graph.graph &&
      a.graph.group === b.graph.group &&
-      a.graph.module === b.graph.module &&
+      a.graph.mark === b.graph.mark &&
      a.graph.description === b.graph.description
    );
  } else if ('group' in a && 'group' in b) {
--- a/pkg/interface/src/logic/reducers/launch-update.ts
+++ b/pkg/interface/src/logic/reducers/launch-update.ts
@ -20,6 +20,7 @@ export default class LaunchReducer {
    const weatherData: WeatherState | boolean | Record<string, never> = _.get(json, 'weather', false);
    if (weatherData) {
      useLaunchState.getState().set((state) => {
+        // @ts-ignore investigate zustand types
        state.weather = weatherData;
      });
    }
@ -27,6 +28,7 @@ export default class LaunchReducer {
    const locationData = _.get(json, 'location', false);
    if (locationData) {
      useLaunchState.getState().set((state) => {
+        // @ts-ignore investigate zustand types
        state.userLocation = locationData;
      });
    }
@ -34,6 +36,7 @@ export default class LaunchReducer {
    const baseHash = _.get(json, 'baseHash', false);
    if (baseHash) {
      useLaunchState.getState().set((state) => {
+        // @ts-ignore investigate zustand types
        state.baseHash = baseHash;
      });
    }
@ -41,6 +44,7 @@ export default class LaunchReducer {
    const runtimeLag = _.get(json, 'runtimeLag', null);
    if (runtimeLag !== null) {
      useLaunchState.getState().set(state => {
+        // @ts-ignore investigate zustand types
        state.runtimeLag = runtimeLag;
      });
    }
--- a/pkg/interface/src/logic/state/base.ts
+++ b/pkg/interface/src/logic/state/base.ts
@ -1,24 +1,39 @@
-import produce, { setAutoFreeze } from 'immer';
+import produce, { applyPatches, Patch, produceWithPatches, setAutoFreeze, enablePatches } from 'immer';
 import { compose } from 'lodash/fp';
-import create, { State, UseStore } from 'zustand';
+import _ from 'lodash';
+import create, { UseStore } from 'zustand';
 import { persist } from 'zustand/middleware';

 setAutoFreeze(false);
+enablePatches();

-export const stateSetter = <StateType>(
-  fn: (state: StateType) => void,
-  set
+export const stateSetter = <T extends {}>(
+  fn: (state: Readonly<T & BaseState<T>>) => void,
+  set: (newState: T & BaseState<T>) => void
 ): void => {
-  set(produce(fn));
+  set(produce(fn) as any);
 };

+export const optStateSetter = <T extends {}>(
+  fn: (state: T & BaseState<T>) => void,
+  set: (newState: T & BaseState<T>) => void,
+  get: () => T & BaseState<T>
+): string => {
+  const old = get();
+  const id = _.uniqueId()
+  const [state, ,patches] = produceWithPatches(old, fn) as readonly [(T & BaseState<T>), any, Patch[]];
+  set({ ...state, patches: { ...state.patches, [id]: patches }});
+  return id;
+};
+
+
 export const reduceState = <
-  StateType extends BaseState<StateType>,
-  UpdateType
+  S extends {},
+  U
 >(
-  state: UseStore<StateType>,
-  data: UpdateType,
-  reducers: ((data: UpdateType, state: StateType) => StateType)[]
+  state: UseStore<S & BaseState<S>>,
+  data: U,
+  reducers: ((data: U, state: S & BaseState<S>) => S & BaseState<S>)[]
 ): void => {
  const reducer = compose(reducers.map(r => sta => r(data, sta)));
  state.getState().set((state) => {
@ -26,6 +41,18 @@ export const reduceState = <
  });
 };

+export const optReduceState = <S, U>(
+  state: UseStore<S & BaseState<S>>,
+  data: U,
+  reducers: ((data: U, state: S & BaseState<S>) => BaseState<S> & S)[]
+): string => {
+  const reducer = compose(reducers.map(r => sta => r(data, sta)));
+  return state.getState().optSet((state) => {
+    reducer(state);
+  });
+};
+
+
 export let stateStorageKeys: string[] = [];

 export const stateStorageKey = (stateName: string) => {
@ -40,19 +67,59 @@ export const stateStorageKey = (stateName: string) => {
  });
 };

-export interface BaseState<StateType> extends State {
-  set: (fn: (state: StateType) => void) => void;
+export interface BaseState<StateType extends {}> {
+  rollback: (id: string) => void;
+  patches: {
+    [id: string]: Patch[];
+  };
+  set: (fn: (state: BaseState<StateType>) => void) => void;
+  addPatch: (id: string, ...patch: Patch[]) => void;
+  removePatch: (id: string) => void;
+  optSet: (fn: (state: BaseState<StateType>) => void) => string;
 }

-export const createState = <T extends BaseState<T>>(
+export const createState = <T extends {}>(
  name: string,
-  properties: { [K in keyof Omit<T, 'set'>]: T[K] },
-  blacklist: string[] = []
-): UseStore<T> => create(persist((set, get) => ({
+  properties: T,
+  blacklist: (keyof BaseState<T> | keyof T)[] = []
+): UseStore<T & BaseState<T>> => create<T & BaseState<T>>(persist<T & BaseState<T>>((set, get) => ({
+  // @ts-ignore investigate zustand types
  set: fn => stateSetter(fn, set),
-  ...properties as any
+  optSet: fn => {
+    return optStateSetter(fn, set, get);
+  },
+  patches: {},
+  addPatch: (id: string, ...patch: Patch[]) => {
+      // @ts-ignore investigate immer types
+    set(({ patches }) => ({ patches: {...patches, [id]: patch }}));
+  },
+  removePatch: (id: string) => {
+      // @ts-ignore investigate immer types
+    set(({ patches }) => ({ patches: _.omit(patches, id)}));
+  },
+  rollback: (id: string) => {
+    set(state => {
+        const applying = state.patches[id]
+        return {...applyPatches(state, applying), patches: _.omit(state.patches, id) }
+    });
+  },
+  ...properties
 }), {
  blacklist,
  name: stateStorageKey(name),
  version: process.env.LANDSCAPE_SHORTHASH as any
 }));
+
+export async function doOptimistically<A, S extends {}>(state: UseStore<S & BaseState<S>>, action: A, call: (a: A) => Promise<any>, reduce: ((a: A, fn: S & BaseState<S>) => S & BaseState<S>)[]) {
+  let num: string | undefined = undefined;
+  try {
+    num = optReduceState(state, action, reduce);
+    await call(action);
+    state.getState().removePatch(num)
+  } catch (e) {
+    console.error(e);
+    if(num) {
+      state.getState().rollback(num);
+    }
+  }
+}
--- a/pkg/interface/src/logic/state/contact.ts
+++ b/pkg/interface/src/logic/state/contact.ts
@ -9,6 +9,7 @@ export interface ContactState extends BaseState<ContactState> {
  // fetchIsAllowed: (entity, name, ship, personal) => Promise<boolean>;
 }

+// @ts-ignore investigate zustand types
 const useContactState = createState<ContactState>('Contact', {
  contacts: {},
  nackedContacts: new Set(),
--- a/pkg/interface/src/logic/state/graph.ts
+++ b/pkg/interface/src/logic/state/graph.ts
@ -27,7 +27,7 @@ export interface GraphState extends BaseState<GraphState> {
  // getGraphSubset: (ship: string, resource: string, start: string, end: string) => Promise<void>;
  // getNode: (ship: string, resource: string, index: string) => Promise<void>;
 }
-
+// @ts-ignore investigate zustand types
 const useGraphState = createState<GraphState>('Graph', {
  graphs: {},
  graphKeys: new Set(),
--- a/pkg/interface/src/logic/state/group.ts
+++ b/pkg/interface/src/logic/state/group.ts
@ -9,6 +9,7 @@ export interface GroupState extends BaseState<GroupState> {
  pendingJoin: JoinRequests;
 }

+// @ts-ignore investigate zustand types
 const useGroupState = createState<GroupState>('Group', {
  groups: {},
  pendingJoin: {}
--- a/pkg/interface/src/logic/state/hark.ts
+++ b/pkg/interface/src/logic/state/hark.ts
@ -4,11 +4,11 @@ import BigIntOrderedMap from "@urbit/api/lib/BigIntOrderedMap";
 import {useCallback} from "react";

 // import { harkGraphHookReducer, harkGroupHookReducer, harkReducer } from "~/logic/subscription/hark";
-import { BaseState, createState } from './base';
+import { createState } from './base';

 export const HARK_FETCH_MORE_COUNT = 3;

-export interface HarkState extends BaseState<HarkState> {
+export interface HarkState {
  archivedNotifications: BigIntOrderedMap<Timebox>;
  doNotDisturb: boolean;
  // getMore: () => Promise<boolean>;
--- a/pkg/interface/src/logic/state/invite.ts
+++ b/pkg/interface/src/logic/state/invite.ts
@ -5,6 +5,7 @@ export interface InviteState extends BaseState<InviteState> {
  invites: Invites;
 }

+// @ts-ignore investigate zustand types
 const useInviteState = createState<InviteState>('Invite', {
  invites: {}
 });
--- a/pkg/interface/src/logic/state/launch.ts
+++ b/pkg/interface/src/logic/state/launch.ts
@ -13,6 +13,7 @@ export interface LaunchState extends BaseState<LaunchState> {
  runtimeLag: boolean;
 };

+// @ts-ignore investigate zustand types
 const useLaunchState = createState<LaunchState>('Launch', {
  firstTime: true,
  tileOrdering: [],
--- a/pkg/interface/src/logic/state/local.tsx
+++ b/pkg/interface/src/logic/state/local.tsx
@ -82,6 +82,7 @@ const useLocalState = create<LocalStateZus>(persist((set, get) => ({
      state.suspendedFocus.blur();
    }
  })),
+  // @ts-ignore investigate zustand types
  set: fn => set(produce(fn))
  }), {
    blacklist: [
@ -98,6 +99,7 @@ function withLocalState<P, S extends keyof LocalState, C extends React.Component
        (object, key) => ({ ...object, [key]: state[key] }), {}
      )
    ): useLocalState();
+    // @ts-ignore call signature forwarding unclear
    return <Component ref={ref} {...localState} {...props} />;
  });
 }
--- a/pkg/interface/src/logic/state/metadata.ts
+++ b/pkg/interface/src/logic/state/metadata.ts
@ -22,7 +22,7 @@ export function useGraphsForGroup(group: string) {
  const graphs = useMetadataState(s => s.associations.graph);
  return _.pickBy(graphs, (a: Association) => a.group === group);
 }
-
+// @ts-ignore investigate zustand types
 const useMetadataState = createState<MetadataState>('Metadata', {
  associations: { groups: {}, graph: {}, contacts: {}, chat: {}, link: {}, publish: {} }
  // preview: async (group): Promise<MetadataUpdatePreview> => {
--- a/pkg/interface/src/logic/state/settings.ts
+++ b/pkg/interface/src/logic/state/settings.ts
@ -1,6 +1,17 @@
 import f from 'lodash/fp';
+import { RemoteContentPolicy, LeapCategories, leapCategories } from "~/types/local-update";
+import { useShortcut as usePlainShortcut } from '~/logic/lib/shortcutContext';
 import { BaseState, createState } from '~/logic/state/base';
-import { LeapCategories, leapCategories, RemoteContentPolicy } from '~/types/local-update';
+import {useCallback} from 'react';
+
+export interface ShortcutMapping {
+  cycleForward: string;
+  cycleBack: string;
+  navForward: string;
+  navBack: string;
+  hideSidebar: string;
+}
+

 export interface SettingsState extends BaseState<SettingsState> {
  display: {
@ -16,6 +27,7 @@ export interface SettingsState extends BaseState<SettingsState> {
    hideGroups: boolean;
    hideUtilities: boolean;
  };
+  keyboard: ShortcutMapping;
  remoteContentPolicy: RemoteContentPolicy;
  leap: {
    categories: LeapCategories[];
@ -33,6 +45,7 @@ export const selectCalmState = (s: SettingsState) => s.calm;

 export const selectDisplayState = (s: SettingsState) => s.display;

+// @ts-ignore investigate zustand types
 const useSettingsState = createState<SettingsState>('Settings', {
  display: {
    backgroundType: 'none',
@ -59,7 +72,19 @@ const useSettingsState = createState<SettingsState>('Settings', {
  tutorial: {
    seen: true,
    joined: undefined
+  },
+  keyboard: {
+    cycleForward: 'ctrl+\'',
+    cycleBack: 'ctrl+;',
+    navForward: 'ctrl+[',
+    navBack: 'ctrl+[',
+    hideSidebar: 'ctrl+\\'
  }
 });

+export function useShortcut<T extends keyof ShortcutMapping>(name: T, cb: (e: KeyboardEvent) => void) {
+  const key = useSettingsState(useCallback(s => s.keyboard[name], [name]));
+  return usePlainShortcut(key, cb);
+}
+
 export default useSettingsState;
--- a/pkg/interface/src/logic/state/storage.ts
+++ b/pkg/interface/src/logic/state/storage.ts
@ -19,6 +19,7 @@ export interface StorageState extends BaseState<StorageState> {
  }
 }

+// @ts-ignore investigate zustand types
 const useStorageState = createState<StorageState>('Storage', {
  gcp: {},
  s3: {
--- a/pkg/interface/src/views/App.js
+++ b/pkg/interface/src/views/App.js
@ -1,6 +1,5 @@
 import dark from '@tlon/indigo-dark';
 import light from '@tlon/indigo-light';
-import { sigil as sigiljs, stringRenderer } from '@tlon/sigil-js';
 import Mousetrap from 'mousetrap';
 import 'mousetrap-global-bind';
 import * as React from 'react';
@ -11,13 +10,14 @@ import { BrowserRouter as Router, withRouter } from 'react-router-dom';
 import styled, { ThemeProvider } from 'styled-components';
 import GlobalApi from '~/logic/api/global';
 import gcpManager from '~/logic/lib/gcpManager';
-import { foregroundFromBackground } from '~/logic/lib/sigil';
-import { uxToHex } from '~/logic/lib/util';
+import { favicon, svgDataURL } from '~/logic/lib/util';
 import withState from '~/logic/lib/withState';
 import useContactState from '~/logic/state/contact';
 import useGroupState from '~/logic/state/group';
 import useLocalState from '~/logic/state/local';
 import useSettingsState from '~/logic/state/settings';
+import { ShortcutContextProvider } from '~/logic/lib/shortcutContext';
+
 import GlobalStore from '~/logic/store/store';
 import GlobalSubscription from '~/logic/subscription/global';
 import ErrorBoundary from '~/views/components/ErrorBoundary';
@ -86,7 +86,6 @@ class App extends React.Component {

    this.updateTheme = this.updateTheme.bind(this);
    this.updateMobile = this.updateMobile.bind(this);
-    this.faviconString = this.faviconString.bind(this);
  }

  componentDidMount() {
@ -131,22 +130,6 @@ class App extends React.Component {
    });
  }

-  faviconString() {
-    let background = '#ffffff';
-    if (this.props.contacts.hasOwnProperty(`~${window.ship}`)) {
-      background = `#${uxToHex(this.props.contacts[`~${window.ship}`].color)}`;
-    }
-    const foreground = foregroundFromBackground(background);
-    const svg = sigiljs({
-      patp: window.ship,
-      renderer: stringRenderer,
-      size: 16,
-      colors: [background, foreground]
-    });
-    const dataurl = 'data:image/svg+xml;base64,' + btoa(svg);
-    return dataurl;
-  }
-
  getTheme() {
    const { props } = this;
    return ((props.dark && props?.display?.theme == 'auto') ||
@ -161,9 +144,10 @@ class App extends React.Component {
    const ourContact = this.props.contacts[`~${this.ship}`] || null;
    return (
      <ThemeProvider theme={theme}>
+        <ShortcutContextProvider>
        <Helmet>
          {window.ship.length < 14
-            ? <link rel="icon" type="image/svg+xml" href={this.faviconString()} />
+            ? <link rel="icon" type="image/svg+xml" href={svgDataURL(favicon())} />
            : null}
        </Helmet>
        <Root>
@ -198,6 +182,7 @@ class App extends React.Component {
          </Router>
        </Root>
        <div id="portal-root" />
+        </ShortcutContextProvider>
      </ThemeProvider>
    );
  }
--- a/pkg/interface/src/views/apps/chat/components/ChatEditor.tsx
+++ b/pkg/interface/src/views/apps/chat/components/ChatEditor.tsx
@ -128,10 +128,27 @@ export default class ChatEditor extends Component<ChatEditorProps, ChatEditorSta
    };

    this.editor = null;
+    this.onKeyPress = this.onKeyPress.bind(this);
+  }
+
+  componentDidMount() {
+    document.addEventListener('keydown', this.onKeyPress);
  }

  componentWillUnmount(): void {
    this.props.onUnmount(this.state.message);
+    document.removeEventListener('keydown', this.onKeyPress);
+  }
+
+  onKeyPress(e) {
+    const focusedTag = document.activeElement?.nodeName?.toLowerCase();
+    const shouldCapture = !(focusedTag === 'textarea' || focusedTag === 'input' || e.metaKey || e.ctrlKey);
+    if(/^[a-z]|[A-Z]$/.test(e.key) && shouldCapture) {
+      this.editor.focus();
+    }
+    if(e.key === 'Escape') {
+      this.editor.getInputField().blur();
+    }
  }

  componentDidUpdate(prevProps: ChatEditorProps): void {
@ -140,9 +157,9 @@ export default class ChatEditor extends Component<ChatEditorProps, ChatEditorSta
    if (prevProps.message !== props.message && this.editor) {
      this.editor.setValue(props.message);
      this.editor.setOption('mode', MARKDOWN_CONFIG);
-      this.editor?.focus();
-      this.editor.execCommand('goDocEnd');
-      this.editor?.focus();
+      //this.editor?.focus();
+      //this.editor.execCommand('goDocEnd');
+      //this.editor?.focus();
      return;
    }

@ -281,7 +298,6 @@ return;
          onChange={(e, d, v) => this.messageChange(e, d, v)}
          editorDidMount={(editor) => {
            this.editor = editor;
-            editor.focus();
          }}
          {...props}
            />
--- a/pkg/interface/src/views/apps/chat/components/ChatInput.tsx
+++ b/pkg/interface/src/views/apps/chat/components/ChatInput.tsx
@ -226,7 +226,9 @@ export class ChatInput extends Component<ChatInputProps, ChatInputState> {
  }
 }

+// @ts-ignore withLocalState prop passing weirdness
 export default withLocalState<Omit<ChatInputProps, keyof IuseStorage>, 'hideAvatars', ChatInput>(
+  // @ts-ignore withLocalState prop passing weirdness
  withStorage<ChatInputProps, ChatInput>(ChatInput, { accept: 'image/*' }),
  ['hideAvatars']
 );
--- a/pkg/interface/src/views/apps/chat/components/ChatMessage.tsx
+++ b/pkg/interface/src/views/apps/chat/components/ChatMessage.tsx
@ -251,8 +251,7 @@ function ChatMessage(props: ChatMessageProps) {
  let onDelete = props?.onDelete ?? (() => {});
  const transcluded = props?.transcluded ?? 0;
  const renderSigil = props.renderSigil ?? (Boolean(nextMsg && msg.author !== nextMsg.author) ||
-        !nextMsg ||
-        msg.number === 1
+        !nextMsg
    );

    const ourMention = msg?.contents?.some((e: MentionContent) => {
--- a/pkg/interface/src/views/apps/chat/components/ChatPane.tsx
+++ b/pkg/interface/src/views/apps/chat/components/ChatPane.tsx
@ -34,7 +34,7 @@ interface ChatPaneProps {
   * Get contents of reply message
   */
  onReply: (msg: Post) => string;
-  onDelete: (msg: Post) => void;
+  onDelete?: (msg: Post) => void;
  /**
   * Fetch more messages
   *
@ -136,6 +136,7 @@ export function ChatPane(props: ChatPaneProps): ReactElement {
  }

  return (
+    // @ts-ignore
    <Col {...bind} height="100%" overflow="hidden" position="relative">
      <ShareProfile
        our={ourContact}
--- a/pkg/interface/src/views/apps/chat/components/ChatWindow.tsx
+++ b/pkg/interface/src/views/apps/chat/components/ChatWindow.tsx
@ -239,6 +239,7 @@ class ChatWindow extends Component<
    };

    return (
+      // @ts-ignore
      <ChatMessage
        key={index.toString()}
        ref={ref}
@ -281,6 +282,7 @@ class ChatWindow extends Component<
          origin='bottom'
          style={virtScrollerStyle}
          onBottomLoaded={this.onBottomLoaded}
+          // @ts-ignore paging @liam-fitzgerald on virtualscroller props
          onScroll={this.onScroll}
          data={graph}
          size={graph.size}
--- a/pkg/interface/src/views/apps/launch/components/Groups.tsx
+++ b/pkg/interface/src/views/apps/launch/components/Groups.tsx
@ -56,15 +56,14 @@ export default function Groups(props: GroupsProps & Parameters<typeof Box>[0]) {
        const path = group?.group;
        const unreadCount = graphUnreads(path);
        const notCount = graphNotifications(path);
-
        return (
          <Group
+            key={group.metadata.title}
            updates={notCount}
            first={index === 0}
            unreads={unreadCount}
            path={group?.group}
            title={group.metadata.title}
-            picture={group.metadata.picture}
          />
        );
      })}
@ -96,7 +95,7 @@ function Group(props: GroupProps) {
        .diff(moment()))
    .as('days'))) || 0;
  return (
-    <Tile ref={anchorRef} position="relative" bg={isTutorialGroup ? 'lightBlue' : undefined} to={`/~landscape${path}`} gridColumnStart={first ? '1' : null}>
+    <Tile ref={anchorRef} position="relative" bg={isTutorialGroup ? 'lightBlue' : undefined} to={`/~landscape${path}`} gridColumnStart={first ? 1 : null}>
      <Col height="100%" justifyContent="space-between">
        <Text>{title}</Text>
        {!hideUnreads && (<Col>
--- a/pkg/interface/src/views/apps/launch/components/tiles.tsx
+++ b/pkg/interface/src/views/apps/launch/components/tiles.tsx
@ -35,6 +35,7 @@ const Tiles = (props: TileProps): ReactElement => {
        return (
          <WeatherTile
            key={key}
+            // @ts-ignore withState not passing props
            api={props.api}
          />
        );
--- a/pkg/interface/src/views/apps/launch/components/tiles/weather.tsx
+++ b/pkg/interface/src/views/apps/launch/components/tiles/weather.tsx
@ -135,7 +135,7 @@ class WeatherTile extends React.Component<WeatherTileProps, WeatherTileState> {
          {locationName ? ` Current location is near ${locationName}.` : ''}
        </Text>
        {error}
-        <Box mt='auto' display='flex' marginBlockEnd={0}>
+        <Box mt='auto' display='flex' style={{ marginBlockEnd: '0' }}>
          <BaseInput
            id="location"
            size={10}
--- a/pkg/interface/src/views/apps/links/LinkResource.tsx
+++ b/pkg/interface/src/views/apps/links/LinkResource.tsx
@ -1,4 +1,5 @@
 import { Box, Center, Col, LoadingSpinner, Text } from '@tlon/indigo-react';
+import { Group } from '@urbit/api';
 import { Association } from '@urbit/api/metadata';
 import bigInt from 'big-integer';
 import React, { useEffect } from 'react';
@ -35,7 +36,7 @@ export function LinkResource(props: LinkResourceProps) {

  const [, , ship, name] = rid.split('/');
  const resourcePath = `${ship.slice(1)}/${name}`;
-  const resource = associations.graph[rid]
+  const resource: any = associations.graph[rid]
    ? associations.graph[rid]
    : { metadata: {} };
  const groups = useGroupState(state => state.groups);
@ -62,13 +63,14 @@ export function LinkResource(props: LinkResourceProps) {
          path={relativePath('')}
          render={(props) => {
            return (
+              // @ts-ignore
              <LinkWindow
                key={rid}
                association={resource}
                resource={resourcePath}
                graph={graph}
                baseUrl={resourceUrl}
-                group={group}
+                group={group as Group}
                path={resource.group}
                pendingSize={Object.keys(graphTimesentMap[resourcePath] || {}).length}
                api={api}
@ -110,7 +112,7 @@ export function LinkResource(props: LinkResourceProps) {
                  node={node}
                  baseUrl={resourceUrl}
                  association={association}
-                  group={group}
+                  group={group as Group}
                  path={resource?.group}
                  api={api}
                  mt={3}
@ -125,8 +127,8 @@ export function LinkResource(props: LinkResourceProps) {
                  api={api}
                  editCommentId={editCommentId}
                  history={props.history}
-                  baseUrl={`${resourceUrl}/${props.match.params.index}`}
-                  group={group}
+                  baseUrl={`${resourceUrl}/index/${props.match.params.index}`}
+                  group={group as Group}
                  px={3}
                />
              </Col>
--- a/pkg/interface/src/views/apps/links/LinkWindow.tsx
+++ b/pkg/interface/src/views/apps/links/LinkWindow.tsx
@ -21,6 +21,7 @@ interface LinkWindowProps {
  path: string;
  api: GlobalApi;
  pendingSize: number;
+  mb?: number;
 }

 const style = {
@ -48,6 +49,7 @@ class LinkWindow extends Component<LinkWindowProps, {}> {
    const { props } = this;
    const { association, graph, api } = props;
    const [, , ship, name] = association.resource.split('/');
+    // @ts-ignore Uint8Array vs. BigInt mismatch?
    const node = graph.get(index);
    const first = graph.peekLargest()?.[0];
    const post = node?.post;
@ -58,6 +60,7 @@ class LinkWindow extends Component<LinkWindowProps, {}> {
      ...props,
      node
    };
+    {/* @ts-ignore calling @liam-fitzgerald on Uint8Array props */}
    if (this.canWrite() && index.eq(first ?? bigInt.zero)) {
      return (
        <React.Fragment key={index.toString()}>
@ -125,6 +128,7 @@ class LinkWindow extends Component<LinkWindowProps, {}> {

    return (
      <Col width="100%" height="100%" position="relative">
+        {/* @ts-ignore calling @liam-fitzgerald on virtualscroller */}
        <VirtualScroller
          origin="top"
          offset={0}
--- a/pkg/interface/src/views/apps/links/components/LinkItem.tsx
+++ b/pkg/interface/src/views/apps/links/components/LinkItem.tsx
@ -20,6 +20,8 @@ interface LinkItemProps {
  group: Group;
  path: string;
  baseUrl: string;
+  mt?: number;
+  measure?: any;
 }
 export const LinkItem = React.forwardRef((props: LinkItemProps, ref: RefObject<HTMLDivElement>): ReactElement => {
  const {
@ -49,6 +51,7 @@ export const LinkItem = React.forwardRef((props: LinkItemProps, ref: RefObject<H
      setTimeout(() => {
        console.log(remoteRef.current);
        if(document.activeElement instanceof HTMLIFrameElement
+          // @ts-ignore forwardref prop passing
          && remoteRef?.current?.containerRef?.contains(document.activeElement)) {
          markRead();
        }
@ -100,6 +103,7 @@ export const LinkItem = React.forwardRef((props: LinkItemProps, ref: RefObject<H
  const appPath = `/ship/~${resource}`;
  const unreads = useHarkState(state => state.unreads);
  const commColor = (unreads.graph?.[appPath]?.[`/${index}`]?.unreads ?? 0) > 0 ? 'blue' : 'gray';
+  // @ts-ignore hark will have to choose between sets and numbers
  const isUnread = unreads.graph?.[appPath]?.['/']?.unreads?.has(node.post.index);

  return (
@ -135,8 +139,10 @@ export const LinkItem = React.forwardRef((props: LinkItemProps, ref: RefObject<H
        <>
        <RemoteContent
          ref={(r) => {
+            // @ts-ignore RemoteContent weirdness
            remoteRef.current = r;
          }}
+          // @ts-ignore RemoteContent weirdness
          renderUrl={false}
          url={href}
          text={contents[0].text}
--- a/pkg/interface/src/views/apps/links/components/LinkSubmit.tsx
+++ b/pkg/interface/src/views/apps/links/components/LinkSubmit.tsx
@ -12,6 +12,7 @@ interface LinkSubmitProps {
  api: GlobalApi;
  name: string;
  ship: string;
+  parentIndex?: any;
 }

 const LinkSubmit = (props: LinkSubmitProps) => {
@ -157,6 +158,7 @@ const LinkSubmit = (props: LinkSubmitProps) => {

  return (
    <>
+    {/* @ts-ignore archaic event type mismatch */}
      <Box
        flexShrink={0}
        position='relative'
@ -194,6 +196,7 @@ const LinkSubmit = (props: LinkSubmitProps) => {
            onBlur={() => [setUrlFocused(false), setSubmitFocused(false)]}
            onFocus={() => [setUrlFocused(true), setSubmitFocused(true)]}
            spellCheck="false"
+            // @ts-ignore archaic event type mismatch error
            onPaste={onPaste}
            onKeyPress={onKeyPress}
            value={linkValue}
--- a/pkg/interface/src/views/apps/notifications/graph.tsx
+++ b/pkg/interface/src/views/apps/notifications/graph.tsx
@ -292,7 +292,7 @@ export function GraphNotification(props: {
      const first = contents[0];
      history.push(
        getNodeUrl(
-          index.module,
+          index.mark,
          groups[association?.group]?.hidden,
          association?.group,
          association?.resource,
@ -328,7 +328,6 @@ export function GraphNotification(props: {
          hideAuthors={hideAuthors}
          posts={contents.slice(0, 4)}
          mod={index.mark}
-          description={index.description}
          index={contents?.[0].index}
          association={association}
          hidden={groups[association?.group]?.hidden}
--- a/pkg/interface/src/views/apps/permalinks/TranscludedNode.tsx
+++ b/pkg/interface/src/views/apps/permalinks/TranscludedNode.tsx
@ -49,7 +49,7 @@ function TranscludedLinkNode(props: {
          <Author
            pt='12px'
            pl='12px'
-            size='24'
+            size={24}
            sigilPadding='6'
            showImage
            ship={node.post.author}
@ -121,7 +121,7 @@ function TranscludedComment(props: {
      <Author
        pt='12px'
        pl='12px'
-        size='24'
+        size={24}
        sigilPadding='6'
        showImage
        ship={comment.post.author}
@ -175,7 +175,7 @@ function TranscludedPublishNode(props: {
          <Author
            pl='12px'
            pt='12px'
-            size='24'
+            size={24}
            sigilPadding='6'
            showImage
            ship={post.post.author}
@ -235,7 +235,7 @@ export function TranscludedPost(props: {
      <Author
        pt='12px'
        pl='12px'
-        size='24'
+        size={24}
        sigilPadding='6'
        showImage
        ship={post.author}
@ -273,7 +273,7 @@ export function TranscludedNode(props: {

  if (
    typeof node?.post === "string" &&
-    assoc.metadata.config.graph === "chat"
+    (assoc.metadata.config as GraphConfig).graph === "chat"
  ) {
    return (
      <Box
@ -296,6 +296,7 @@ export function TranscludedNode(props: {
            renderSigil
            transcluded={transcluded + 1}
            className="items-top cf hide-child"
+            // @ts-ignore isn't forwarding props to memo
            association={assoc}
            msg={node.post}
            fontSize={0}
--- a/pkg/interface/src/views/apps/permalinks/embed.tsx
+++ b/pkg/interface/src/views/apps/permalinks/embed.tsx
@ -1,20 +1,12 @@
-import {
-  BaseAnchor, Box,
-
-
-
-
-
-  Center, Col, Icon, Row, Text
-} from "@tlon/indigo-react";
-import { Association, GraphNode, resourceFromPath } from '@urbit/api';
+import { BaseAnchor, Box, Center, Col, Icon, Row, Text } from "@tlon/indigo-react";
+import { Association, GraphNode, resourceFromPath, GraphConfig } from '@urbit/api';
 import React, { useCallback, useEffect, useState } from "react";
 import { useHistory, useLocation } from 'react-router-dom';
 import GlobalApi from '~/logic/api/global';
 import {
  getPermalinkForGraph, GraphPermalink as IGraphPermalink, parsePermalink
 } from '~/logic/lib/permalinks';
-import { getModuleIcon } from "~/logic/lib/util";
+import { getModuleIcon, GraphModule } from "~/logic/lib/util";
 import { useVirtualResizeProp } from "~/logic/lib/virtualContext";
 import useGraphState from "~/logic/state/graph";
 import useMetadataState from "~/logic/state/metadata";
@ -129,7 +121,7 @@ function GraphPermalink(
        <PermalinkDetails
          known
          showTransclusion={showTransclusion}
-          icon={getModuleIcon(association.metadata.config.graph)}
+          icon={getModuleIcon((association.metadata.config as GraphConfig).graph as GraphModule)}
          title={association.metadata.title}
          permalink={permalink}
        />
@ -197,6 +189,7 @@ export function PermalinkEmbed(props: {
  transcluded: number;
  showOurContact?: boolean;
  full?: boolean;
+  pending?: any;
 }) {
  const permalink = parsePermalink(props.link);

--- a/pkg/interface/src/views/apps/profile/components/EditProfile.tsx
+++ b/pkg/interface/src/views/apps/profile/components/EditProfile.tsx
@ -90,11 +90,12 @@ export function EditProfile(props: any): ReactElement {

  const onSubmit = async (values: any, actions: any) => {
    try {
-      await Object.keys(values).reduce((acc, key) => {
+      Object.keys(values).forEach((key) => {
        const newValue = key !== 'color' ? values[key] : uxToHex(values[key]);
        if (newValue !== contact[key]) {
          if (key === 'isPublic') {
-            return acc.then(() => api.contacts.setPublic(newValue));
+            api.contacts.setPublic(newValue)
+            return;
          } else if (key === 'groups') {
            const toRemove: string[] = _.difference(
              contact?.groups || [],
@ -104,24 +105,18 @@ export function EditProfile(props: any): ReactElement {
              newValue,
              contact?.groups || []
            );
-            const promises: Promise<any>[] = [];
-            promises.concat(
-              toRemove.map(e =>
+            toRemove.forEach(e => 
                api.contacts.edit(ship, { 'remove-group': resourceFromPath(e) })
-              )
-            );
-            promises.concat(
-              toAdd.map(e =>
+            )
+              toAdd.forEach(e =>
                api.contacts.edit(ship, { 'add-group': resourceFromPath(e) })
-              )
-            );
-            return acc.then(() => Promise.all(promises));
+            )
          } else if (key !== 'last-updated' && key !== 'isPublic') {
-            return acc.then(() => api.contacts.edit(ship, { [key]: newValue }));
+            api.contacts.edit(ship, { [key]: newValue });
+            return;
          }
        }
-        return acc;
-      }, Promise.resolve());
+      });
      // actions.setStatus({ success: null });
      history.push(`/~profile/${ship}`);
    } catch (e) {
--- a/pkg/interface/src/views/apps/profile/components/SetStatus.tsx
+++ b/pkg/interface/src/views/apps/profile/components/SetStatus.tsx
@ -39,7 +39,7 @@ export function SetStatus(props: any) {
        ref={inputRef}
        onChange={onStatusChange}
        value={_status}
-        autocomplete='off'
+        autoComplete='off'
        width='75%'
        mr={2}
        onKeyPress={(evt) => {
--- a/pkg/interface/src/views/apps/publish/PublishResource.tsx
+++ b/pkg/interface/src/views/apps/publish/PublishResource.tsx
@ -10,10 +10,13 @@ type PublishResourceProps = StoreState & {
  association: Association;
  api: GlobalApi;
  baseUrl: string;
+  history?: any;
+  match?: any;
+  location?: any;
 };

 export function PublishResource(props: PublishResourceProps) {
-  const { association, api, baseUrl, notebooks } = props;
+  const { association, api, baseUrl } = props;
  const rid = association.resource;
  const [, , ship, book] = rid.split('/');
  const location = useLocation();
--- a/pkg/interface/src/views/apps/publish/components/NotePreview.tsx
+++ b/pkg/interface/src/views/apps/publish/components/NotePreview.tsx
@ -69,6 +69,7 @@ export function NotePreview(props: NotePreviewProps) {
  const [rev, title, body, content] = getLatestRevision(node);
  const appPath = `/ship/${props.host}/${props.book}`;
  const unreads = useHarkState(state => state.unreads);
+  // @ts-ignore hark will have to choose between sets and numbers
  const isUnread = unreads.graph?.[appPath]?.['/']?.unreads?.has(`/${noteId}/1/1`);

  const snippet = getSnippet(body);
--- a/pkg/interface/src/views/apps/publish/components/Notebook.tsx
+++ b/pkg/interface/src/views/apps/publish/components/Notebook.tsx
@ -1,5 +1,5 @@
 import { Box, Col, Row, Text } from '@tlon/indigo-react';
-import { Association, Graph, Unreads } from '@urbit/api';
+import { Association, Graph } from '@urbit/api';
 import React, { ReactElement } from 'react';
 import { RouteComponentProps } from 'react-router-dom';
 import { useShowNickname } from '~/logic/lib/util';
@ -14,7 +14,6 @@ interface NotebookProps {
  association: Association;
  baseUrl: string;
  rootUrl: string;
-  unreads: Unreads;
 }

 export function Notebook(props: NotebookProps & RouteComponentProps): ReactElement | null {
--- a/pkg/interface/src/views/apps/publish/components/NotebookPosts.tsx
+++ b/pkg/interface/src/views/apps/publish/components/NotebookPosts.tsx
@ -15,7 +15,6 @@ interface NotebookPostsProps {
 }

 export function NotebookPosts(props: NotebookPostsProps) {
-  const contacts = useContactState(state => state.contacts);
  return (
    <Col>
      {Array.from(props.graph || []).map(
@ -25,7 +24,6 @@ export function NotebookPosts(props: NotebookPostsProps) {
              key={date.toString()}
              host={props.host}
              book={props.book}
-              contact={contacts[`~${node.post.author}`]}
              node={node}
              baseUrl={props.baseUrl}
              group={props.group}
--- a/pkg/interface/src/views/apps/settings/components/lib/BackgroundPicker.tsx
+++ b/pkg/interface/src/views/apps/settings/components/lib/BackgroundPicker.tsx
@ -3,6 +3,7 @@ import {

  ManagedRadioButtonField as Radio, Row, Text
 } from '@tlon/indigo-react';
+import {useField} from 'formik';
 import React, { ReactElement } from 'react';
 import GlobalApi from '~/logic/api/global';
 import { ColorInput } from '~/views/components/ColorInput';
@ -10,11 +11,7 @@ import { ImageInput } from '~/views/components/ImageInput';

 export type BgType = 'none' | 'url' | 'color';

-export function BackgroundPicker({
-  bgType,
-  bgUrl,
-  api
-}: {
+export function BackgroundPicker({ api }: {
  bgType: BgType;
  bgUrl?: string;
  api: GlobalApi;
@ -40,7 +37,6 @@ export function BackgroundPicker({
            id="bgUrl"
            placeholder="Drop or upload a file, or paste a link here"
            name="bgUrl"
-            url={bgUrl || ''}
          />
        </Col>
      </Row>
--- a/pkg/interface/src/views/apps/settings/components/lib/CalmPref.tsx
+++ b/pkg/interface/src/views/apps/settings/components/lib/CalmPref.tsx
@ -6,9 +6,11 @@ import {
 import { Form, Formik, FormikHelpers } from 'formik';
 import React, { useCallback } from 'react';
 import GlobalApi from '~/logic/api/global';
-import useSettingsState, { selectSettingsState } from '~/logic/state/settings';
+import useSettingsState, { selectSettingsState, SettingsState } from '~/logic/state/settings';
 import { AsyncButton } from '~/views/components/AsyncButton';
 import { BackButton } from './BackButton';
+import _ from 'lodash';
+import {FormikOnBlur} from '~/views/components/FormikOnBlur';

 interface FormSchema {
  hideAvatars: boolean;
@ -22,57 +24,39 @@ interface FormSchema {
  videoShown: boolean;
 }

-const settingsSel = selectSettingsState(['calm', 'remoteContentPolicy']);
+const settingsSel = (s: SettingsState): FormSchema => ({
+    hideAvatars: s.calm.hideAvatars,
+    hideNicknames: s.calm.hideAvatars,
+    hideUnreads: s.calm.hideUnreads,
+    hideGroups: s.calm.hideGroups,
+    hideUtilities: s.calm.hideUtilities,
+    imageShown: !s.remoteContentPolicy.imageShown,
+    videoShown: !s.remoteContentPolicy.videoShown,
+    oembedShown: !s.remoteContentPolicy.oembedShown,
+  audioShown: !s.remoteContentPolicy.audioShown
+});
+

 export function CalmPrefs(props: {
  api: GlobalApi;
 }) {
  const { api } = props;
-  const {
-    calm: {
-      hideAvatars,
-      hideNicknames,
-      hideUnreads,
-      hideGroups,
-      hideUtilities
-    },
-    remoteContentPolicy: {
-      imageShown,
-      videoShown,
-      oembedShown,
-      audioShown
-    }
-  } = useSettingsState(settingsSel);
-
-  const initialValues: FormSchema = {
-    hideAvatars,
-    hideNicknames,
-    hideUnreads,
-    hideGroups,
-    hideUtilities,
-    imageShown: !imageShown,
-    videoShown: !videoShown,
-    oembedShown: !oembedShown,
-    audioShown: !audioShown
-  };
+  const initialValues = useSettingsState(settingsSel);

  const onSubmit = useCallback(async (v: FormSchema, actions: FormikHelpers<FormSchema>) => {
-    await Promise.all([
-      api.settings.putEntry('calm', 'hideAvatars', v.hideAvatars),
-      api.settings.putEntry('calm', 'hideNicknames', v.hideNicknames),
-      api.settings.putEntry('calm', 'hideUnreads', v.hideUnreads),
-      api.settings.putEntry('calm', 'hideGroups', v.hideGroups),
-      api.settings.putEntry('calm', 'hideUtilities', v.hideUtilities),
-      api.settings.putEntry('remoteContentPolicy', 'imageShown', !v.imageShown),
-      api.settings.putEntry('remoteContentPolicy', 'videoShown', !v.videoShown),
-      api.settings.putEntry('remoteContentPolicy', 'audioShown', !v.audioShown),
-      api.settings.putEntry('remoteContentPolicy', 'oembedShown', !v.oembedShown)
-    ]);
+    let promises: Promise<any>[] = [];
+    _.forEach(v, (bool, key) => {
+      const bucket = ['imageShown', 'videoShown', 'audioShown', 'oembedShown'].includes(key) ? 'remoteContentPolicy' : 'calm';
+      if(initialValues[key] !== bool) {
+        promises.push(api.settings.putEntry(bucket, key, bool));
+      }
+    })
+    await Promise.all(promises);
    actions.setStatus({ success: null });
  }, [api]);

  return (
-    <Formik initialValues={initialValues} onSubmit={onSubmit}>
+    <FormikOnBlur initialValues={initialValues} onSubmit={onSubmit}>
      <Form>
        <BackButton />
        <Col borderBottom={1} borderBottomColor="washedGray" p={5} pt={4} gapY={5}>
@ -132,12 +116,8 @@ export function CalmPrefs(props: {
            id="oembedShown"
            caption="Embedded content may contain scripts that can track you"
          />
-
-          <AsyncButton primary width="fit-content" type="submit">
-            Save
-          </AsyncButton>
        </Col>
      </Form>
-    </Formik>
+    </FormikOnBlur>
  );
 }
--- a/pkg/interface/src/views/apps/settings/components/lib/Debug.tsx
+++ b/pkg/interface/src/views/apps/settings/components/lib/Debug.tsx
@ -16,7 +16,7 @@ import { BackButton } from './BackButton';

 interface StoreDebuggerProps {
  name: string;
-  useStore: UseStore<BaseState<any>>;
+  useStore: UseStore<BaseState<any> & any>;
 }

 const objectToString = (obj: any): string => JSON.stringify(obj, null, '  ');
@ -57,7 +57,9 @@ const StoreDebugger = (props: StoreDebuggerProps) => {
          placeholder="Drill Down"
          width="100%"
          onKeyUp={(event) => {
+            // @ts-ignore clearly value is in eventtarget
            if (event.target.value) {
+            // @ts-ignore clearly value is in eventtarget
              tryFilter(event.target.value);
            } else {
              setFilter('');
--- a/pkg/interface/src/views/apps/settings/components/lib/DisplayForm.tsx
+++ b/pkg/interface/src/views/apps/settings/components/lib/DisplayForm.tsx
@ -11,6 +11,7 @@ import GlobalApi from '~/logic/api/global';
 import { uxToHex } from '~/logic/lib/util';
 import useSettingsState, { selectSettingsState } from '~/logic/state/settings';
 import { AsyncButton } from '~/views/components/AsyncButton';
+import {FormikOnBlur} from '~/views/components/FormikOnBlur';
 import { BackButton } from './BackButton';
 import { BackgroundPicker, BgType } from './BackgroundPicker';

@ -58,7 +59,7 @@ export default function DisplayForm(props: DisplayFormProps) {
  const bgType = backgroundType || 'none';

  return (
-    <Formik
+    <FormikOnBlur
      validationSchema={formSchema}
      initialValues={
        {
@ -86,7 +87,6 @@ export default function DisplayForm(props: DisplayFormProps) {
        actions.setStatus({ success: null });
      }}
    >
-      {props => (
        <Form>
          <BackButton />
          <Col p={5} pt={4} gapY={5}>
@ -99,9 +99,8 @@ export default function DisplayForm(props: DisplayFormProps) {
              </Text>
            </Col>
            <BackgroundPicker
-              bgType={props.values.bgType}
-              bgUrl={props.values.bgUrl}
-              api={api}
+            api={api}
+            bgType={bgType}
            />
            <Label>Theme</Label>
            <Radio name="theme" id="light" label="Light" />
@ -112,7 +111,6 @@ export default function DisplayForm(props: DisplayFormProps) {
            </AsyncButton>
          </Col>
        </Form>
-      )}
-    </Formik>
+    </FormikOnBlur>
  );
 }
--- a/pkg/interface/src/views/apps/settings/components/lib/GroupChannelPicker.tsx
+++ b/pkg/interface/src/views/apps/settings/components/lib/GroupChannelPicker.tsx
@ -3,7 +3,8 @@ import {

  Center, Col, Icon,

-  StatelessToggleSwitchField, Text
+  ToggleSwitch, Text,
+  StatelessToggleSwitchField
 } from '@tlon/indigo-react';
 import { Association, GraphConfig, resourceFromPath } from '@urbit/api';
 import { useField } from 'formik';
@ -100,7 +101,7 @@ function Channel(props: { association: Association }) {
    return isWatching(config, association.resource);
  });

-  const [{ value }, meta, { setValue }] = useField(
+  const [{ value }, meta, { setValue, setTouched }] = useField(
    `graph["${association.resource}"]`
  );

@ -108,9 +109,11 @@ function Channel(props: { association: Association }) {
    setValue(watching);
  }, [watching]);

-  const onChange = () => {
+  const onClick = () => {
    setValue(!value);
-  };
+    setTouched(true);
+  }
+

  const icon = getModuleIcon((metadata.config as GraphConfig)?.graph as GraphModule);

@ -123,7 +126,7 @@ function Channel(props: { association: Association }) {
        <Text> {metadata.title}</Text>
      </Box>
      <Box gridColumn={4}>
-        <StatelessToggleSwitchField selected={value} onChange={onChange} />
+        <StatelessToggleSwitchField selected={value} onClick={onClick} />
      </Box>
    </>
  );
--- a/pkg/interface/src/views/apps/settings/components/lib/LeapSettings.tsx
+++ b/pkg/interface/src/views/apps/settings/components/lib/LeapSettings.tsx
@ -50,7 +50,6 @@ export function LeapSettings(props: { api: GlobalApi; }) {
  const { leap, set: setSettingsState } = useSettingsState(settingsSel);
  const categories = leap.categories as LeapCategories[];
  const missing = _.difference(leapCategories, categories);
-  console.log(categories);

  const initialValues = {
    categories: [
--- a/pkg/interface/src/views/apps/settings/components/lib/NotificationPref.tsx
+++ b/pkg/interface/src/views/apps/settings/components/lib/NotificationPref.tsx
@ -1,15 +1,19 @@
 import {
-    Col,
+  Button,
+  Col,

-    ManagedToggleSwitchField as Toggle, Text
+
+
+
+  ManagedToggleSwitchField as Toggle, Text
 } from '@tlon/indigo-react';
-import { Form, Formik, FormikHelpers } from 'formik';
+import { Form, FormikHelpers } from 'formik';
 import _ from 'lodash';
-import React, { useCallback } from 'react';
+import React, { useCallback, useState } from 'react';
 import GlobalApi from '~/logic/api/global';
 import { isWatching } from '~/logic/lib/hark';
 import useHarkState from '~/logic/state/hark';
-import { AsyncButton } from '~/views/components/AsyncButton';
+import { FormikOnBlur } from '~/views/components/FormikOnBlur';
 import { BackButton } from './BackButton';
 import { GroupChannelPicker } from './GroupChannelPicker';

@ -69,6 +73,8 @@ export function NotificationPreferences(props: {
    }
  }, [api, graphConfig, dnd]);

+  const [notificationsAllowed, setNotificationsAllowed] = useState('Notification' in window && Notification.permission !== 'default');
+
  return (
    <>
    <BackButton />
@ -82,9 +88,17 @@ export function NotificationPreferences(props: {
          messaging
        </Text>
      </Col>
-      <Formik initialValues={initialValues} onSubmit={onSubmit}>
+      <FormikOnBlur initialValues={initialValues} onSubmit={onSubmit}>
        <Form>
-          <Col gapY={4}>
+          <Col gapY="4">
+            {notificationsAllowed || !('Notification' in window)
+              ? null
+              : <Button alignSelf='flex-start' onClick={() => {
+                Notification.requestPermission().then(() => {
+                  setNotificationsAllowed(Notification.permission !== 'default');
+                });
+              }}>Allow Browser Notifications</Button>
+            }
            <Toggle
              label="Do not disturb"
              id="dnd"
@ -109,12 +123,9 @@ export function NotificationPreferences(props: {
              </Text>
              <GroupChannelPicker />
            </Col>
-            <AsyncButton primary width="fit-content">
-              Save
-            </AsyncButton>
          </Col>
        </Form>
-      </Formik>
+      </FormikOnBlur>
    </Col>
    </>
  );
--- a/pkg/interface/src/views/apps/settings/components/lib/ShortcutSettings.tsx
+++ b/pkg/interface/src/views/apps/settings/components/lib/ShortcutSettings.tsx
@ -0,0 +1,117 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import _ from 'lodash';
+
+import { Box, Col, Text } from '@tlon/indigo-react';
+import { Formik, Form, useField } from 'formik';
+
+import GlobalApi from '~/logic/api/global';
+import { getChord } from '~/logic/lib/util';
+import useSettingsState, {
+  selectSettingsState,
+  ShortcutMapping,
+} from '~/logic/state/settings';
+import { AsyncButton } from '~/views/components/AsyncButton';
+import { BackButton } from './BackButton';
+
+interface ShortcutSettingsProps {
+  api: GlobalApi;
+}
+
+const settingsSel = selectSettingsState(['keyboard']);
+
+export function ChordInput(props: { id: string; label: string }) {
+  const { id, label } = props;
+  const [capturing, setCapturing] = useState(false);
+  const [{ value }, , { setValue }] = useField(id);
+  const onCapture = useCallback(() => {
+    setCapturing(true);
+  }, []);
+  useEffect(() => {
+    if (!capturing) {
+      return;
+    }
+    function onKeydown(e: KeyboardEvent) {
+      if (['Control', 'Shift', 'Meta'].includes(e.key)) {
+        return;
+      }
+      const chord = getChord(e);
+      setValue(chord);
+      e.stopImmediatePropagation();
+      e.preventDefault();
+      setCapturing(false);
+    }
+    document.addEventListener('keydown', onKeydown);
+    return () => {
+      document.removeEventListener('keydown', onKeydown);
+    };
+  }, [capturing]);
+
+  return (
+    <>
+      <Box p="1">
+        <Text>{label}</Text>
+      </Box>
+      <Box
+        border="1"
+        borderColor="lightGray"
+        borderRadius="2"
+        onClick={onCapture}
+        p="1"
+      >
+        <Text>{capturing ? 'Press' : value}</Text>
+      </Box>
+    </>
+  );
+}
+
+export default function ShortcutSettings(props: ShortcutSettingsProps) {
+  const { api } = props;
+
+  const { keyboard } = useSettingsState(settingsSel);
+
+  return (
+    <Formik
+      initialValues={keyboard}
+      onSubmit={async (values: ShortcutMapping, actions) => {
+        const promises = _.map(values, (value, key) => {
+          return keyboard[key] !== value
+            ? api.settings.putEntry('keyboard', key, value)
+            : Promise.resolve();
+        });
+        await Promise.all(promises);
+        actions.setStatus({ success: null });
+      }}
+    >
+      <Form>
+        <BackButton />
+        <Col p="5" pt="4" gapY="5">
+          <Col gapY="1" mt="0">
+            <Text color="black" fontSize={2} fontWeight="medium">
+              Shortcuts
+            </Text>
+            <Text gray>Customize keyboard shortcuts for landscape</Text>
+          </Col>
+          <Box
+            display="grid"
+            gridTemplateColumns="1fr 100px"
+            gridGap={3}
+            maxWidth="500px"
+          >
+            <ChordInput id="navForward" label="Go forward in history" />
+            <ChordInput id="navBack" label="Go backward in history" />
+            <ChordInput
+              id="cycleForward"
+              label="Cycle forward through channel list"
+            />
+            <ChordInput
+              id="cycleBack"
+              label="Cycle backward through channel list"
+            />
+            <ChordInput id="hideSidebar" label="Show/hide group sidebar" />
+          </Box>
+          <AsyncButton primary width="fit-content">Save Changes</AsyncButton>
+        </Col>
+      </Form>
+    </Formik>
+  );
+}
--- a/pkg/interface/src/views/apps/settings/settings.tsx
+++ b/pkg/interface/src/views/apps/settings/settings.tsx
@ -13,6 +13,7 @@ import { NotificationPreferences } from './components/lib/NotificationPref';
 import S3Form from './components/lib/S3Form';
 import SecuritySettings from './components/lib/Security';
 import {DmSettings} from './components/lib/DmSettings';
+import ShortcutSettings from './components/lib/ShortcutSettings';

 export const Skeleton = (props: { children: ReactNode }) => (
  <Box height='100%' width='100%' px={[0, 3]} pb={[0, 3]} borderRadius={1}>
@ -115,6 +116,7 @@ return;
            <SidebarItem icon='LeapArrow' text='Leap' hash='leap' />
            <SidebarItem icon='Messages' text='Direct Messages' hash='dm' />
            <SidebarItem icon='Node' text='CalmEngine' hash='calm' />
+            <SidebarItem icon='Keyboard' text='Shortcuts' hash='shortcuts' />
            <SidebarItem
              icon='Locked'
              text='Devices + Security'
@ -132,6 +134,7 @@ return;
            )}
            {hash === 'display' && <DisplayForm api={props.api} />}
            {hash === 'dm' && <DmSettings api={props.api} />}
+            {hash === 'shortcuts' && <ShortcutSettings api={props.api} />}
            {hash === 's3' && <S3Form api={props.api} />}
            {hash === 'leap' && <LeapSettings api={props.api} />}
            {hash === 'calm' && <CalmPrefs api={props.api} />}
--- a/pkg/interface/src/views/apps/term/app.tsx
+++ b/pkg/interface/src/views/apps/term/app.tsx
@ -78,6 +78,7 @@ class TermApp extends Component {
                    border={['0','1']}
                    cursor='text'
                  >
+                    {/* @ts-ignore declare props in later pass */}
                    <History log={this.state.lines.slice(0, -1)} />
                    <Input
                      ship={this.props.ship}
--- a/pkg/interface/src/views/apps/term/components/history.tsx
+++ b/pkg/interface/src/views/apps/term/components/history.tsx
@ -21,7 +21,9 @@ export class History extends Component {
        <Box
          mt='auto'
        >
+          {/* @ts-ignore declare props in later pass */}
          {this.props.log.map((line, i) => {
+            // @ts-ignore react memo not passing props
            return <Line key={i} line={line} />;
          })}
        </Box>
--- a/pkg/interface/src/views/apps/term/components/input.tsx
+++ b/pkg/interface/src/views/apps/term/components/input.tsx
@ -15,10 +15,11 @@ export class Input extends Component {

  componentDidUpdate() {
    if (
-      !document.activeElement == document.body
-      || document.activeElement == this.inputRef.current
+      document.activeElement == this.inputRef.current
    ) {
+      // @ts-ignore ref type issues
      this.inputRef.current.focus();
+      // @ts-ignore ref type issues
      this.inputRef.current.setSelectionRange(this.props.cursor, this.props.cursor);
    }
  }
@ -26,7 +27,7 @@ export class Input extends Component {
  keyPress(e) {
    const key = e.key;
    //  let paste and leap events pass
-    if ((e.getModifierState('Control') || event.getModifierState('Meta'))
+    if ((e.getModifierState('Control') || e.getModifierState('Meta'))
        && (e.key === 'v' || e.key === '/')) {
      return;
    }
@ -115,6 +116,7 @@ belt = { met: 'bac' };
            onKeyDown={this.keyPress}
            onClick={this.click}
            onPaste={this.paste}
+            // @ts-ignore indigo-react doesn't let us pass refs
            ref={this.inputRef}
            defaultValue="connecting..."
            value={prompt}
--- a/pkg/interface/src/views/apps/term/components/line.tsx
+++ b/pkg/interface/src/views/apps/term/components/line.tsx
@ -1,6 +1,6 @@
 import { Text } from '@tlon/indigo-react';
 import React from 'react';
-
+// @ts-ignore line isn't in props?
 export default React.memo(({ line }) => {
  //  line body to jsx
  // NOTE  lines are lists of characters that might span multiple codepoints
--- a/pkg/interface/src/views/components/CommentItem.tsx
+++ b/pkg/interface/src/views/components/CommentItem.tsx
@ -46,7 +46,7 @@ export function CommentItem(props: CommentItemProps) {
    const children = Array.from(revs.children);
    const indices = [];
    for (const child in children) {
-      const node = children[child];
+      const node = children[child] as any;
      if (!node?.post || typeof node.post !== 'string') {
        indices.push(node.post?.index);
      }
--- a/pkg/interface/src/views/components/DropdownSearch.tsx
+++ b/pkg/interface/src/views/components/DropdownSearch.tsx
@ -129,6 +129,7 @@ export function DropdownSearch<C>(props: DropdownSearchProps<C>): ReactElement {

  return (
    <Box {...rest} position="relative" zIndex={9}>
+      { /* @ts-ignore investigate onblur on styled-system component later */}
      <Input
        ref={textarea}
        onChange={changeCallback}
--- a/pkg/interface/src/views/components/FormikOnBlur.tsx
+++ b/pkg/interface/src/views/components/FormikOnBlur.tsx
@ -1,28 +1,32 @@
 import { FormikConfig, FormikProvider, FormikValues, useFormik } from 'formik';
-import React, { useEffect, useImperativeHandle } from 'react';
+import React, { useEffect, useImperativeHandle, useState } from 'react';

 export function FormikOnBlur<
  Values extends FormikValues = FormikValues,
  ExtraProps = {}
 >(props: FormikConfig<Values> & ExtraProps) {
  const formikBag = useFormik<Values>({ ...props, validateOnBlur: true });
+  const [submitting, setSubmitting] = useState(false);

  useEffect(() => {
    if (
      Object.keys(formikBag.errors || {}).length === 0 &&
-      Object.keys(formikBag.touched || {}).length !== 0 &&
-      !formikBag.isSubmitting
+      formikBag.dirty && 
+      !formikBag.isSubmitting &&
+      !submitting
    ) {
+      setSubmitting(true);
      const { values } = formikBag;
      formikBag.submitForm().then(() => {
-        formikBag.resetForm({ values, touched: {} });
+        formikBag.resetForm({ values })
+        setSubmitting(false);
      });
    }
  }, [
    formikBag.errors,
-    formikBag.touched,
-    formikBag.submitForm,
-    formikBag.values
+    formikBag.dirty,
+    submitting,
+    formikBag.isSubmitting
  ]);

  const { children, innerRef } = props;
--- a/pkg/interface/src/views/components/GroupLink.tsx
+++ b/pkg/interface/src/views/components/GroupLink.tsx
@ -77,16 +77,6 @@ export function GroupLink(
          <Box pt='1' ml='2' display='flex' alignItems='center'>
            {preview ?
              <>
-                <Box pr='2' display='flex' alignItems='center'>
-                  <Icon 
-                    icon={preview.metadata.hidden ? 'Locked' : 'Public'}
-                    color='gray'
-                    mr='1'
-                   />
-                  <Text fontSize='0' color='gray'>
-                    {preview.metadata.hidden ? 'Private' : 'Public'}
-                  </Text>
-                </Box>
                <Box display='flex' alignItems='center'>
                  <Icon icon='Users' color='gray' mr='1' />
                  <Text fontSize='0'color='gray' >
--- a/pkg/interface/src/views/components/GroupSearch.tsx
+++ b/pkg/interface/src/views/components/GroupSearch.tsx
@ -6,6 +6,7 @@ import {
    ErrorLabel, Icon, Label,
    Row, Text
 } from '@tlon/indigo-react';
+import { OpenPolicy } from '@urbit/api';
 import { Association } from '@urbit/api/metadata';
 import { FieldArray, useFormikContext } from 'formik';
 import _ from 'lodash';
@ -100,7 +101,7 @@ export function GroupSearch<I extends string, V extends FormValues<I>>(props: Gr
       return Object.values(
         Object.keys(associations.groups)
           .filter(
-             e => groupState?.[e]?.policy?.open
+             e => (groupState?.[e]?.policy as OpenPolicy)?.open
           )
           .reduce((obj, key) => {
             obj[key] = associations.groups[key];
--- a/pkg/interface/src/views/components/ImageInput.tsx
+++ b/pkg/interface/src/views/components/ImageInput.tsx
@ -13,7 +13,7 @@ import useStorage from '~/logic/lib/useStorage';

 type ImageInputProps = Parameters<typeof Box>[0] & {
  id: string;
-  label: string;
+  label?: string;
  placeholder?: string;
 };

--- a/pkg/interface/src/views/components/Invite/Group.tsx
+++ b/pkg/interface/src/views/components/Invite/Group.tsx
@ -10,7 +10,7 @@ import {
  Metadata, MetadataUpdatePreview,
  resourceFromPath
 } from '@urbit/api';
-import { GraphConfig } from '@urbit/api/dist';
+import { GraphConfig } from '@urbit/api';
 import _ from 'lodash';
 import React, { ReactElement, ReactNode, useCallback } from 'react';
 import { useHistory } from 'react-router-dom';
@ -217,6 +217,7 @@ function InviteActions(props: {
  const hideJoin = useCallback(async (e) => {
    if(status?.progress === 'done') {
      set(s => {
+        // @ts-ignore investigate zustand types
        delete s.pendingJoin[resource]
      });
      e.stopPropagation();
@ -245,14 +246,14 @@ function InviteActions(props: {
        color="blue"
        height={4}
        backgroundColor="white"
-        onClick={inviteAccept}
+        onClick={inviteAccept as any}
      >
        Accept
      </StatelessAsyncButton>
      <StatelessAsyncButton
        height={4}
        backgroundColor="white"
-        onClick={inviteDecline}
+        onClick={inviteDecline as any}
      >
        Decline
      </StatelessAsyncButton>
--- a/pkg/interface/src/views/components/ProfileOverlay.tsx
+++ b/pkg/interface/src/views/components/ProfileOverlay.tsx
@ -218,7 +218,7 @@ const ProfileOverlay = (props: ProfileOverlayProps) => {
              textOverflow='ellipsis'
              overflow='hidden'
              whiteSpace='pre'
-              marginBottom={0}
+              mb={0}
              disableRemoteContent
              gray
              title={contact?.status ? contact.status : ''}
--- a/pkg/interface/src/views/components/ProfileStatus.tsx
+++ b/pkg/interface/src/views/components/ProfileStatus.tsx
@ -41,7 +41,7 @@ export const ProfileStatus = (props) => {
        <Input
          onChange={onStatusChange}
          value={_status}
-          autocomplete='off'
+          autoComplete='off'
          width='100%'
          placeholder='Set Status'
          onKeyPress={(evt) => {
--- a/pkg/interface/src/views/components/ReconnectButton.tsx
+++ b/pkg/interface/src/views/components/ReconnectButton.tsx
@ -8,15 +8,15 @@ const ReconnectButton = ({ connection, subscription }) => {
  if (connectedStatus === 'disconnected') {
    return (
      <Button onClick={reconnect} borderColor='red' px={2}>
-        <Text display={['none', 'inline']} textAlign='middle' color='red'>Reconnect</Text>
+        <Text display={['none', 'inline']} textAlign='center' color='red'>Reconnect</Text>
        <Text color='red'> ↻</Text>
      </Button>
    );
  } else if (connectedStatus === 'reconnecting') {
    return (
      <Button borderColor='yellow' px={2} onClick={() => {}} cursor='default'>
-        <LoadingSpinner pr={['0','2']} foreground='scales.yellow60' background='scales.yellow30' />
-        <Text display={['none', 'inline']} textAlign='middle' color='yellow'>Reconnecting</Text>
+        <LoadingSpinner foreground='scales.yellow60' background='scales.yellow30' />
+        <Text display={['none', 'inline']} pl={['0','2']} textAlign='center' color='yellow'>Reconnecting</Text>
      </Button>
    );
  } else {
--- a/pkg/interface/src/views/components/RichText.tsx
+++ b/pkg/interface/src/views/components/RichText.tsx
@ -25,7 +25,7 @@ const DISABLED_BLOCK_TOKENS = [
 const DISABLED_INLINE_TOKENS = [];

 type RichTextProps = ReactMarkdownProps & {
-  api: GlobalApi;
+  api?: GlobalApi;
  disableRemoteContent?: boolean;
  contact?: Contact;
  group?: Group;
@ -35,7 +35,21 @@ type RichTextProps = ReactMarkdownProps & {
  color?: string;
  children?: any;
  width?: string;
-} & PropFunc<typeof Box>;
+  display?: string[] | string;
+  mono?: boolean;
+  mb?: number;
+  minWidth?: number | string;
+  maxWidth?: number | string;
+  flexShrink?: number;
+  textOverflow?: string;
+  overflow?: string;
+  whiteSpace?: string;
+  gray?: boolean;
+  title?: string;
+  py?: number;
+  overflowX?: any;
+  verticalAlign?: any;
+}; 

 const RichText = React.memo(({ disableRemoteContent = false, api, ...props }: RichTextProps) => (
  <ReactMarkdown
@ -49,6 +63,7 @@ const RichText = React.memo(({ disableRemoteContent = false, api, ...props }: Ri
          oembedShown: false
        } : null;
        if (!disableRemoteContent) {
+          // @ts-ignore RemoteContent weirdness
          return <RemoteContent className="mw-100" url={linkProps.href} />;
        }

@ -60,16 +75,16 @@ const RichText = React.memo(({ disableRemoteContent = false, api, ...props }: Ri
            borderBottom='1px solid'
            remoteContentPolicy={remoteContentPolicy}
            onClick={(e) => {
- e.stopPropagation();
-}}
+              e.stopPropagation();
+            }}
            {...linkProps}
          >{linkProps.children}</Anchor>
        );
      },
-      linkReference: (linkProps) => {
+      linkReference: (linkProps): any => {
        const linkText = String(linkProps.children[0].props.children);
        if (isValidPatp(linkText)) {
-          return <Mention contact={props.contact || {}} group={props.group} ship={deSig(linkText)} api={api} />;
+          return <Mention ship={deSig(linkText)} api={api} />;
        } else if(linkText.startsWith('web+urbitgraph://')) {
          return (
            <PermalinkEmbed
--- a/pkg/interface/src/views/components/Spinner.tsx
+++ b/pkg/interface/src/views/components/Spinner.tsx
@ -10,7 +10,6 @@ const Spinner = ({
    <LoadingSpinner
      foreground='black'
      background='gray'
-      style={{ flexShrink: 0 }}
    />
    <Text display='inline-block' ml={2} verticalAlign='middle' flexShrink={0}>{text}</Text>
  </Text>
--- a/pkg/interface/src/views/components/StatelessAsyncAction.tsx
+++ b/pkg/interface/src/views/components/StatelessAsyncAction.tsx
@ -23,7 +23,7 @@ export function StatelessAsyncAction({

  return (
    <Action
-      height="18px"
+      height="16px"
      hideDisabled={!disabled}
      disabled={disabled || state === 'loading'}
      onClick={handleClick} {...rest}
--- a/pkg/interface/src/views/components/StatusBar.tsx
+++ b/pkg/interface/src/views/components/StatusBar.tsx
@ -1,12 +1,12 @@
 import {
-  BaseImage, Box,
-
-  Button, Col,
-
-  Icon, Row,
-
-  Text
-} from '@tlon/indigo-react';
+  BaseImage,
+  Box,
+  Button,
+  Col,
+  Icon,
+  Row,
+  Text,
+} from "@tlon/indigo-react";
 import React, { useRef } from 'react';
 import { useHistory } from 'react-router-dom';
 import { Sigil } from '~/logic/lib/sigil';
@ -73,7 +73,7 @@ const StatusBar = (props) => {
      px={3}
      pb={3}
    >
-      <Row collapse>
+      <Row>
        <Button
          width='32px'
          borderColor='lightGray'
@ -108,14 +108,15 @@ const StatusBar = (props) => {
          subscription={props.subscription}
        />
      </Row>
-      <Row justifyContent='flex-end' collapse>
+      <Row justifyContent='flex-end'>
        <StatusBarItem
+          width='32px'
          mr={2}
          backgroundColor='yellow'
          display={
            process.env.LANDSCAPE_STREAM === 'development' ? 'flex' : 'none'
          }
-          justifyContent='flex-end'
+          justifyContent='center'
          flexShrink={0}
          onClick={() =>
            window.open(
@ -125,7 +126,7 @@ const StatusBar = (props) => {
            )
          }
        >
-        <Icon icon="Bug" color="#000000" />
+          <Icon icon="Bug" color="#000000" />
        </StatusBarItem>
        <StatusBarItem
          width='32px'
@ -190,6 +191,7 @@ const StatusBar = (props) => {
            px={xPadding}
            width='32px'
            flexShrink={0}
+            border={0}
            backgroundColor={bgColor}
          >
            {profileImage}
--- a/pkg/interface/src/views/components/leap/Omnibox.tsx
+++ b/pkg/interface/src/views/components/leap/Omnibox.tsx
@ -100,7 +100,9 @@ export function Omnibox(props: OmniboxProps): ReactElement {
    }
    Mousetrap.bind('escape', props.toggle);
    const touchstart = new Event('touchstart');
+    // @ts-ignore
    inputRef?.current?.input?.dispatchEvent(touchstart);
+    // @ts-ignore
    inputRef?.current?.input?.focus();
    return () => {
      Mousetrap.unbind('escape');
@ -173,6 +175,7 @@ export function Omnibox(props: OmniboxProps): ReactElement {
    const totalLength = flattenedResults.length;
    if (selected.length) {
      const currentIndex = flattenedResults.indexOf(
+          // @ts-ignore unclear how to give this spread a return signature
        ...flattenedResults.filter((e) => {
          return e.link === selected[1];
        })
@ -194,6 +197,7 @@ export function Omnibox(props: OmniboxProps): ReactElement {
    const flattenedResults = Array.from(results.values()).flat();
    if (selected.length) {
      const currentIndex = flattenedResults.indexOf(
+        // @ts-ignore unclear how to give this spread a return signature
        ...flattenedResults.filter((e) => {
          return e.link === selected[1];
        })
@ -325,6 +329,7 @@ export function Omnibox(props: OmniboxProps): ReactElement {
                {categoryResults.sort(sortResults).map((result, i2) => (
                  <OmniboxResult
                    key={i2}
+                    // @ts-ignore withHovering doesn't pass props
                    icon={result.app}
                    text={result.title}
                    subtext={result.host}
@ -365,8 +370,10 @@ export function Omnibox(props: OmniboxProps): ReactElement {
              omniboxRef.current = el;
            }}
          >
+            { /* @ts-ignore investigate zustand types */ }
            <OmniboxInput
              ref={(el) => {
+                // @ts-ignore investigate refs
                inputRef.current = el;
              }}
              control={e => control(e)}
@ -380,5 +387,5 @@ export function Omnibox(props: OmniboxProps): ReactElement {
    </Portal>
  );
 }
-
+// @ts-ignore investigate zustand types
 export default withLocalState(Omnibox, ['toggleOmnibox', 'omniboxShown']);
--- a/pkg/interface/src/views/components/leap/OmniboxResult.tsx
+++ b/pkg/interface/src/views/components/leap/OmniboxResult.tsx
@ -4,6 +4,7 @@ import React, { Component, ReactElement } from 'react';
 import defaultApps from '~/logic/lib/default-apps';
 import Sigil from '~/logic/lib/sigil';
 import { cite, uxToHex } from '~/logic/lib/util';
+import { IconRef } from '~/types/util';
 import withState from '~/logic/lib/withState';
 import useContactState from '~/logic/state/contact';
 import useHarkState from '~/logic/state/hark';
@ -18,6 +19,7 @@ interface OmniboxResultProps {
  link: string;
  navigate: () => void;
  notificationsCount: number;
+  runtimeLag: any;
  selected: string;
  setSelection: () =>  void;
  subtext: string;
@ -50,6 +52,7 @@ export class OmniboxResult extends Component<OmniboxResultProps, OmniboxResultSt
      props.selected === props.link
      && this.result.current
    ) {
+      // @ts-ignore ref is forwarded as never, investigate later
      this.result.current.scrollIntoView({ block: 'nearest' });
    }
  }
@ -63,7 +66,7 @@ export class OmniboxResult extends Component<OmniboxResultProps, OmniboxResultSt
    notificationsCount: number,
    text: string,
    color: string
-  ): (typeof Icon) {
+  ): (any) {
    const iconFill =
      (this.state.hovered || selected === link) ? 'white' : 'black';
    const bulletFill =
@ -81,7 +84,7 @@ export class OmniboxResult extends Component<OmniboxResultProps, OmniboxResultSt
      icon.toLowerCase() === 'terminal'
    ) {
      if (icon === 'Link') {
-        link = 'Collection';
+        icon = 'Collection';
      } else if (icon === 'Terminal') {
        icon = 'Dojo';
      }
@ -89,7 +92,7 @@ export class OmniboxResult extends Component<OmniboxResultProps, OmniboxResultSt
        <Icon
          display='inline-block'
          verticalAlign='middle'
-          icon={icon}
+          icon={icon as IconRef}
          mr={2}
          size='18px'
          color={iconFill}
@ -254,6 +257,7 @@ export class OmniboxResult extends Component<OmniboxResultProps, OmniboxResultSt
        onClick={navigate}
        width='100%'
        justifyContent='space-between'
+        // @ts-ignore indigo-react doesn't allow us to pass refs
        ref={this.result}
      >
        <Box
--- a/pkg/interface/src/views/components/withPropsChecker.tsx
+++ b/pkg/interface/src/views/components/withPropsChecker.tsx
@ -1,18 +0,0 @@
-import deep_diff from 'deep-diff';
-import React, { Component, useEffect, useRef } from 'react';
-
-const withPropsChecker = (WrappedComponent: Component) => {
-  return (props: any) => {
-    const prevProps = useRef(props);
-    useEffect(() => {
-      const diff = deep_diff.diff(prevProps.current, props);
-      if (diff) {
-        console.log(diff);
-      }
-      prevProps.current = props;
-    });
-    return <WrappedComponent {...props} />;
-  };
-};
-
-export default withPropsChecker;
--- a/pkg/interface/src/views/landscape/components/Content.tsx
+++ b/pkg/interface/src/views/landscape/components/Content.tsx
@ -1,6 +1,6 @@
 import { Box } from '@tlon/indigo-react';
-import React, { useEffect } from 'react';
-import { Route, Switch } from 'react-router-dom';
+import React, { useCallback, useEffect } from 'react';
+import { Route, Switch, useHistory } from 'react-router-dom';
 import styled from 'styled-components';
 import { useLocalStorageState } from '~/logic/lib/useLocalStorageState';
 import LaunchApp from '~/views/apps/launch/App';
@ -10,6 +10,8 @@ import Profile from '~/views/apps/profile/profile';
 import Settings from '~/views/apps/settings/settings';
 import TermApp from '~/views/apps/term/app';
 import ErrorComponent from '~/views/components/Error';
+import { useShortcut } from '~/logic/state/settings';
+
 import Landscape from '~/views/landscape/index';
 import GraphApp from '../../apps/graph/App';

@ -21,6 +23,21 @@ export const Container = styled(Box)`
 `;

 export const Content = (props) => {
+  const history = useHistory();
+
+  useShortcut('navForward', useCallback((e) => {
+    e.preventDefault();
+    e.stopImmediatePropagation();
+    history.goForward();
+  }, [history.goForward]));
+
+  useShortcut('navBack', useCallback((e) => {
+    e.preventDefault();
+    e.stopImmediatePropagation();
+    history.goBack();
+  }, [history.goBack]));
+
+
  const [hasProtocol, setHasProtocol] = useLocalStorageState(
    'registeredProtocol', false
  );
--- a/pkg/interface/src/views/landscape/components/Graph/GraphContent.tsx
+++ b/pkg/interface/src/views/landscape/components/Graph/GraphContent.tsx
@ -9,7 +9,7 @@ import { Content, ReferenceContent } from '@urbit/api';
 import _ from 'lodash';
 import {
  BlockContent, Content as AstContent, Parent, Root
-} from 'mdast';
+} from 'ts-mdast';
 import React from 'react';
 import GlobalApi from '~/logic/api/global';
 import { referenceToPermalink } from '~/logic/lib/permalinks';
@ -350,12 +350,18 @@ const renderers = {
  'graph-mention': ({ ship }) => <Mention api={{} as any} ship={ship} />,
  image: ({ url }) => (
    <Box mt="1" mb="2" flexShrink={0}>
-      <RemoteContent key={url} url={url} />
+      <RemoteContent
+      // @ts-ignore RemoteContent weirdness
+      key={url} url={url}
+      />
    </Box>
  ),
  'graph-url': ({ url }) => (
    <Box mt={1} mb={2} flexShrink={0}>
-      <RemoteContent key={url} url={url} />
+      <RemoteContent
+      // @ts-ignore RemoteContent weirdness
+        key={url} url={url}
+      />
    </Box>
  ),
  'graph-reference': ({ api, reference, transcluded }) => {
--- a/pkg/interface/src/views/landscape/components/GroupSummary.tsx
+++ b/pkg/interface/src/views/landscape/components/GroupSummary.tsx
@ -1,11 +1,11 @@
-import { Col, Row, Text } from '@tlon/indigo-react';
+import { Col, Row, Text, Icon } from '@tlon/indigo-react';
 import { Metadata } from '@urbit/api';
 import React, { ReactElement, ReactNode, useRef } from 'react';
 import { TUTORIAL_GROUP, TUTORIAL_HOST } from '~/logic/lib/tutorialModal';
-import { PropFunc } from '~/types';
+import { PropFunc, IconRef } from '~/types';
 import { useTutorialModal } from '~/views/components/useTutorialModal';
 import { MetadataIcon } from './MetadataIcon';
-
+import { useCopy } from '~/logic/lib/useCopy';
 interface GroupSummaryProps {
  metadata: Metadata;
  memberCount: number;
@ -13,6 +13,8 @@ interface GroupSummaryProps {
  resource?: string;
  children?: ReactNode;
  gray?: boolean;
+  AllowCopy?: boolean;
+  locked?: boolean;
 }

 export function GroupSummary(props: GroupSummaryProps & PropFunc<typeof Col>): ReactElement {
@ -23,6 +25,7 @@ export function GroupSummary(props: GroupSummaryProps & PropFunc<typeof Col>): R
    resource === `/ship/${TUTORIAL_HOST}/${TUTORIAL_GROUP}`,
    anchorRef
  );
+  const { doCopy, copyDisplay } = useCopy(`web+urbitgraph://group${resource?.slice(5)}`, "Copy", "Checkmark");
  return (
    <Col {...rest} ref={anchorRef} gapY={4} maxWidth={['100%', '288px']}>
      <Row gapX={2} width="100%">
@ -33,13 +36,24 @@ export function GroupSummary(props: GroupSummaryProps & PropFunc<typeof Col>): R
          flexShrink={0}
        />
        <Col justifyContent="space-between" flexGrow={1} overflow="hidden">
+          <Row justifyContent="space-between">
          <Text
            fontSize={1}
            textOverflow="ellipsis"
            whiteSpace="nowrap"
            overflow="hidden"
-          >{metadata.title}</Text>
-          <Row gapX={4} >
+          >{metadata.title}
+          </Text>
+          {props?.AllowCopy &&
+            <Icon
+              color="gray"
+              icon={props?.locked ? "Locked" : copyDisplay as IconRef}
+              onClick={!props?.locked ? doCopy : null}
+              cursor={props?.locked ? "default" : "pointer"}
+            />
+          }
+          </Row>
+          <Row gapX={4} justifyContent="space-between">
            <Text fontSize={1} gray>
              {memberCount} participants
            </Text>
--- a/pkg/interface/src/views/landscape/components/Home/EmptyGroupHome.tsx
+++ b/pkg/interface/src/views/landscape/components/Home/EmptyGroupHome.tsx
@ -23,9 +23,11 @@ export function EmptyGroupHome(props) {
      { groupAssociation?.group ? (
        <GroupSummary
          memberCount={groups[groupAssociation.group].members.size}
+          locked={Boolean('invite' in groups[groupAssociation.group].policy)}
          channelCount={channelCount}
          metadata={groupAssociation.metadata}
          resource={groupAssociation.group}
+          AllowCopy
        />
      ) : (
        <Box p={4}>
--- a/pkg/interface/src/views/landscape/components/Home/GroupHome.tsx
+++ b/pkg/interface/src/views/landscape/components/Home/GroupHome.tsx
@ -8,6 +8,7 @@ import { AddFeedBanner } from './AddFeedBanner';
 import { EmptyGroupHome } from './EmptyGroupHome';
 import { EnableGroupFeed } from './EnableGroupFeed';
 import { GroupFeed } from './GroupFeed';
+import {getFeedPath} from '~/logic/lib/util';

 function GroupHome(props) {
  const {
@ -21,23 +22,15 @@ function GroupHome(props) {
  const associations = useMetadataState(state => state.associations);
  const groups = useGroupState(state => state.groups);

-  const metadata = associations?.groups[groupPath]?.metadata;
+  const association = associations?.groups[groupPath];

-  const askFeedBanner =
-    ship === `~${window.ship}` &&
-    metadata &&
-    metadata.config &&
-    'group' in metadata.config &&
-    metadata.config.group === null;
+  const feedPath = getFeedPath(association);

-  const isFeedEnabled =
-    metadata &&
-    metadata.config &&
-    (metadata.config as GroupConfig).group &&
-    'resource' in (metadata.config as GroupConfig).group;
+  const askFeedBanner = feedPath === undefined;

-  const graphPath = (metadata.config as GroupConfig)?.group?.resource;
-  const graphMetadata = associations?.graph[graphPath]?.metadata;
+  const isFeedEnabled = !!feedPath;
+
+  const graphMetadata = associations?.graph[feedPath]?.metadata;

  return (
    <Box width="100%" height="100%" overflow="hidden">
@ -62,7 +55,7 @@ function GroupHome(props) {
      ) : null }
      <Route path={`${baseUrl}/feed`}>
        <GroupFeed
-          graphPath={graphPath}
+          graphPath={feedPath}
          groupPath={groupPath}
          vip={graphMetadata?.vip || ''}
          api={api}
--- a/pkg/interface/src/views/landscape/components/Home/Post/PostFeed.tsx
+++ b/pkg/interface/src/views/landscape/components/Home/Post/PostFeed.tsx
@ -1,5 +1,6 @@
 import { Box, Col } from '@tlon/indigo-react';
 import { Association, Graph, GraphNode, Group } from '@urbit/api';
+import { History } from 'history';
 import bigInt from 'big-integer';
 import React from 'react';
 import { withRouter } from 'react-router';
@ -26,7 +27,7 @@ interface PostFeedProps {
  pendingSize: number;
 }

-class PostFeed extends React.Component<PostFeedProps, PostFeedState> {
+class PostFeed extends React.Component<PostFeedProps, any> {
  isFetching: boolean;
  constructor(props) {
    super(props);
@ -36,7 +37,7 @@ class PostFeed extends React.Component<PostFeedProps, PostFeedState> {
    this.fetchPosts = this.fetchPosts.bind(this);
    this.doNotFetch = this.doNotFetch.bind(this);
  }
-
+  // @ts-ignore needs @liam-fitzgerald peek at props for virtualscroller
  renderItem = React.forwardRef(({ index, scrollWindow }, ref) => {
    const {
      graph,
@ -57,7 +58,7 @@ class PostFeed extends React.Component<PostFeedProps, PostFeedState> {

    const first = graph.peekLargest()?.[0];
    const post = node?.post;
-    const nodeIndex = 
+    const nodeIndex =
      ( parentNode &&
        typeof parentNode.post !== 'string'
      ) ? parentNode.post.index.split('/').slice(1).map((ind) => {
@ -69,6 +70,7 @@ class PostFeed extends React.Component<PostFeedProps, PostFeedState> {
        <React.Fragment key={index.toString()}>
          <Col
            key={index.toString()}
+            // @ts-ignore indigo-react doesn't allow us to pass refs
            ref={ref}
            mb={3}
            width="100%"
@ -76,6 +78,7 @@ class PostFeed extends React.Component<PostFeedProps, PostFeedState> {
          >
            <PostItem
              key={parentNode.post.index}
+              // @ts-ignore withHovering prop pass is broken?
              parentPost={grandparentNode?.post}
              node={parentNode}
              parentNode={grandparentNode}
@ -92,6 +95,7 @@ class PostFeed extends React.Component<PostFeedProps, PostFeedState> {
            />
          </Col>
          <PostItem
+            // @ts-ignore withHovering prop pass is broken?
            node={node}
            graphPath={graphPath}
            association={association}
@ -110,8 +114,10 @@ class PostFeed extends React.Component<PostFeedProps, PostFeedState> {
    }

    return (
+        // @ts-ignore indigo-react doesn't allow us to pass refs
      <Box key={index.toString()} ref={ref}>
      <PostItem
+        // @ts-ignore withHovering prop pass is broken?
        node={node}
        graphPath={graphPath}
        association={association}
@ -179,6 +185,7 @@ class PostFeed extends React.Component<PostFeedProps, PostFeedState> {
          data={graph}
          averageHeight={106}
          size={graph.size}
+          totalSize={graph.size}
          style={virtualScrollerStyle}
          pendingSize={pendingSize}
          renderer={this.renderItem}
--- a/pkg/interface/src/views/landscape/components/Home/Post/PostInput.tsx
+++ b/pkg/interface/src/views/landscape/components/Home/Post/PostInput.tsx
@ -120,7 +120,7 @@ const PostInput = (props: PostInputProps): ReactElement | null => {
        fontSize={1}
        minHeight="62px"
        fontFamily={code ? 'mono' : 'sans'}
-        lineNumber={3}
+        rows={3}
        style={{
          resize: 'vertical'
        }}
--- a/pkg/interface/src/views/landscape/components/Home/Post/PostItem/PostHeader.tsx
+++ b/pkg/interface/src/views/landscape/components/Home/Post/PostItem/PostHeader.tsx
@ -15,6 +15,7 @@ interface PostHeaderProps {
  association: Association;
  isReply: boolean;
  showTimestamp: boolean;
+  graphPath: any;
 }

 const PostHeader = (props: PostHeaderProps): ReactElement => {
--- a/pkg/interface/src/views/landscape/components/Home/Post/PostReplies.tsx
+++ b/pkg/interface/src/views/landscape/components/Home/Post/PostReplies.tsx
@ -1,4 +1,5 @@
 import { Box, Col, Text } from '@tlon/indigo-react';
+import { GraphNode } from '@urbit/api';
 import bigInt from 'big-integer';
 import React from 'react';
 import { resourceFromPath } from '~/logic/lib/group';
@ -37,7 +38,7 @@ export default function PostReplies(props) {
    return bigInt(ind);
  });

-  let node;
+  let node: GraphNode;
  let parentNode;
  nodeIndex.forEach((i, idx) => {
    if (!graph) {
@ -69,6 +70,7 @@ export default function PostReplies(props) {
        <Box mt={3} width="100%" alignItems="center">
          <PostItem
            key={node.post.index}
+            // @ts-ignore withHovering prop pass is broken?
            node={node}
            graphPath={graphPath}
            association={association}
--- a/pkg/interface/src/views/landscape/components/Home/Post/PostTimeline.tsx
+++ b/pkg/interface/src/views/landscape/components/Home/Post/PostTimeline.tsx
@ -1,5 +1,6 @@
 import { Box, Col, Text } from '@tlon/indigo-react';
 import { Association, Graph, Group } from '@urbit/api';
+import { History } from 'history';
 import React, { ReactElement } from 'react';
 import GlobalApi from '~/logic/api/global';
 import { Loading } from '~/views/components/Loading';
@ -15,6 +16,7 @@ interface PostTimelineProps {
  group: Group;
  pendingSize: number;
  vip: string;
+  history?: History;
 }

 const PostTimeline = (props: PostTimelineProps): ReactElement => {
--- a/pkg/interface/src/views/landscape/components/NewGroup.tsx
+++ b/pkg/interface/src/views/landscape/components/NewGroup.tsx
@ -31,7 +31,7 @@ interface NewGroupProps {
  api: GlobalApi;
 }

-export function NewGroup(props: NewGroupProps & RouteComponentProps): ReactElement {
+export function NewGroup(props: NewGroupProps): ReactElement {
  const { api } = props;
  const history = useHistory();
  const initialValues: FormSchema = {
--- a/pkg/interface/src/views/landscape/components/Sidebar/SidebarList.tsx
+++ b/pkg/interface/src/views/landscape/components/Sidebar/SidebarList.tsx
@ -1,14 +1,16 @@
-import React, { ReactElement } from 'react';
+import React, { ReactElement, useCallback } from 'react';
 import { AppAssociations, Associations, Graph, UnreadStats } from '@urbit/api';
 import { patp, patp2dec } from 'urbit-ob';

 import { SidebarAssociationItem, SidebarDmItem } from './SidebarItem';
-import useMetadataState from '~/logic/state/metadata';
-import {useInbox} from '~/logic/state/graph';
+import useGraphState, {useInbox} from '~/logic/state/graph';
 import useHarkState from '~/logic/state/hark';
-import { alphabeticalOrder } from '~/logic/lib/util';
-import { Workspace } from '~/types/workspace';
+import { alphabeticalOrder, getResourcePath, modulo } from '~/logic/lib/util';
 import { SidebarAppConfigs, SidebarListConfig, SidebarSort } from './types';
+import { Workspace } from '~/types/workspace';
+import useMetadataState from '~/logic/state/metadata';
+import {useHistory} from 'react-router';
+import { useShortcut } from '~/logic/state/settings';

 function sidebarSort(
  associations: AppAssociations,
@ -46,7 +48,6 @@ function sidebarSort(
  };
 }

-
 function getItems(associations: Associations, workspace: Workspace, inbox: Graph) {
   const filtered = Object.keys(associations.graph).filter((a) => {
     const assoc = associations.graph[a];
@ -95,11 +96,39 @@ export function SidebarList(props: {
  const associations = useMetadataState(state => state.associations);
  const inbox = useInbox();
  const unreads = useHarkState(s => s.unreads.graph?.[`/ship/~${window.ship}/dm-inbox`]);
+  const graphKeys = useGraphState(s => s.graphKeys);


  const ordered = getItems(associations, workspace, inbox)
    .sort(sidebarSort(associations.graph, props.apps, unreads)[config.sortBy]);

+  const history = useHistory();
+
+  const cycleChannels = useCallback((backward: boolean) => {
+    const idx = ordered.findIndex(s => s === selected);
+    const offset = backward ? -1 : 1
+
+    const newIdx = modulo(idx+offset, ordered.length - 1);
+    const { metadata, resource } = associations[ordered[newIdx]];
+    const joined = graphKeys.has(resource.slice(7));
+    let path = '/~landscape/home';
+    if ('graph' in metadata.config) {
+      path = getResourcePath(workspace, resource, joined, metadata.config.graph);
+    }
+    history.push(path)
+  }, [selected, history.push]);
+
+  useShortcut('cycleForward', useCallback((e: KeyboardEvent) => {
+    cycleChannels(false);
+    e.preventDefault();
+  }, [cycleChannels]));
+
+  useShortcut('cycleBack', useCallback((e: KeyboardEvent) => {
+    cycleChannels(true);
+    e.preventDefault();
+  }, [cycleChannels]))
+
+
  return (
    <>
      {ordered.map((pathOrShip) => {
--- a/pkg/interface/src/views/landscape/components/Sidebar/SidebarListHeader.tsx
+++ b/pkg/interface/src/views/landscape/components/Sidebar/SidebarListHeader.tsx
@ -21,6 +21,7 @@ import { Dropdown } from '~/views/components/Dropdown';
 import { FormikOnBlur } from '~/views/components/FormikOnBlur';
 import { NewChannel } from '~/views/landscape/components/NewChannel';
 import { SidebarListConfig } from './types';
+import {getFeedPath} from '~/logic/lib/util';

 export function SidebarListHeader(props: {
  api: GlobalApi;
@ -52,10 +53,7 @@ export function SidebarListHeader(props: {

  const noun = (props.workspace?.type === 'messages') ? 'Messages' : 'Channels';

-  let feedPath: string = null;
-  if (metadata?.config && 'group' in metadata?.config && metadata.config?.group && 'resource' in metadata.config.group) {
-    feedPath = metadata.config.group.resource;
-  }
+  let feedPath = groupPath ? getFeedPath(associations.groups[groupPath]) : undefined;

  const unreadCount = useHarkState(
    s => s.unreads?.graph?.[feedPath ?? '']?.['/']?.unreads as number ?? 0
--- a/pkg/interface/src/views/landscape/components/Skeleton.tsx
+++ b/pkg/interface/src/views/landscape/components/Skeleton.tsx
@ -1,13 +1,14 @@
+import React, { Children, ReactElement, ReactNode, useCallback, useMemo, useState } from 'react';
+import { Sidebar } from './Sidebar/Sidebar';
 import { AppName } from '@urbit/api';
-import React, { ReactElement, ReactNode, useMemo } from 'react';
 import GlobalApi from '~/logic/api/global';
 import useGraphState from '~/logic/state/graph';
 import useHarkState from '~/logic/state/hark';
 import { Workspace } from '~/types/workspace';
 import { Body } from '~/views/components/Body';
 import ErrorBoundary from '~/views/components/ErrorBoundary';
+import { useShortcut } from '~/logic/state/settings';
 import { useGraphModule } from './Sidebar/Apps';
-import { Sidebar } from './Sidebar/Sidebar';

 interface SkeletonProps {
  children: ReactNode;
@ -21,6 +22,10 @@ interface SkeletonProps {
 }

 export function Skeleton(props: SkeletonProps): ReactElement {
+  const [sidebar, setSidebar] = useState(true)
+  useShortcut('hideSidebar', useCallback(() => {
+    setSidebar(s => !s);
+  }, []));
  const graphs = useGraphState(state => state.graphs);
  const graphKeys = useGraphState(state => state.graphKeys);
  const unreads = useHarkState(state => state.unreads);
@ -32,7 +37,7 @@ export function Skeleton(props: SkeletonProps): ReactElement {
    [graphConfig]
  );

-  return (
+  return !sidebar ? (<Body> {props.children} </Body>) : (
    <Body
      display="grid"
      gridTemplateColumns={
--- a/pkg/interface/src/wdyr.js
+++ b/pkg/interface/src/wdyr.js
@ -1,6 +1,6 @@
 import React from 'react';

-if (process.env.NODE_ENV === 'development') {
+if (false && process.env.NODE_ENV === 'development') {
  const whyDidYouRender = require('@welldone-software/why-did-you-render');
  whyDidYouRender(React, {
    trackAllPureComponents: true
--- a/pkg/npm/api/hark/types.ts
+++ b/pkg/npm/api/hark/types.ts
@ -20,7 +20,7 @@ export interface GraphNotifIndex {
  graph: string;
  group: string;
  description: GraphNotifDescription;
-  module: string;
+  mark: string;
  index: string;
 }

--- a/pkg/npm/api/lib/BigIntOrderedMap.ts
+++ b/pkg/npm/api/lib/BigIntOrderedMap.ts
@ -39,7 +39,7 @@ export default class BigIntOrderedMap<V> implements Iterable<[BigInteger, V]> {
      items.forEach(([key, value]) => {
        draft.root[key.toString()] = castDraft(value);
      });
-      draft.generateCachedIter();
+      draft.cachedIter = null;
    }, 
    (patches) => {
      //console.log(`gassed with ${JSON.stringify(patches, null, 2)}`);
--- a/pkg/npm/api/metadata/types.ts
+++ b/pkg/npm/api/metadata/types.ts
@ -1,4 +1,3 @@
-import { Resource } from "..";
 import { AppName, Path, Patp } from "../lib";

 export type MetadataUpdate =