ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-04 13:19:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next/landscape

Browse Source
This commit is contained in:
tomholford 2022-02-28 15:39:17 -06:00
commit 3bbfd20022
4 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/grid/src/state/base.ts
View File

@ -4,7 +4,7 @@ import { compose } from 'lodash/fp';
import _ from 'lodash'; import _ from 'lodash';
import create, { GetState, SetState, UseStore } from 'zustand'; import create, { GetState, SetState, UseStore } from 'zustand';
import { persist } from 'zustand/middleware'; import { persist } from 'zustand/middleware';
import Urbit, { SubscriptionRequestInterface } from '@urbit/http-api'; import Urbit, { FatalError, SubscriptionRequestInterface } from '@urbit/http-api';
import { Poke } from '@urbit/api'; import { Poke } from '@urbit/api';
import api from './api'; import api from './api';
import { clearStorageMigration, createStorageKey, storageVersion, useMockData } from './util'; import { clearStorageMigration, createStorageKey, storageVersion, useMockData } from './util';
@ -107,7 +107,9 @@ export function createSubscription(
path, path,
event: e, event: e,
err: () => {}, err: () => {},
quit: () => {} quit: () => {
throw new FatalError("subscription clogged");
}
}; };
// TODO: err, quit handling (resubscribe?) // TODO: err, quit handling (resubscribe?)
return request; return request;

4
pkg/interface/src/views/apps/notifications/notification.tsx
View File

@ -8,7 +8,7 @@ import {
} from '@urbit/api'; } from '@urbit/api';
import { BigInteger } from 'big-integer'; import { BigInteger } from 'big-integer';
import React, { useCallback } from 'react'; import React, { useCallback } from 'react';
import { useHovering } from '~/logic/lib/util'; import { deSig, useHovering } from '~/logic/lib/util';
import useLocalState from '~/logic/state/local'; import useLocalState from '~/logic/state/local';
import { StatelessAsyncAction } from '~/views/components/StatelessAsyncAction'; import { StatelessAsyncAction } from '~/views/components/StatelessAsyncAction';
import { SwipeMenu } from '~/views/components/SwipeMenu'; import { SwipeMenu } from '~/views/components/SwipeMenu';
@ -38,7 +38,7 @@ const NotificationText = ({ contents, ...rest }: NotificationTextProps) => {
return ( return (
<Mention <Mention
key={idx} key={idx}
ship={content.ship} ship={deSig(content.ship)}
first={idx === 0} first={idx === 0}
{...rest} {...rest}
/> />

13
pkg/interface/src/views/components/ProfileOverlay.tsx
View File

@ -34,11 +34,14 @@ const FixedOverlay = styled(Col)`
transition: all 0.1s ease-out; transition: all 0.1s ease-out;
`; `;
type ProfileOverlayProps = BoxProps & { interface ProfileOverlayProps extends BoxProps {
ship: string; /**
children?: ReactNode; * A valid patp (without sig)
color?: string; */
}; ship: string,
children?: ReactNode,
color?: string,
}
const selSettings = (s: SettingsState) => [s.calm.hideAvatars, s.calm.hideNicknames]; const selSettings = (s: SettingsState) => [s.calm.hideAvatars, s.calm.hideNicknames];

4
pkg/landscape/desk.docket-0
View File

@ -1,10 +1,10 @@
:~ title+'Groups' :~ title+'Groups'
info+'A suite of applications to communicate on Urbit' info+'A suite of applications to communicate on Urbit'
color+0xee.5432 color+0xee.5432
glob-http+['https://bootstrap.urbit.org/glob-0v7.gib8r.r1bb5.a1e66.894c5.8ibm0.glob' 0v7.gib8r.r1bb5.a1e66.894c5.8ibm0] glob-http+['https://bootstrap.urbit.org/glob-0v1.5sbiv.4flu3.qfv1i.k2an0.65r45.glob' 0v1.5sbiv.4flu3.qfv1i.k2an0.65r45]
base+'landscape' base+'landscape'
version+[1 0 7] version+[1 0 8]
website+'https://tlon.io' website+'https://tlon.io'
license+'MIT' license+'MIT'
== ==