Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(ios): share target drawer height (#5284)

Peter Chinman6e6f08ccd3cb
diff --git a/apps/web/src/features/channel/Call/call-events.ts b/apps/web/src/features/channel/Call/call-events.ts
index 093d848eaa..973043166b 100644
--- a/apps/web/src/features/channel/Call/call-events.ts
+++ b/apps/web/src/features/channel/Call/call-events.ts
@@ -1,9 +1,7 @@
import { ENABLE_CALLS } from '@core/constant/featureFlags';
import { useUserId } from '@core/context/user';
-import {
- createConnectionWebsocketEffect,
- parseWebsocketPayload,
-} from '@service-connection/websocket';
+import { createConnectionWebsocketEffect } from '@service-connection/websocket';
+import { parseWebsocketPayload } from '@service-connection/websocket-payload';
import { match } from 'ts-pattern';
/**
diff --git a/apps/web/src/features/channel/Call/tests/call-events.test.ts b/apps/web/src/features/channel/Call/tests/call-events.test.ts
index 747d7cc16f..ec0ac704a3 100644
--- a/apps/web/src/features/channel/Call/tests/call-events.test.ts
+++ b/apps/web/src/features/channel/Call/tests/call-events.test.ts
@@ -1,6 +1,13 @@
import { describe, expect, it, vi } from 'vitest';
import { isCallEventType, parseCallEvent } from '../call-events';
+// `call-events` also exports the Solid websocket subscription used by the app.
+// Keep these parser tests from constructing that application-wide socket in
+// jsdom; the payload parser itself remains real and side-effect free.
+vi.mock('@service-connection/websocket', () => ({
+ createConnectionWebsocketEffect: vi.fn(),
+}));
+
// The connection gateway always sends `data` as a JSON string — see
// `services/connection_gateway/src/model/message.rs`.
const wire = (payload: unknown) => JSON.stringify(payload);
diff --git a/apps/web/src/features/sharing/ios-share-sheet/IosShareSheet.tsx b/apps/web/src/features/sharing/ios-share-sheet/IosShareSheet.tsx
index 8dfd908960..599eaf01c0 100644
--- a/apps/web/src/features/sharing/ios-share-sheet/IosShareSheet.tsx
+++ b/apps/web/src/features/sharing/ios-share-sheet/IosShareSheet.tsx
@@ -544,7 +544,7 @@ export function IosShareSheet() {
>
<MobileDrawer.Portal>
<MobileDrawer.Overlay class="fixed inset-0 z-modal-overlay bg-modal-overlay" />
- <MobileDrawer.Content aria-label="Share to Macro">
+ <MobileDrawer.Content aria-label="Share to Macro" targetHeight={80}>
<MobileDrawer.Handle />
<Show when={isOpen() ? shareBatchKey() : undefined} keyed>
{(batchKey) => (
diff --git a/apps/web/src/lib/service-clients/service-connection/websocket-payload.ts b/apps/web/src/lib/service-clients/service-connection/websocket-payload.ts
new file mode 100644
index 0000000000..051228c15d
--- /dev/null
+++ b/apps/web/src/lib/service-clients/service-connection/websocket-payload.ts
@@ -0,0 +1,19 @@
+/**
+ * Safely reads a websocket frame's `data`. The connection gateway always sends
+ * it as a JSON string (see `services/connection_gateway/src/model/message.rs`),
+ * but already-parsed objects pass through unchanged so callers don't need to
+ * care. Returns `undefined` — never throws — when the payload is malformed.
+ */
+export function parseWebsocketPayload<T>(
+ type: string,
+ payload: unknown
+): T | undefined {
+ if (typeof payload !== 'string') return payload as T;
+
+ try {
+ return JSON.parse(payload) as T;
+ } catch (error) {
+ console.warn('Malformed websocket payload', { type, payload, error });
+ return undefined;
+ }
+}
diff --git a/apps/web/src/lib/service-clients/service-connection/websocket.ts b/apps/web/src/lib/service-clients/service-connection/websocket.ts
index 3e847120aa..24562616f3 100644
--- a/apps/web/src/lib/service-clients/service-connection/websocket.ts
+++ b/apps/web/src/lib/service-clients/service-connection/websocket.ts
@@ -15,6 +15,8 @@ import { getMacroApiToken } from '@service-auth/fetch';
import { createCallback } from '@solid-primitives/rootless';
import type { ToWebsocketMessage } from './generated/schemas/toWebsocketMessage';
+export { parseWebsocketPayload } from './websocket-payload';
+
const wsHost: string = SERVER_HOSTS['connection-gateway'];
export type ConnectionGatewayWebsocket = Websocket<
@@ -27,26 +29,6 @@ export type FromWebsocketMessage = {
data: any;
};
-/**
- * Safely reads a websocket frame's `data`. The connection gateway always sends
- * it as a JSON string (see `services/connection_gateway/src/model/message.rs`),
- * but already-parsed objects pass through unchanged so callers don't need to
- * care. Returns `undefined` — never throws — when the payload is malformed.
- */
-export function parseWebsocketPayload<T>(
- type: string,
- payload: unknown
-): T | undefined {
- if (typeof payload !== 'string') return payload as T;
-
- try {
- return JSON.parse(payload) as T;
- } catch (error) {
- console.warn('Malformed websocket payload', { type, payload, error });
- return undefined;
- }
-}
-
async function resolveWsUrl() {
if (ENABLE_BEARER_TOKEN_AUTH) {
const apiToken = await getMacroApiToken();