Merge branch 'tlg/web' into 'develop'

RN Web Build

See merge request polycentric/polycentric!480

Author: markharding

.cirrus.yml

@@ -22,7 +22,7 @@ build_ios_sim_arm64_task:
     - cd packages/rs-core
     - brew install just protobuf llvm
     - just build-ffi-ios-sim
-    - cp ../../target/aarch64-apple-ios/release/libpolycentric_core.a ../../libpolycentric_core-ios-sim-arm64.a
+    - cp ../../target/aarch64-apple-ios-sim/release/libpolycentric_core.a ../../libpolycentric_core-ios-sim-arm64.a
   binary_artifacts:
     path: 'libpolycentric_core-ios-sim-arm64.a'
 

.gitlab/ci/build_rs_core.yml

@@ -144,18 +144,6 @@ rs-sdk-build-ios-sim-arm64:
     paths:
       - buildRsCoreIOSSimArm64/binary/*.a
 
-rs-sdk-build-ios-sim-x86_64:
-  stage: build
-  extends: .rs-sdk-ios-build
-  script:
-    - |
-      cirrus run buildRsCoreIOSSimX86 \
-      --artifacts-dir . \
-      --env-file .cienv
-  artifacts:
-    paths:
-      - buildRsCoreIOSSimX86/binary/*.a
-
 rs-sdk-build-android-arm64:
   extends: .rs-sdk-build-android
   script:
@@ -203,8 +191,6 @@ rs-sdk-publish:
       artifacts: true
     - job: rs-sdk-build-ios-sim-arm64
       artifacts: true
-    - job: rs-sdk-build-ios-sim-x86_64
-      artifacts: true
     - job: rs-sdk-build-android-arm64
       artifacts: true
     - job: rs-sdk-build-android-armv7
@@ -219,7 +205,6 @@ rs-sdk-publish:
       REGISTRY_URL="${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/rs-core/${VERSION}"
       curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ../../buildRsCoreIOSDevice/binary/libpolycentric_core-ios-device.a "${REGISTRY_URL}/libpolycentric_core-ios-device.a"
       curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ../../buildRsCoreIOSSimArm64/binary/libpolycentric_core-ios-sim-arm64.a "${REGISTRY_URL}/libpolycentric_core-ios-sim-arm64.a"
-      curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ../../buildRsCoreIOSSimX86/binary/libpolycentric_core-ios-sim-x86_64.a "${REGISTRY_URL}/libpolycentric_core-ios-sim-x86_64.a"
       curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ../../target/aarch64-linux-android/release/libpolycentric_core.a "${REGISTRY_URL}/libpolycentric_core-android-arm64.a"
       curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ../../target/armv7-linux-androideabi/release/libpolycentric_core.a "${REGISTRY_URL}/libpolycentric_core-android-armv7.a"
       curl --fail --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file ../../target/i686-linux-android/release/libpolycentric_core.a "${REGISTRY_URL}/libpolycentric_core-android-x86.a"

.prettierignore

@@ -13,6 +13,8 @@ packages/react-native/android
 packages/react-native/ios
 packages/react-native/lib
 packages/rs-core
+packages/rs-core-wasm-browser
+packages/rs-core-wasm-node
 legacy
 services/polycentric-server
-services/verifiers-server
+services/verifiers-server

apps/polycentric/app.json

@@ -6,6 +6,9 @@
     "orientation": "portrait",
     "icon": "./assets/images/AppIcon.png",
     "scheme": "polycentric",
+    "web": {
+      "output": "static"
+    },
     "userInterfaceStyle": "automatic",
     "ios": {
       "supportsTablet": true,

apps/polycentric/app/(tabs)/feed/index.tsx

@@ -31,7 +31,7 @@ export default function Feed() {
   const { Sheet, present, dismiss } = useSheet();
 
   const [selectedFeed, setSelectedFeed] = useState<FeedType>('explore');
-  const [replyToEvent, setReplyToEvent] = useState<types.ISignedEvent | null>(
+  const [replyToEvent, setReplyToEvent] = useState<types.SignedEvent | null>(
     null,
   );
 
@@ -48,7 +48,7 @@ export default function Feed() {
     [router],
   );
 
-  const handleAuthorPress = (publicKey: types.IPublicKey) => {
+  const handleAuthorPress = (publicKey: types.PublicKey) => {
     router.push(Routes.profile(publicKeyToStringURLSafe(publicKey)));
   };
 
@@ -65,7 +65,7 @@ export default function Feed() {
   );
 
   const handleReply = useCallback(
-    (signedEvent: types.ISignedEvent) => {
+    (signedEvent: types.SignedEvent) => {
       setReplyToEvent(signedEvent);
       present();
     },
@@ -147,7 +147,7 @@ export default function Feed() {
         onPress={handleFabPress}
         icon={() => <Ionicons name="add-circle" size={22} color="white" />}
       />
-      <Sheet detents={[1]} scrollable>
+      <Sheet detents={[0.82]}>
         <ComposeSheetInner
           dismiss={dismiss}
           onPostCreated={handlePostCreated}

apps/polycentric/app/(tabs)/feed/post/[postId].tsx

@@ -20,7 +20,7 @@ export default function PostScreen() {
   const { postId } = useLocalSearchParams<{ postId: string }>();
   const { Sheet, present, dismiss } = useSheet();
 
-  const [replyToEvent, setReplyToEvent] = useState<types.ISignedEvent | null>(
+  const [replyToEvent, setReplyToEvent] = useState<types.SignedEvent | null>(
     null,
   );
 
@@ -33,14 +33,14 @@ export default function PostScreen() {
   );
 
   const handleAuthorPress = useCallback(
-    (publicKey: types.IPublicKey) => {
+    (publicKey: types.PublicKey) => {
       router.replace(Routes.profile(publicKeyToStringURLSafe(publicKey)));
     },
     [router],
   );
 
   const handleReply = useCallback(
-    (se: types.ISignedEvent) => {
+    (se: types.SignedEvent) => {
       setReplyToEvent(se);
       present();
     },
@@ -84,7 +84,7 @@ export default function PostScreen() {
           onReply={handleReply}
         />
       </Box>
-      <Sheet detents={[1]} scrollable>
+      <Sheet detents={[0.82]}>
         <ComposeSheetInner
           dismiss={dismiss}
           onPostCreated={handlePostCreated}

apps/polycentric/app/(tabs)/feed/profile/[publicKey].tsx

@@ -42,7 +42,7 @@ export default function Profile() {
   );
 
   const handleAuthorPress = useCallback(
-    (pk: types.IPublicKey) => {
+    (pk: types.PublicKey) => {
       router.replace(Routes.profile(publicKeyToStringURLSafe(pk)));
     },
     [router],

apps/polycentric/app/(tabs)/settings/index.tsx

@@ -1,5 +1,5 @@
 import { useState, useCallback, useEffect } from 'react';
-import { ScrollView, Linking, Alert, ActivityIndicator } from 'react-native';
+import { ScrollView, Linking, ActivityIndicator } from 'react-native';
 import { Ionicons } from '@expo/vector-icons';
 import {
   Screen,
@@ -28,6 +28,7 @@ import {
 import { types } from '@polycentric/react-native';
 import { useTheme } from '@/theme';
 import { TAB_BAR_HEIGHT, SOURCE_CODE_URL, REPORT_BUG_URL } from '@/constants';
+import { confirm } from '@/lib/dialogs/alert';
 
 export default function Settings() {
   const { theme } = useTheme();
@@ -82,7 +83,7 @@ export default function Settings() {
 function IdentitySettingsContent({
   publicKey,
 }: {
-  publicKey: types.IPublicKey;
+  publicKey: types.PublicKey;
 }) {
   const { theme } = useTheme();
   const client = usePolycentric();
@@ -93,11 +94,37 @@ function IdentitySettingsContent({
   const [editing, setEditing] = useState(false);
   const [nameDraft, setNameDraft] = useState('');
   const [saving, setSaving] = useState(false);
+  const [eventCount, setEventCount] = useState(0);
 
   useEffect(() => {
     setNameDraft(username);
   }, [username]);
 
+  useEffect(() => {
+    let cancelled = false;
+
+    client.storage.processStates
+      .getCurrentLogicalClock(
+        client.currentIdentity.keyPair.keyType,
+        client.currentIdentity.keyPair.publicKey.key,
+        client.process.process,
+      )
+      .then((logicalClock) => {
+        if (!cancelled) {
+          setEventCount(Number(logicalClock));
+        }
+      })
+      .catch(() => {
+        if (!cancelled) {
+          setEventCount(0);
+        }
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [client, identity]);
+
   const handleSave = useCallback(async () => {
     setSaving(true);
     try {
@@ -125,7 +152,6 @@ function IdentitySettingsContent({
       )
     : '';
   const displayName = username;
-  const eventCount = Math.max(0, client.logicalClock - 1);
   const avatarUrl = identiconUrl(publicKey, 160);
 
   return (
@@ -261,27 +287,24 @@ function ServersSheetContent() {
     }
   };
 
-  const handleRemoveServer = (server: string) => {
-    Alert.alert('Remove Server', `Remove ${server}?`, [
-      { text: 'Cancel', style: 'cancel' },
-      {
-        text: 'Remove',
-        style: 'destructive',
-        onPress: async () => {
-          setIsBusy(true);
-          try {
-            await client.contentManager.createRemoveServer(server);
-            refreshServers();
-            store.getState().clearFeed('explore');
-            client.sync().catch(() => {});
-          } catch (err) {
-            console.error('Failed to remove server:', err);
-          } finally {
-            setIsBusy(false);
-          }
-        },
-      },
-    ]);
+  const handleRemoveServer = async (server: string) => {
+    const ok = await confirm({
+      title: 'Remove Server',
+      message: `Remove ${server}?`,
+      confirmText: 'Remove',
+    });
+    if (!ok) return;
+    setIsBusy(true);
+    try {
+      await client.contentManager.createRemoveServer(server);
+      refreshServers();
+      store.getState().clearFeed('explore');
+      client.sync().catch(() => {});
+    } catch (err) {
+      console.error('Failed to remove server:', err);
+    } finally {
+      setIsBusy(false);
+    }
   };
 
   return (