Skip to content

Commit 2075ae7

Browse files
committed
Merge branch 'tlg/id-pairing' into 'develop'
Identity Pairing See merge request polycentric/polycentric!500
2 parents 405217d + 7a3f407 commit 2075ae7

85 files changed

Lines changed: 3988 additions & 532 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
export default function Login() {
2-
return null;
3-
}
1+
export { default } from '@/src/features/identity-pairing/screens/PairIdentityClaimerScreen';
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default } from '@/src/features/identity-pairing/screens/PairIdentityClaimerScreen';
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default } from '@/src/features/onboarding/PairSuccessScreen';
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default } from '@/src/features/onboarding/SetDisplayNameScreen';

apps/polycentric/app/(onboarding)/signup/set_username.tsx

Lines changed: 0 additions & 1 deletion
This file was deleted.

apps/polycentric/app/(tabs)/_layout.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { useTheme } from '@/src/common/theme';
22
import { isWeb } from '@/src/common/util/platform';
3-
43
import { Slot } from 'expo-router';
54
import { NativeTabs } from 'expo-router/unstable-native-tabs';
65

apps/polycentric/app/_layout.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { PolycentricProvider } from '@/src/common/lib/polycentric-hooks';
22
import { Atoms, ThemeProvider, useTheme } from '@/src/common/theme';
33
import { isWeb } from '@/src/common/util/platform';
4-
import { WideShell } from '@/src/features/wideshell';
54
import '@/src/common/util/react-native-screens-feature-flags';
65
import { TrueSheetProvider } from '@lodev09/react-native-true-sheet';
76
import { Stack } from 'expo-router';

apps/polycentric/app/index.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Redirect } from 'expo-router';
2-
import type { Href } from 'expo-router';
3-
import { View, ActivityIndicator } from 'react-native';
41
import { Routes } from '@/src/common/constants';
52
import { usePolycentricContext } from '@/src/common/lib/polycentric-hooks';
3+
import type { Href } from 'expo-router';
4+
import { Redirect } from 'expo-router';
5+
import { ActivityIndicator, View } from 'react-native';
66

77
export default function IndexScreen() {
88
const { client, currentIdentity, isLoading, isReady } =
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export { default } from '@/src/features/identity-pairing/screens/PairIdentityIssuerScreen';

0 commit comments

Comments
 (0)