Skip to content

Commit f9dc81f

Browse files
Merge upstream develop
2 parents d125c0d + 83698f7 commit f9dc81f

25 files changed

Lines changed: 1914 additions & 1176 deletions

File tree

Cargo.lock

Lines changed: 41 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/polycentric/app.config.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import type { ConfigContext, ExpoConfig } from 'expo/config';
22
import fs from 'fs';
3-
import { APP_NAME } from './src/common/constants/constants';
43

54
const { version: PKG_VERSION } = require('./package.json');
65

76
const IS_DEV = process.env.APP_VARIANT === 'dev';
87

9-
const NAME = IS_DEV ? `${APP_NAME} Dev` : APP_NAME;
8+
const NAME = IS_DEV ? 'Harbor Dev' : 'Harbor';
109
const ID = IS_DEV ? 'org.futo.polycentric.dev' : 'org.futo.polycentric';
1110

1211
const GOOGLE_SERVICES_FILE =
@@ -54,7 +53,12 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
5453
...(HAS_GOOGLE_SERVICES && { googleServicesFile: GOOGLE_SERVICES_FILE }),
5554
},
5655
plugins: [
57-
'expo-router',
56+
[
57+
'expo-router',
58+
{
59+
origin: 'https://harbor.social',
60+
},
61+
],
5862
[
5963
'expo-splash-screen',
6064
{

apps/polycentric/app/_layout.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ function RootStack() {
8282
/>
8383
<Stack.Screen name="identity/switch" />
8484
<Stack.Screen name="verifications/index" />
85-
<Stack.Screen name="verifications/claim" />
8685
</Stack.Protected>
8786

8887
<Stack.Screen

0 commit comments

Comments
 (0)