Merge upstream develop

Author: github-actions[bot]

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

@@ -0,0 +1,19 @@
+import { isWeb } from '@/src/common/util/platform';
+import { Stack } from 'expo-router';
+
+export const unstable_settings = {
+  initialRouteName: 'index',
+};
+
+export default function SettingsTabStackLayout() {
+
+  return (
+    <Stack
+      screenOptions={{
+        headerShown: false,
+        fullScreenGestureEnabled: !isWeb,
+        ...(isWeb ? { animation: 'none' as const } : {}),
+      }}
+    />
+  );
+}

apps/polycentric/app/(tabs)/settings.tsx …olycentric/app/(tabs)/settings/index.tsxapps/polycentric/app/(tabs)/settings.tsx renamed to apps/polycentric/app/(tabs)/settings/index.tsx apps/polycentric/app/(tabs)/settings.tsx renamed to apps/polycentric/app/(tabs)/settings/index.tsx

@@ -279,6 +279,7 @@ export default function PairIdentityIssuerScreen() {
                                 claimerToApprove,
                                 pairAsRotationKey,
                               );
+                              router.back();
                             } catch {
                             } finally {
                               setApprovingClaimers((prev) => {