Update copy

* Age Assurance V2

* Tighten up test

* Add todos for sdk migration

* Align RQ versions

* Use useEffect for side effect

* Improve effects, memoize

* Standarize on birthdate

* Copy feedback

* Copilot

* Add support link

* Reove double ..

* Cleanup

* Remove redirect dialog

* Cleanup todos, add comments

* Update splash in main template too

* Mock some stuff

* Exhaustive checks

Co-authored-by: Samuel Newman <mozzius@protonmail.com>

* Exhaustive checks

Co-authored-by: Samuel Newman <mozzius@protonmail.com>

* Small fix to bday handling

* Add comment

* onboarding style tweak

sneaking this in sorry!

* rm unreachable breaks

* Put useIntentHandler back on web

* Remove misleading success set

* Align on birthdate

---------

Co-authored-by: Samuel Newman <mozzius@protonmail.com>

.env.example

@@ -36,6 +36,3 @@ EXPO_PUBLIC_BITDRIFT_API_KEY=
 
 # bapp-config web worker URL
 BAPP_CONFIG_DEV_URL=
-
-# Dev-only passthrough value for bapp-config web worker
-BAPP_CONFIG_DEV_BYPASS_SECRET=

.github/workflows/build-and-push-bskyweb-aws.yaml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v1

.github/workflows/build-and-push-bskyweb-ghcr.yaml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v1

.github/workflows/build-and-push-embedr-aws.yaml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v1

.github/workflows/build-and-push-link-aws.yaml

@@ -3,9 +3,9 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
-      - 'bskylink/**'
-      - 'Dockerfile.bskylink'
-      - '.github/workflows/build-and-push-link-aws.yaml'
+      - "bskylink/**"
+      - "Dockerfile.bskylink"
+      - ".github/workflows/build-and-push-link-aws.yaml"
 
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v1

.github/workflows/build-and-push-ogcard-aws.yaml

@@ -3,9 +3,9 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
-      - 'bskyogcard/**'
-      - 'Dockerfile.bskyogcard'
-      - '.github/workflows/build-and-push-ogcard-aws.yaml'
+      - "bskyogcard/**"
+      - "Dockerfile.bskyogcard"
+      - ".github/workflows/build-and-push-ogcard-aws.yaml"
 
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Docker buildx
         uses: docker/setup-buildx-action@v1

.github/workflows/build-submit-android.yml

@@ -15,7 +15,7 @@ jobs:
   build:
     if: github.repository == 'bluesky-social/social-app'
     name: Build and Submit Android
-    runs-on: ubuntu-latest
+    runs-on: Linux-x64-32core
     steps:
       - name: Check for EXPO_TOKEN
         run: >
@@ -30,7 +30,7 @@ jobs:
           fetch-depth: 5
 
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
           cache: yarn
@@ -39,7 +39,7 @@ jobs:
         uses: dcarbone/install-jq-action@v2
 
       - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v8
+        uses: expo/expo-github-action@main
         with:
           expo-version: latest
           eas-version: latest
@@ -54,7 +54,7 @@ jobs:
           java-version: "17"
 
       - name: ⚙️ Install dependencies
-        run: yarn install
+        run: yarn install --frozen-lockfile
 
       - name: 🔤 Compile translations
         run: yarn intl:build 2>&1 | tee i18n.log

.github/workflows/build-submit-ios.yml

@@ -15,7 +15,7 @@ jobs:
   build:
     if: github.repository == 'bluesky-social/social-app'
     name: Build and Submit iOS
-    runs-on: macos-26
+    runs-on: macos-26-xlarge
     steps:
       - name: Check for EXPO_TOKEN
         run: >
@@ -30,7 +30,7 @@ jobs:
           fetch-depth: 5
 
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
           cache: yarn
@@ -39,7 +39,7 @@ jobs:
         uses: dcarbone/install-jq-action@v2
 
       - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v8
+        uses: expo/expo-github-action@main
         with:
           expo-version: latest
           eas-version: latest
@@ -49,7 +49,7 @@ jobs:
         run: yarn global add eas-cli-local-build-plugin
 
       - name: ⚙️ Install dependencies
-        run: yarn install
+        run: yarn install --frozen-lockfile
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
@@ -61,7 +61,7 @@ jobs:
           version: 1.16.2
 
       - name: 💾 Cache Pods
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: pods-cache
         with:
           path: ./ios/Pods

.github/workflows/bundle-deploy-eas-update.yml

@@ -55,7 +55,7 @@ jobs:
         run: git fetch origin main:main --depth 100
 
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
           cache: yarn
@@ -86,7 +86,7 @@ jobs:
         run: yarn typecheck
 
       - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v8
+        uses: expo/expo-github-action@main
         if: ${{ !steps.fingerprint.outputs.includes-changes }}
         with:
           expo-version: latest
@@ -172,13 +172,13 @@ jobs:
           fetch-depth: 5
 
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
           cache: yarn
 
       - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v8
+        uses: expo/expo-github-action@main
         with:
           expo-version: latest
           eas-version: latest
@@ -188,7 +188,7 @@ jobs:
         run: yarn global add eas-cli-local-build-plugin
 
       - name: ⚙️ Install dependencies
-        run: yarn install
+        run: yarn install --frozen-lockfile
 
       - uses: maxim-lobanov/setup-xcode@v1
         with:
@@ -200,7 +200,7 @@ jobs:
           version: 1.16.2
 
       - name: 💾 Cache Pods
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: pods-cache
         with:
           path: ./ios/Pods
@@ -276,13 +276,13 @@ jobs:
           fetch-depth: 5
 
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
           cache: yarn
 
       - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v8
+        uses: expo/expo-github-action@main
         with:
           expo-version: latest
           eas-version: latest
@@ -297,7 +297,7 @@ jobs:
           java-version: "17"
 
       - name: ⚙️ Install dependencies
-        run: yarn install
+        run: yarn install --frozen-lockfile
 
       - name: 🔤 Compile translations
         run: yarn intl:build

.github/workflows/golang-test-lint.yml

@@ -7,7 +7,7 @@ on:
       - main
 
 concurrency:
-  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
+  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
   cancel-in-progress: true
 
 jobs:
@@ -15,11 +15,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Go tooling
         uses: actions/setup-go@v3
         with:
-          go-version: '1.23'
+          go-version: "1.25"
       - name: Dummy Static Files
         run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
       - name: Check
@@ -32,11 +32,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Git Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Go tooling
         uses: actions/setup-go@v3
         with:
-          go-version: '1.23'
+          go-version: "1.25"
       - name: Dummy Static Files
         run: touch bskyweb/static/js/blah.js && touch bskyweb/static/css/blah.txt && touch bskyweb/static/media/blah.txt
       - name: Lint

.github/workflows/lint.yml

@@ -6,7 +6,7 @@ on:
     branches:
       - main
 concurrency:
-  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
+  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
   cancel-in-progress: true
 
 jobs:
@@ -15,11 +15,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
+          cache: yarn
       - name: Yarn install
         uses: Wandalen/wretry.action@master
         with:
@@ -41,11 +42,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
+          cache: yarn
       - name: Yarn install
         uses: Wandalen/wretry.action@master
         with:

.github/workflows/nightly-update-source-languages.yaml

@@ -1,7 +1,7 @@
 name: Nightly Update Source Languages
 on:
   schedule:
-    - cron: '0 2 * * *' # run at 2 AM UTC
+    - cron: "0 2 * * *" # run at 2 AM UTC
   workflow_dispatch:
 
 jobs:
@@ -16,13 +16,14 @@ jobs:
 
     steps:
       - name: Check out Git repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ssh-key: ${{secrets.GH_ACTION_DEPLOY_KEY}}
       - name: Install node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
+          cache: yarn
       - name: Yarn install
         uses: Wandalen/wretry.action@master
         with:
@@ -46,4 +47,4 @@ jobs:
           push_sources: false
           create_pull_request: false
         env:
-          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}

.github/workflows/pull-request-comment.yml

@@ -116,7 +116,7 @@ jobs:
           ref: ${{ steps.pr-info.outputs.head-sha }}
 
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
           cache: yarn
@@ -140,7 +140,7 @@ jobs:
         run: yarn typecheck
 
       - name: 🔨 Setup EAS
-        uses: expo/expo-github-action@v8
+        uses: expo/expo-github-action@main
         with:
           expo-version: latest
           eas-version: latest

.github/workflows/pull-request-commit.yml

@@ -29,7 +29,7 @@ jobs:
           fetch-depth: 0
 
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
           cache: yarn
@@ -82,9 +82,9 @@ jobs:
         id: get-diff
         uses: NejcZdovc/bundle-size-diff@v1
         with:
-          base_path: 'stats-base.json'
-          pr_path: '../stats-new.json'
-          excluded_assets: '(.+).chunk.js|(.+).js.map|(.+).json|(.+).png'
+          base_path: "stats-base.json"
+          pr_path: "../stats-new.json"
+          excluded_assets: "(.+).chunk.js|(.+).js.map|(.+).json|(.+).png"
 
       - name: 💬 Drop a comment
         uses: marocchino/sticky-pull-request-comment@v2
@@ -110,7 +110,7 @@ jobs:
         if: github.event_name == 'pull_request'
 
       - name: 🔧 Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
           cache: yarn

.github/workflows/verify-yarn-lock.yml

@@ -3,7 +3,7 @@ name: Lockfile
 on:
   pull_request:
 concurrency:
-  group: '${{ github.workflow }}-${{ github.head_ref || github.ref }}'
+  group: "${{ github.workflow }}-${{ github.head_ref || github.ref }}"
   cancel-in-progress: true
 
 jobs:
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out PR HEAD
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -20,7 +20,7 @@ jobs:
         run: git fetch origin ${{ github.base_ref }} --depth=1
 
       - name: Install node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.24.5-bullseye AS build-env
+FROM golang:1.25-bookworm AS build-env
 
 WORKDIR /usr/src/social-app
 
@@ -89,7 +89,7 @@ RUN cd bskyweb/ && \
     -o /bskyweb \
     ./cmd/bskyweb
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 ENV GODEBUG=netdns=go
 ENV TZ=Etc/UTC

Dockerfile.embedr

@@ -1,4 +1,4 @@
-FROM golang:1.24.5-bullseye AS build-env
+FROM golang:1.25-bookworm AS build-env
 
 WORKDIR /usr/src/social-app
 
@@ -58,7 +58,7 @@ RUN cd bskyweb/ && \
     -o /embedr \
     ./cmd/embedr
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 ENV GODEBUG=netdns=go
 ENV TZ=Etc/UTC

__tests__/lib/link-meta.test.ts

@@ -1,4 +1,4 @@
-import {LikelyType, getLikelyType} from '../../src/lib/link-meta/link-meta'
+import {getLikelyType, LikelyType} from '../../src/lib/link-meta/link-meta'
 
 describe('getLikelyType', () => {
   it('correctly handles non-parsed url', async () => {

__tests__/lib/string.test.ts

@@ -957,20 +957,20 @@ describe('parseStarterPackHttpUri', () => {
   })
 
   it('returns the at uri when the input is a valid starterpack at uri', () => {
-    const validAtUri = 'at://did:123/app.bsky.graph.starterpack/rkey'
+    const validAtUri = 'at://did:plc:123/app.bsky.graph.starterpack/rkey'
     expect(parseStarterPackUri(validAtUri)).toEqual({
-      name: 'did:123',
+      name: 'did:plc:123',
       rkey: 'rkey',
     })
   })
 
   it('returns null when the at uri has no rkey', () => {
-    const validAtUri = 'at://did:123/app.bsky.graph.starterpack'
+    const validAtUri = 'at://did:plc:123/app.bsky.graph.starterpack'
     expect(parseStarterPackUri(validAtUri)).toEqual(null)
   })
 
   it('returns null when the collection is not app.bsky.graph.starterpack', () => {
-    const validAtUri = 'at://did:123/app.bsky.graph.list/rkey'
+    const validAtUri = 'at://did:plc:123/app.bsky.graph.list/rkey'
     expect(parseStarterPackUri(validAtUri)).toEqual(null)
   })
 

assets/icons/bulletlist_stroke1_corner0_rounded.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 46 38"><path stroke="#405168" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M22.333 31.667H45M22.333 6.333H45m-33.333 0A5.333 5.333 0 1 1 1 6.333a5.333 5.333 0 0 1 10.667 0Zm0 25.334a5.333 5.333 0 1 1-10.667 0 5.333 5.333 0 0 1 10.667 0Z"/></svg>

assets/icons/circle_and_square_stroke1_corner0_rounded_filled.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 62 53"><path fill="#405168" d="M28.173.231a5.653 5.653 0 0 1 7.018 3.83l2.66 9.046a20 20 0 0 1 3.986-.397c11.026 0 19.964 8.937 19.964 19.962l-.006.516c-.274 10.787-9.104 19.448-19.958 19.448l-.514-.007c-8.332-.21-15.394-5.528-18.178-12.938l-8.805 2.59a5.654 5.654 0 0 1-7.02-3.83L.232 14.34a5.654 5.654 0 0 1 3.83-7.018L28.172.23ZM41.838 14.71c-1.17 0-2.313.111-3.42.325l3.863 13.137a5.653 5.653 0 0 1-3.83 7.019L25.07 39.126c2.593 6.732 9.122 11.51 16.768 11.51 9.92 0 17.963-8.043 17.963-17.964S51.758 14.71 41.837 14.71ZM33.271 4.624a3.653 3.653 0 0 0-4.535-2.474L4.624 9.24a3.653 3.653 0 0 0-2.475 4.535l7.09 24.113a3.654 3.654 0 0 0 4.536 2.475l8.762-2.577a20 20 0 0 1-.662-5.114c0-8.961 5.905-16.544 14.037-19.069l-2.64-8.98Zm3.204 10.899c-7.302 2.28-12.601 9.096-12.601 17.15 0 1.571.203 3.095.582 4.548l13.431-3.948a3.654 3.654 0 0 0 2.474-4.536l-3.886-13.214Z"/></svg>

assets/icons/editbig_stroke1_corner0_rounded.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48"><path fill="#405168" d="M19.667 4.458a1 1 0 1 0 0-2v2Zm25 23a1 1 0 0 0-2 0h2ZM3.912 45.543l.454-.891-.454.89Zm-2.33-2.33.89-.455h0l-.89.454Zm39.173 2.33-.454-.891h0l.454.89Zm2.33-2.33-.89-.455.89.454ZM1.581 6.37l-.89-.454h0l.89.454Zm2.331-2.331-.454-.891.454.89ZM14.333 32.79h-1a1 1 0 0 0 1 1v-1Zm.781-8.781.707.707-.707-.707ZM36.562 2.562l-.707-.707v0l.707.707Zm7.543 0-.707.707v0l.707-.707Zm.457.458.707-.707v0l-.707.707Zm0 7.542.707.707-.707-.707ZM23.114 32.01l.707.707-.707-.707Zm12.02 14.114v-1h-25.6v2h25.6v-1ZM1 37.591h1v-25.6H0v25.6h1ZM9.533 3.458v1h10.134v-2H9.533v1Zm34.134 24h-1V37.59h2V27.457h-1ZM9.533 46.124v-1c-1.51 0-2.582 0-3.421-.07-.828-.067-1.34-.195-1.746-.402l-.454.89-.454.892c.735.374 1.54.537 2.491.614.94.077 2.107.076 3.584.076v-1ZM1 37.591H0c0 1.477 0 2.645.076 3.584.078.951.24 1.756.614 2.491l.891-.454.891-.454c-.207-.406-.335-.918-.403-1.746C2.001 40.173 2 39.101 2 37.591H1Zm2.912 7.952.454-.891a4.33 4.33 0 0 1-1.894-1.894l-.89.454-.892.454a6.33 6.33 0 0 0 2.768 2.768l.454-.891Zm31.221.581v1c1.477 0 2.645.001 3.585-.076.95-.078 1.756-.24 2.49-.614l-.453-.891-.454-.891c-.406.207-.919.335-1.746.403-.84.068-1.912.07-3.422.07v1Zm8.534-8.533h-1c0 1.51-.001 2.582-.07 3.421-.067.828-.196 1.34-.403 1.746l.891.454.891.454c.375-.735.537-1.54.615-2.49.076-.94.076-2.108.076-3.585h-1Zm-2.912 7.952.454.89a6.33 6.33 0 0 0 2.767-2.767l-.89-.454-.892-.454a4.33 4.33 0 0 1-1.893 1.894l.454.89ZM1 11.99h1c0-1.51 0-2.582.07-3.422.067-.827.195-1.34.402-1.745l-.89-.454-.892-.454c-.374.734-.536 1.54-.614 2.49C-.001 9.345 0 10.513 0 11.99h1Zm8.533-8.533v-1c-1.477 0-2.645-.001-3.584.076-.951.077-1.756.24-2.49.614l.453.89.454.892c.406-.207.918-.336 1.746-.403.839-.069 1.911-.07 3.421-.07v-1ZM1.581 6.37l.891.454A4.33 4.33 0 0 1 4.366 4.93l-.454-.891-.454-.891A6.33 6.33 0 0 0 .69 5.916l.891.454Zm12.752 19.525h-1v6.896h2v-6.896h-1Zm0 6.896v1h6.896v-2h-6.896v1Zm.781-8.781.707.707L37.27 3.269l-.707-.707-.707-.707-21.448 21.448.707.707Zm28.99-21.448-.706.707.457.458.707-.707.707-.707-.457-.458-.707.707Zm.458 8-.707-.707-21.448 21.448.707.707.707.707L45.27 11.269l-.707-.707Zm0-7.542-.707.707a4.333 4.333 0 0 1 0 6.128l.707.707.707.707a6.333 6.333 0 0 0 0-8.956l-.707.707Zm-8-.458.707.707a4.333 4.333 0 0 1 6.129 0l.707-.707.707-.707a6.333 6.333 0 0 0-8.957 0l.707.707ZM21.23 32.791v1c.972 0 1.905-.386 2.593-1.074l-.708-.707-.707-.707a1.67 1.67 0 0 1-1.178.488v1Zm-6.896-6.896h1c0-.442.176-.866.489-1.178l-.708-.707-.707-.707a3.67 3.67 0 0 0-1.074 2.592h1Z"/></svg>

assets/icons/hashtagwide_stroke1_corner0_rounded.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 46 46"><path stroke="#405168" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14.333 1 9 45M37 1l-5.333 44M1 11.667h44m0 22.666H1"/></svg>

assets/icons/heart2_stroke1_corner0_rounded.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 50 45"><path stroke="#405168" stroke-linejoin="round" stroke-width="2" d="M49 17c0 15.333-22 26.667-24 26.667S1 32.333 1 17C1 6.333 7.667 1 14.333 1S25 5 25 5s4-4 10.667-4S49 6.333 49 17Z"/></svg>

assets/icons/image_stroke1_corner0_rounded.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 46 46"><path stroke="#080B12" stroke-linecap="round" stroke-width="1.5" d="m1.417 28.645 7.586-5.676a5.33 5.33 0 0 1 6.867.809c3.98 4.286 8.594 8.182 14.88 8.182 5.794 0 9.633-2.147 13.333-5.847m-38 18.637h33.334a5.333 5.333 0 0 0 5.333-5.333V6.083A5.333 5.333 0 0 0 39.417.75H6.083A5.333 5.333 0 0 0 .75 6.083v33.334a5.333 5.333 0 0 0 5.333 5.333ZM36.75 14.083a5.333 5.333 0 1 1-10.667 0 5.333 5.333 0 0 1 10.667 0Z"/></svg>

assets/icons/message_stroke1_corner0_rounded_filled.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 50 50"><path stroke="#405168" stroke-linecap="square" stroke-linejoin="round" stroke-width="2" d="M9 1h32a8 8 0 0 1 8 8v21.333a8 8 0 0 1-8 8H27.667L14.333 49V38.333H9a8 8 0 0 1-8-8V9a8 8 0 0 1 8-8Z"/></svg>

assets/icons/peopleremove2_stroke1_corner0_rounded.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 43 48"><path stroke="#405168" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M20.603 46.333H3.532c-1.572 0-2.816-1.358-2.472-2.891 2.033-9.046 9.421-15.775 19.543-15.775q1.367 0 2.666.16m18.667 7.84L36.603 41m0 0-5.334 5.333M36.603 41l-5.334-5.333M36.603 41l5.333 5.333m-12-36A9.333 9.333 0 1 1 20.603 1a9.333 9.333 0 0 1 9.333 9.333Z"/></svg>

assets/icons/videoclip_stroke1_corner0_rounded.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 46 46"><path stroke="#405168" stroke-linecap="square" stroke-linejoin="round" stroke-width="2" d="M1 23h10.667M1 23V12m0 11v11m10.667-11h22.666m-22.666 0v11m0-11V12m22.666 11H45m-10.667 0v12.222m0-12.222V12M45 23V12m0 11v12.222M34.333 45h5.334A5.333 5.333 0 0 0 45 39.667v-4.445M34.333 45v-9.778m0 9.778H11.667M34.333 1h5.334A5.333 5.333 0 0 1 45 6.333V12M34.333 1v11m0-11H11.667m22.666 11H45M34.333 35.222H45M11.667 45H6.333A5.333 5.333 0 0 1 1 39.667V34m10.667 11V34m0-33H6.333A5.333 5.333 0 0 0 1 6.333V12M11.667 1v11M1 12h10.667M1 34h10.667"/></svg>

bskyweb/cmd/bskyweb/renderer.go

@@ -71,7 +71,7 @@ func (r Renderer) Render(w io.Writer, name string, data interface{}, c echo.Cont
 	if r.Debug {
 		t, err = pongo2.FromFile(name)
 	} else {
-		t, err = r.TemplateSet.FromFile(name)
+		t, err = r.TemplateSet.FromCache(name)
 	}
 
 	if err != nil {

bskyweb/go.mod

@@ -1,6 +1,6 @@
 module github.com/bluesky-social/social-app/bskyweb
 
-go 1.24.5
+go 1.25
 
 require (
 	github.com/bluesky-social/indigo v0.0.0-20250729223159-573ae927246a

bskyweb/templates/base.html

@@ -68,11 +68,19 @@
       width: 100%;
     }
     #splash {
+      display: flex;
       position: fixed;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      right: 0;
+      align-items: center;
+      justify-content: center;
+    }
+    #splash svg {
+      position: relative;
+      top: -50px;
       width: 100px;
-      left: 50%;
-      top: 50%;
-      transform: translateX(-50%) translateY(-50%) translateY(-50px);
     }
     /**
      * We need these styles to prevent shifting due to scrollbar show/hide on
@@ -106,7 +114,7 @@
   <div id="root">
     <div id="splash">
       <!-- Bluesky SVG -->
-      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 360 320"><path fill="#0085ff" d="M180 142c-16.3-31.7-60.7-90.8-102-120C38.5-5.9 23.4-1 13.5 3.4 2.1 8.6 0 26.2 0 36.5c0 10.4 5.7 84.8 9.4 97.2 12.2 41 55.7 55 95.7 50.5-58.7 8.6-110.8 30-42.4 106.1 75.1 77.9 103-16.7 117.3-64.6 14.3 48 30.8 139 116 64.6 64-64.6 17.6-97.5-41.1-106.1 40 4.4 83.5-9.5 95.7-50.5 3.7-12.4 9.4-86.8 9.4-97.2 0-10.3-2-27.9-13.5-33C336.5-1 321.5-6 282 22c-41.3 29.2-85.7 88.3-102 120Z"/></svg>
+      <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 57"><path fill="#006AFF" d="M13.873 3.805C21.21 9.332 29.103 20.537 32 26.55v15.882c0-.338-.13.044-.41.867-1.512 4.456-7.418 21.847-20.923 7.944-7.111-7.32-3.819-14.64 9.125-16.85-7.405 1.264-15.73-.825-18.014-9.015C1.12 23.022 0 8.51 0 6.55 0-3.268 8.579-.182 13.873 3.805ZM50.127 3.805C42.79 9.332 34.897 20.537 32 26.55v15.882c0-.338.13.044.41.867 1.512 4.456 7.418 21.847 20.923 7.944 7.111-7.32 3.819-14.64-9.125-16.85 7.405 1.264 15.73-.825 18.014-9.015C62.88 23.022 64 8.51 64 6.55c0-9.818-8.578-6.732-13.873-2.745Z"/></svg>
     </div>
   </div>
 

modules/expo-receive-android-intents/android/src/main/java/xyz/blueskyweb/app/exporeceiveandroidintents/ExpoReceiveAndroidIntentsModule.kt

@@ -23,6 +23,10 @@ class ExpoReceiveAndroidIntentsModule : Module() {
     ModuleDefinition {
       Name("ExpoReceiveAndroidIntents")
 
+      OnCreate {
+        handleIntent(appContext.currentActivity?.intent)
+      }
+
       OnNewIntent {
         handleIntent(it)
       }
@@ -74,10 +78,12 @@ class ExpoReceiveAndroidIntentsModule : Module() {
         intent.getParcelableExtra(Intent.EXTRA_STREAM)
       }
 
+    val text = intent.getStringExtra(Intent.EXTRA_TEXT)
+
     uri?.let {
       when (type) {
-        AttachmentType.IMAGE -> handleImageIntents(listOf(it))
-        AttachmentType.VIDEO -> handleVideoIntents(listOf(it))
+        AttachmentType.IMAGE -> handleImageIntents(listOf(it), text)
+        AttachmentType.VIDEO -> handleVideoIntents(listOf(it), text)
       }
     }
   }
@@ -99,15 +105,20 @@ class ExpoReceiveAndroidIntentsModule : Module() {
           ?.take(4)
       }
 
+    val text = intent.getStringExtra(Intent.EXTRA_TEXT)
+
     uris?.let {
       when (type) {
-        AttachmentType.IMAGE -> handleImageIntents(it)
+        AttachmentType.IMAGE -> handleImageIntents(it, text)
         else -> return
       }
     }
   }
 
-  private fun handleImageIntents(uris: List<Uri>) {
+  private fun handleImageIntents(
+    uris: List<Uri>,
+    text: String?
+  ) {
     var allParams = ""
 
     uris.forEachIndexed { index, uri ->
@@ -120,15 +131,22 @@ class ExpoReceiveAndroidIntentsModule : Module() {
       }
     }
 
-    val encoded = URLEncoder.encode(allParams, "UTF-8")
+    val encodedUris = URLEncoder.encode(allParams, "UTF-8")
+    val encodedText = text?.let { URLEncoder.encode(it, "UTF-8") }
 
-    "bluesky://intent/compose?imageUris=$encoded".toUri().let {
+    var composeIntent = "bluesky://intent/compose?imageUris=$encodedUris"
+    encodedText?.let { composeIntent += "&text=$it" }
+
+    composeIntent.toUri().let {
       val newIntent = Intent(Intent.ACTION_VIEW, it)
       appContext.currentActivity?.startActivity(newIntent)
     }
   }
 
-  private fun handleVideoIntents(uris: List<Uri>) {
+  private fun handleVideoIntents(
+    uris: List<Uri>,
+    text: String?
+  ) {
     val uri = uris[0]
     // If there is no extension for the file, substringAfterLast returns the original string - not
     // null, so we check for that below
@@ -147,7 +165,12 @@ class ExpoReceiveAndroidIntentsModule : Module() {
 
     val info = getVideoInfo(uri) ?: return
 
-    "bluesky://intent/compose?videoUri=${URLEncoder.encode(file.path, "UTF-8")}|${info["width"]}|${info["height"]}".toUri().let {
+    val encodedText = text?.let { URLEncoder.encode(it, "UTF-8") }
+
+    var composeIntent = "bluesky://intent/compose?videoUri=${URLEncoder.encode(file.path, "UTF-8")}|${info["width"]}|${info["height"]}"
+    encodedText?.let { composeIntent += "&text=$it" }
+
+    composeIntent.toUri().let {
       val newIntent = Intent(Intent.ACTION_VIEW, it)
       appContext.currentActivity?.startActivity(newIntent)
     }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bsky.app",
-  "version": "1.110.0",
+  "version": "1.111.0",
   "private": true,
   "engines": {
     "node": ">=20"
@@ -72,7 +72,7 @@
     "icons:optimize": "svgo -f ./assets/icons"
   },
   "dependencies": {
-    "@atproto/api": "^0.18.0",
+    "@atproto/api": "^0.18.4",
     "@bitdrift/react-native": "^0.6.8",
     "@braintree/sanitize-url": "^6.0.2",
     "@bsky.app/alf": "^0.1.5",
@@ -103,7 +103,7 @@
     "@react-navigation/native-stack": "^7.3.13",
     "@sentry/react-native": "~6.20.0",
     "@tanstack/query-async-storage-persister": "^5.25.0",
-    "@tanstack/react-query": "^5.8.1",
+    "@tanstack/react-query": "5.25.0",
     "@tanstack/react-query-persist-client": "^5.25.0",
     "@tiptap/core": "^2.9.1",
     "@tiptap/extension-document": "^2.9.1",
@@ -176,7 +176,7 @@
     "multiformats": "9.9.0",
     "nanoid": "^5.0.5",
     "normalize-url": "^8.0.0",
-    "patch-package": "^6.5.1",
+    "patch-package": "^8.0.1",
     "postinstall-postinstall": "^2.1.0",
     "psl": "^1.9.0",
     "radix-ui": "^1.4.3",

patches/expo-updates+29.0.12.patch

@@ -1,5 +1,26 @@
+diff --git a/node_modules/expo-updates/android/src/main/java/expo/modules/updates/loader/LoaderTask.kt b/node_modules/expo-updates/android/src/main/java/expo/modules/updates/loader/LoaderTask.kt
+index e9a8e3d..3c684e0 100644
+--- a/node_modules/expo-updates/android/src/main/java/expo/modules/updates/loader/LoaderTask.kt
++++ b/node_modules/expo-updates/android/src/main/java/expo/modules/updates/loader/LoaderTask.kt
+@@ -296,14 +296,13 @@ class LoaderTask(
+       ) {
+         try {
+           val embeddedLoader = EmbeddedLoader(context, configuration, logger, database, directory)
+-          val result = embeddedLoader.load { updateResponse ->
++          embeddedLoader.load { _ ->
+             Loader.OnUpdateResponseLoadedResult(shouldDownloadManifestIfPresentInResponse = true)
+           }
+-          launcher.launch(database)
+         } catch (e: Exception) {
+           logger.error("Unexpected error copying embedded update", e, UpdatesErrorCode.Unknown)
+-          launcher.launch(database)
+         }
++        launcher.launch(database)
+       } else {
+         launcher.launch(database)
+       }
 diff --git a/node_modules/expo-updates/ios/EXUpdates/Update/ExpoUpdatesUpdate.swift b/node_modules/expo-updates/ios/EXUpdates/Update/ExpoUpdatesUpdate.swift
-index b85291e..546709d 100644
+index 68086bd..78c7761 100644
 --- a/node_modules/expo-updates/ios/EXUpdates/Update/ExpoUpdatesUpdate.swift
 +++ b/node_modules/expo-updates/ios/EXUpdates/Update/ExpoUpdatesUpdate.swift
 @@ -78,13 +78,20 @@ public final class ExpoUpdatesUpdate: Update {

patches/react-native+0.81.5+001+initial.patch

@@ -1,47 +1,16 @@
-diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h
-index 914a249..0deac55 100644
---- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h
-+++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h
-@@ -19,6 +19,8 @@ NS_ASSUME_NONNULL_BEGIN
-  */
- @interface RCTPullToRefreshViewComponentView : RCTViewComponentView <RCTCustomPullToRefreshViewProtocol>
- 
-+- (void)beginRefreshingProgrammatically;
-+
- @end
- 
- NS_ASSUME_NONNULL_END
-diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
-index d029337..0f63ea3 100644
---- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
-+++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
-@@ -1038,6 +1038,11 @@ - (void)_adjustForMaintainVisibleContentPosition
-   }
- }
- 
-++ (BOOL)shouldBeRecycled
-+{
-+  return NO;
-+}
-+
- @end
- 
- Class<RCTComponentViewProtocol> RCTScrollViewCls(void)
 diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
-index e9b330f..ec5f58c 100644
+index e9b330f..5fbb2e0 100644
 --- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
 +++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
-@@ -15,5 +15,8 @@
+@@ -15,5 +15,6 @@
  @property (nonatomic, copy) NSString *title;
  @property (nonatomic, copy) RCTDirectEventBlock onRefresh;
  @property (nonatomic, weak) UIScrollView *scrollView;
 +@property (nonatomic, copy) UIColor *customTintColor;
-+
-+- (void)forwarderBeginRefreshing;
  
  @end
 diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
-index 53bfd04..ff1b1ed 100644
+index 53bfd04..e2e0c9f 100644
 --- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
 +++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
 @@ -23,6 +23,7 @@ @implementation RCTRefreshControl {
@@ -65,7 +34,7 @@ index 53bfd04..ff1b1ed 100644
  - (void)didMoveToWindow
  {
    [super didMoveToWindow];
-@@ -221,4 +228,50 @@ - (void)refreshControlValueChanged
+@@ -221,4 +228,16 @@ - (void)refreshControlValueChanged
    }
  }
  
@@ -80,40 +49,6 @@ index 53bfd04..ff1b1ed 100644
 +    [super setTintColor:tintColor];
 +  }
 +}
-+
-+// This method is used by Bluesky's ExpoScrollForwarder. This allows other React Native
-+// libraries to perform a refresh of a scrollview and access the refresh control's onRefresh
-+// function.
-+- (void)forwarderBeginRefreshing
-+{
-+  _refreshingProgrammatically = NO;
-+
-+  [self sizeToFit];
-+
-+  if (!self.scrollView) {
-+    return;
-+  }
-+
-+  UIScrollView *scrollView = (UIScrollView *)self.scrollView;
-+
-+  [UIView animateWithDuration:0.3
-+    delay:0
-+    options:UIViewAnimationOptionBeginFromCurrentState
-+    animations:^(void) {
-+      // Whenever we call this method, the scrollview will always be at a position of
-+      // -130 or less. Scrolling back to -65 simulates the default behavior of RCTRefreshControl
-+      [scrollView setContentOffset:CGPointMake(0, -65)];
-+    }
-+    completion:^(__unused BOOL finished) {
-+      [super beginRefreshing];
-+      [self setCurrentRefreshingState:super.refreshing];
-+
-+      if (self->_onRefresh) {
-+        self->_onRefresh(nil);
-+      }
-+    }
-+  ];
-+}
 +
  @end
 diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControlManager.m

patches/react-native+0.81.5+002+ScrollForwarder.patch

@@ -0,0 +1,67 @@
+diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h
+index 914a249..0deac55 100644
+--- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h
++++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTPullToRefreshViewComponentView.h
+@@ -19,6 +19,8 @@ NS_ASSUME_NONNULL_BEGIN
+  */
+ @interface RCTPullToRefreshViewComponentView : RCTViewComponentView <RCTCustomPullToRefreshViewProtocol>
+ 
++- (void)beginRefreshingProgrammatically;
++
+ @end
+ 
+ NS_ASSUME_NONNULL_END
+diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
+index 5fbb2e0..ec5f58c 100644
+--- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
++++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.h
+@@ -17,4 +17,6 @@
+ @property (nonatomic, weak) UIScrollView *scrollView;
+ @property (nonatomic, copy) UIColor *customTintColor;
+ 
++- (void)forwarderBeginRefreshing;
++
+ @end
+diff --git a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
+index e2e0c9f..ff1b1ed 100644
+--- a/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
++++ b/node_modules/react-native/React/Views/RefreshControl/RCTRefreshControl.m
+@@ -240,4 +240,38 @@ - (void)setTintColor:(UIColor *)tintColor
+   }
+ }
+ 
++// This method is used by Bluesky's ExpoScrollForwarder. This allows other React Native
++// libraries to perform a refresh of a scrollview and access the refresh control's onRefresh
++// function.
++- (void)forwarderBeginRefreshing
++{
++  _refreshingProgrammatically = NO;
++
++  [self sizeToFit];
++
++  if (!self.scrollView) {
++    return;
++  }
++
++  UIScrollView *scrollView = (UIScrollView *)self.scrollView;
++
++  [UIView animateWithDuration:0.3
++    delay:0
++    options:UIViewAnimationOptionBeginFromCurrentState
++    animations:^(void) {
++      // Whenever we call this method, the scrollview will always be at a position of
++      // -130 or less. Scrolling back to -65 simulates the default behavior of RCTRefreshControl
++      [scrollView setContentOffset:CGPointMake(0, -65)];
++    }
++    completion:^(__unused BOOL finished) {
++      [super beginRefreshing];
++      [self setCurrentRefreshingState:super.refreshing];
++
++      if (self->_onRefresh) {
++        self->_onRefresh(nil);
++      }
++    }
++  ];
++}
++
+ @end

patches/react-native+0.81.5+003+ScrollView-disable-recycling.patch

@@ -0,0 +1,16 @@
+diff --git a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
+index d029337..0f63ea3 100644
+--- a/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
++++ b/node_modules/react-native/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
+@@ -1038,6 +1038,11 @@ - (void)_adjustForMaintainVisibleContentPosition
+   }
+ }
+ 
+++ (BOOL)shouldBeRecycled
++{
++  return NO;
++}
++
+ @end
+ 
+ Class<RCTComponentViewProtocol> RCTScrollViewCls(void)

src/App.native.tsx

@@ -25,16 +25,10 @@ import I18nProvider from '#/locale/i18nProvider'
 import {logger} from '#/logger'
 import {isAndroid, isIOS} from '#/platform/detection'
 import {Provider as A11yProvider} from '#/state/a11y'
-import {Provider as AgeAssuranceProvider} from '#/state/ageAssurance'
 import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes'
 import {Provider as DialogStateProvider} from '#/state/dialogs'
 import {Provider as EmailVerificationProvider} from '#/state/email-verification'
 import {listenSessionDropped} from '#/state/events'
-import {
-  beginResolveGeolocationConfig,
-  ensureGeolocationConfigIsResolved,
-  Provider as GeolocationProvider,
-} from '#/state/geolocation'
 import {GlobalGestureEventsProvider} from '#/state/global-gesture-events'
 import {Provider as HomeBadgeProvider} from '#/state/home-badge'
 import {Provider as LightboxStateProvider} from '#/state/lightbox'
@@ -56,6 +50,7 @@ import {readLastActiveAccount} from '#/state/session/util'
 import {Provider as ShellStateProvider} from '#/state/shell'
 import {Provider as ComposerProvider} from '#/state/shell/composer'
 import {Provider as LoggedOutViewProvider} from '#/state/shell/logged-out'
+import {Provider as OnboardingProvider} from '#/state/shell/onboarding'
 import {Provider as ProgressGuideProvider} from '#/state/shell/progress-guide'
 import {Provider as SelectedFeedProvider} from '#/state/shell/selected-feed'
 import {Provider as StarterPackProvider} from '#/state/shell/starter-pack'
@@ -73,6 +68,9 @@ import {Provider as PolicyUpdateOverlayProvider} from '#/components/PolicyUpdate
 import {Provider as PortalProvider} from '#/components/Portal'
 import {Provider as VideoVolumeProvider} from '#/components/Post/Embed/VideoEmbed/VideoVolumeContext'
 import {ToastOutlet} from '#/components/Toast'
+import {Provider as AgeAssuranceV2Provider} from '#/ageAssurance'
+import {prefetchAgeAssuranceConfig} from '#/ageAssurance'
+import * as Geo from '#/geolocation'
 import {Splash} from '#/Splash'
 import {BottomSheetProvider} from '../modules/bottom-sheet'
 import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
@@ -93,7 +91,8 @@ if (isAndroid) {
 /**
  * Begin geolocation ASAP
  */
-beginResolveGeolocationConfig()
+Geo.resolve()
+prefetchAgeAssuranceConfig()
 
 function InnerApp() {
   const [isReady, setIsReady] = React.useState(false)
@@ -143,7 +142,7 @@ function InnerApp() {
                 <QueryProvider currentDid={currentAccount?.did}>
                   <PolicyUpdateOverlayProvider>
                     <StatsigProvider>
-                      <AgeAssuranceProvider>
+                      <AgeAssuranceV2Provider>
                         <ComposerProvider>
                           <MessagesProvider>
                             {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
@@ -186,7 +185,7 @@ function InnerApp() {
                             </LabelDefsProvider>
                           </MessagesProvider>
                         </ComposerProvider>
-                      </AgeAssuranceProvider>
+                      </AgeAssuranceV2Provider>
                     </StatsigProvider>
                   </PolicyUpdateOverlayProvider>
                 </QueryProvider>
@@ -203,10 +202,9 @@ function App() {
   const [isReady, setReady] = useState(false)
 
   React.useEffect(() => {
-    Promise.all([
-      initPersistedState(),
-      ensureGeolocationConfigIsResolved(),
-    ]).then(() => setReady(true))
+    Promise.all([initPersistedState(), Geo.resolve()]).then(() =>
+      setReady(true),
+    )
   }, [])
 
   if (!isReady) {
@@ -218,36 +216,38 @@ function App() {
    * that is set up in the InnerApp component above.
    */
   return (
-    <GeolocationProvider>
+    <Geo.Provider>
       <A11yProvider>
         <KeyboardControllerProvider>
-          <SessionProvider>
-            <PrefsStateProvider>
-              <I18nProvider>
-                <ShellStateProvider>
-                  <ModalStateProvider>
-                    <DialogStateProvider>
-                      <LightboxStateProvider>
-                        <PortalProvider>
-                          <BottomSheetProvider>
-                            <StarterPackProvider>
-                              <SafeAreaProvider
-                                initialMetrics={initialWindowMetrics}>
-                                <InnerApp />
-                              </SafeAreaProvider>
-                            </StarterPackProvider>
-                          </BottomSheetProvider>
-                        </PortalProvider>
-                      </LightboxStateProvider>
-                    </DialogStateProvider>
-                  </ModalStateProvider>
-                </ShellStateProvider>
-              </I18nProvider>
-            </PrefsStateProvider>
-          </SessionProvider>
+          <OnboardingProvider>
+            <SessionProvider>
+              <PrefsStateProvider>
+                <I18nProvider>
+                  <ShellStateProvider>
+                    <ModalStateProvider>
+                      <DialogStateProvider>
+                        <LightboxStateProvider>
+                          <PortalProvider>
+                            <BottomSheetProvider>
+                              <StarterPackProvider>
+                                <SafeAreaProvider
+                                  initialMetrics={initialWindowMetrics}>
+                                  <InnerApp />
+                                </SafeAreaProvider>
+                              </StarterPackProvider>
+                            </BottomSheetProvider>
+                          </PortalProvider>
+                        </LightboxStateProvider>
+                      </DialogStateProvider>
+                    </ModalStateProvider>
+                  </ShellStateProvider>
+                </I18nProvider>
+              </PrefsStateProvider>
+            </SessionProvider>
+          </OnboardingProvider>
         </KeyboardControllerProvider>
       </A11yProvider>
-    </GeolocationProvider>
+    </Geo.Provider>
   )
 }
 

src/App.web.tsx

@@ -14,16 +14,10 @@ import {ThemeProvider} from '#/lib/ThemeContext'
 import I18nProvider from '#/locale/i18nProvider'
 import {logger} from '#/logger'
 import {Provider as A11yProvider} from '#/state/a11y'
-import {Provider as AgeAssuranceProvider} from '#/state/ageAssurance'
 import {Provider as MutedThreadsProvider} from '#/state/cache/thread-mutes'
 import {Provider as DialogStateProvider} from '#/state/dialogs'
 import {Provider as EmailVerificationProvider} from '#/state/email-verification'
 import {listenSessionDropped} from '#/state/events'
-import {
-  beginResolveGeolocationConfig,
-  ensureGeolocationConfigIsResolved,
-  Provider as GeolocationProvider,
-} from '#/state/geolocation'
 import {Provider as HomeBadgeProvider} from '#/state/home-badge'
 import {Provider as LightboxStateProvider} from '#/state/lightbox'
 import {MessagesProvider} from '#/state/messages'
@@ -44,6 +38,7 @@ import {readLastActiveAccount} from '#/state/session/util'
 import {Provider as ShellStateProvider} from '#/state/shell'
 import {Provider as ComposerProvider} from '#/state/shell/composer'
 import {Provider as LoggedOutViewProvider} from '#/state/shell/logged-out'
+import {Provider as OnboardingProvider} from '#/state/shell/onboarding'
 import {Provider as ProgressGuideProvider} from '#/state/shell/progress-guide'
 import {Provider as SelectedFeedProvider} from '#/state/shell/selected-feed'
 import {Provider as StarterPackProvider} from '#/state/shell/starter-pack'
@@ -61,13 +56,18 @@ import {Provider as PortalProvider} from '#/components/Portal'
 import {Provider as ActiveVideoProvider} from '#/components/Post/Embed/VideoEmbed/ActiveVideoWebContext'
 import {Provider as VideoVolumeProvider} from '#/components/Post/Embed/VideoEmbed/VideoVolumeContext'
 import {ToastOutlet} from '#/components/Toast'
+import {Provider as AgeAssuranceV2Provider} from '#/ageAssurance'
+import {prefetchAgeAssuranceConfig} from '#/ageAssurance'
+import * as Geo from '#/geolocation'
+import {Splash} from '#/Splash'
 import {BackgroundNotificationPreferencesProvider} from '../modules/expo-background-notification-handler/src/BackgroundNotificationHandlerProvider'
 import {Provider as HideBottomBarBorderProvider} from './lib/hooks/useHideBottomBarBorder'
 
 /**
  * Begin geolocation ASAP
  */
-beginResolveGeolocationConfig()
+Geo.resolve()
+prefetchAgeAssuranceConfig()
 
 function InnerApp() {
   const [isReady, setIsReady] = React.useState(false)
@@ -104,7 +104,7 @@ function InnerApp() {
   }, [_])
 
   // wait for session to resume
-  if (!isReady || !hasCheckedReferrer) return null
+  if (!isReady || !hasCheckedReferrer) return <Splash isReady />
 
   return (
     <Alf theme={theme}>
@@ -118,7 +118,7 @@ function InnerApp() {
                 <QueryProvider currentDid={currentAccount?.did}>
                   <PolicyUpdateOverlayProvider>
                     <StatsigProvider>
-                      <AgeAssuranceProvider>
+                      <AgeAssuranceV2Provider>
                         <ComposerProvider>
                           <MessagesProvider>
                             {/* LabelDefsProvider MUST come before ModerationOptsProvider */}
@@ -157,7 +157,7 @@ function InnerApp() {
                             </LabelDefsProvider>
                           </MessagesProvider>
                         </ComposerProvider>
-                      </AgeAssuranceProvider>
+                      </AgeAssuranceV2Provider>
                     </StatsigProvider>
                   </PolicyUpdateOverlayProvider>
                 </QueryProvider>
@@ -174,14 +174,13 @@ function App() {
   const [isReady, setReady] = useState(false)
 
   React.useEffect(() => {
-    Promise.all([
-      initPersistedState(),
-      ensureGeolocationConfigIsResolved(),
-    ]).then(() => setReady(true))
+    Promise.all([initPersistedState(), Geo.resolve()]).then(() =>
+      setReady(true),
+    )
   }, [])
 
   if (!isReady) {
-    return null
+    return <Splash isReady />
   }
 
   /*
@@ -189,29 +188,31 @@ function App() {
    * that is set up in the InnerApp component above.
    */
   return (
-    <GeolocationProvider>
+    <Geo.Provider>
       <A11yProvider>
-        <SessionProvider>
-          <PrefsStateProvider>
-            <I18nProvider>
-              <ShellStateProvider>
-                <ModalStateProvider>
-                  <DialogStateProvider>
-                    <LightboxStateProvider>
-                      <PortalProvider>
-                        <StarterPackProvider>
-                          <InnerApp />
-                        </StarterPackProvider>
-                      </PortalProvider>
-                    </LightboxStateProvider>
-                  </DialogStateProvider>
-                </ModalStateProvider>
-              </ShellStateProvider>
-            </I18nProvider>
-          </PrefsStateProvider>
-        </SessionProvider>
+        <OnboardingProvider>
+          <SessionProvider>
+            <PrefsStateProvider>
+              <I18nProvider>
+                <ShellStateProvider>
+                  <ModalStateProvider>
+                    <DialogStateProvider>
+                      <LightboxStateProvider>
+                        <PortalProvider>
+                          <StarterPackProvider>
+                            <InnerApp />
+                          </StarterPackProvider>
+                        </PortalProvider>
+                      </LightboxStateProvider>
+                    </DialogStateProvider>
+                  </ModalStateProvider>
+                </ShellStateProvider>
+              </I18nProvider>
+            </PrefsStateProvider>
+          </SessionProvider>
+        </OnboardingProvider>
       </A11yProvider>
-    </GeolocationProvider>
+    </Geo.Provider>
   )
 }
 

src/Splash.web.tsx

@@ -0,0 +1,29 @@
+/*
+ * This is a reimplementation of what exists in our HTML template files
+ * already. Once the React tree mounts, this is what gets rendered first, until
+ * the app is ready to go.
+ */
+
+import {View} from 'react-native'
+import Svg, {Path} from 'react-native-svg'
+
+import {atoms as a} from '#/alf'
+
+const size = 100
+const ratio = 57 / 64
+
+export function Splash() {
+  return (
+    <View style={[a.fixed, a.inset_0, a.align_center, a.justify_center]}>
+      <Svg
+        fill="none"
+        viewBox="0 0 64 57"
+        style={[a.relative, {width: size, height: size * ratio, top: -50}]}>
+        <Path
+          fill="#006AFF"
+          d="M13.873 3.805C21.21 9.332 29.103 20.537 32 26.55v15.882c0-.338-.13.044-.41.867-1.512 4.456-7.418 21.847-20.923 7.944-7.111-7.32-3.819-14.64 9.125-16.85-7.405 1.264-15.73-.825-18.014-9.015C1.12 23.022 0 8.51 0 6.55 0-3.268 8.579-.182 13.873 3.805ZM50.127 3.805C42.79 9.332 34.897 20.537 32 26.55v15.882c0-.338.13.044.41.867 1.512 4.456 7.418 21.847 20.923 7.944 7.111-7.32 3.819-14.64-9.125-16.85 7.405 1.264 15.73-.825 18.014-9.015C62.88 23.022 64 8.51 64 6.55c0-9.818-8.578-6.732-13.873-2.745Z"
+        />
+      </Svg>
+    </View>
+  )
+}

src/ageAssurance/__mocks__/data.tsx

@@ -0,0 +1,3 @@
+export const prefetchAgeAssuranceData = () => {}
+export const setBirthdateForDid = () => {}
+export const setCreatedAtForDid = () => {}

src/ageAssurance/components/NoAccessScreen.tsx

@@ -0,0 +1,355 @@
+import {useCallback, useEffect} from 'react'
+import {ScrollView, View} from 'react-native'
+import {useSafeAreaInsets} from 'react-native-safe-area-context'
+import {msg, Trans} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
+
+import {
+  SupportCode,
+  useCreateSupportLink,
+} from '#/lib/hooks/useCreateSupportLink'
+import {dateDiff, useGetTimeAgo} from '#/lib/hooks/useTimeAgo'
+import {logger} from '#/logger'
+import {isWeb} from '#/platform/detection'
+import {isNative} from '#/platform/detection'
+import {useIsBirthdateUpdateAllowed} from '#/state/birthdate'
+import {useSessionApi} from '#/state/session'
+import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
+import {Admonition} from '#/components/Admonition'
+import {AgeAssuranceAppealDialog} from '#/components/ageAssurance/AgeAssuranceAppealDialog'
+import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
+import {AgeAssuranceInitDialog} from '#/components/ageAssurance/AgeAssuranceInitDialog'
+import {Button, ButtonIcon, ButtonText} from '#/components/Button'
+import {useDialogControl} from '#/components/Dialog'
+import * as Dialog from '#/components/Dialog'
+import {BirthDateSettingsDialog} from '#/components/dialogs/BirthDateSettings'
+import {DeviceLocationRequestDialog} from '#/components/dialogs/DeviceLocationRequestDialog'
+import {Full as Logo} from '#/components/icons/Logo'
+import {ShieldCheck_Stroke2_Corner0_Rounded as ShieldIcon} from '#/components/icons/Shield'
+import {createStaticClick, SimpleInlineLinkText} from '#/components/Link'
+import {Outlet as PortalOutlet} from '#/components/Portal'
+import * as Toast from '#/components/Toast'
+import {Text} from '#/components/Typography'
+import {BottomSheetOutlet} from '#/../modules/bottom-sheet'
+import {useAgeAssurance} from '#/ageAssurance'
+import {useAgeAssuranceDataContext} from '#/ageAssurance/data'
+import {useComputeAgeAssuranceRegionAccess} from '#/ageAssurance/useComputeAgeAssuranceRegionAccess'
+import {
+  isLegacyBirthdateBug,
+  useAgeAssuranceRegionConfig,
+} from '#/ageAssurance/util'
+import {useDeviceGeolocationApi} from '#/geolocation'
+
+const textStyles = [a.text_md, a.leading_snug]
+
+export function NoAccessScreen() {
+  const t = useTheme()
+  const {_} = useLingui()
+  const {gtPhone} = useBreakpoints()
+  const insets = useSafeAreaInsets()
+  const birthdateControl = useDialogControl()
+  const {data} = useAgeAssuranceDataContext()
+  const region = useAgeAssuranceRegionConfig()
+  const isBirthdateUpdateAllowed = useIsBirthdateUpdateAllowed()
+  const {logoutCurrentAccount} = useSessionApi()
+  const createSupportLink = useCreateSupportLink()
+
+  const aa = useAgeAssurance()
+  const isBlocked = aa.state.status === aa.Status.Blocked
+  const isAARegion = !!region
+  const hasDeclaredAge = data?.declaredAge !== undefined
+  const canUpdateBirthday =
+    isBirthdateUpdateAllowed || isLegacyBirthdateBug(data?.birthdate || '')
+
+  useEffect(() => {
+    // just counting overall hits here
+    logger.metric(`blockedGeoOverlay:shown`, {})
+  }, [])
+
+  const onPressLogout = useCallback(() => {
+    if (isWeb) {
+      // We're switching accounts, which remounts the entire app.
+      // On mobile, this gets us Home, but on the web we also need reset the URL.
+      // We can't change the URL via a navigate() call because the navigator
+      // itself is about to unmount, and it calls pushState() too late.
+      // So we change the URL ourselves. The navigator will pick it up on remount.
+      history.pushState(null, '', '/')
+    }
+    logoutCurrentAccount('AgeAssuranceNoAccessScreen')
+  }, [logoutCurrentAccount])
+
+  const birthdateUpdateText = canUpdateBirthday ? (
+    <Text style={[textStyles]}>
+      <Trans>
+        If you believe your birthdate is incorrect, you can update it by{' '}
+        <SimpleInlineLinkText
+          label={_(msg`Click here to update your birthdate`)}
+          style={[textStyles]}
+          {...createStaticClick(() => {
+            birthdateControl.open()
+          })}>
+          clicking here
+        </SimpleInlineLinkText>
+        .
+      </Trans>
+    </Text>
+  ) : (
+    <Text style={[textStyles]}>
+      <Trans>
+        If you believe your birthdate is incorrect, please{' '}
+        <SimpleInlineLinkText
+          to={createSupportLink({code: SupportCode.AA_BIRTHDATE})}
+          label={_(msg`Click here to contact our support team`)}
+          style={[textStyles]}>
+          contact our support team
+        </SimpleInlineLinkText>
+        .
+      </Trans>
+    </Text>
+  )
+
+  return (
+    <>
+      <ScrollView
+        contentContainerStyle={[
+          a.px_2xl,
+          {
+            paddingTop: isWeb ? a.p_5xl.padding : insets.top + a.p_2xl.padding,
+            paddingBottom: 100,
+          },
+        ]}>
+        <View
+          style={[
+            a.mx_auto,
+            a.w_full,
+            web({
+              maxWidth: 380,
+              paddingTop: gtPhone ? '8vh' : undefined,
+            }),
+            {
+              gap: 32,
+            },
+          ]}>
+          <View style={[a.align_start]}>
+            <AgeAssuranceBadge />
+          </View>
+
+          {hasDeclaredAge ? (
+            <>
+              {isAARegion ? (
+                <>
+                  <View style={[a.gap_lg]}>
+                    <Text style={[textStyles]}>
+                      <Trans>
+                        You are accessing Bluesky from a region that legally
+                        requires us to verify your age before allowing you to
+                        access the app.
+                      </Trans>
+                    </Text>
+
+                    {!isBlocked && birthdateUpdateText}
+                  </View>
+
+                  <AccessSection />
+                </>
+              ) : (
+                <View style={[a.gap_lg]}>
+                  <Text style={[textStyles]}>
+                    <Trans>
+                      Unfortunately, the birthdate you have saved to your
+                      profile makes you too young to access Bluesky.
+                    </Trans>
+                  </Text>
+
+                  {birthdateUpdateText}
+                </View>
+              )}
+            </>
+          ) : (
+            <View style={[a.gap_lg]}>
+              <Text style={[textStyles]}>
+                <Trans>
+                  It looks like you haven't added your birthdate. You must
+                  provide an accurate date of birth to use Bluesky.
+                </Trans>
+              </Text>
+              <Button
+                color="primary"
+                size="large"
+                label={_(msg`Click here to update your birthdate`)}
+                onPress={() => birthdateControl.open()}>
+                <ButtonText>
+                  <Trans>Add your birthdate</Trans>
+                </ButtonText>
+              </Button>
+            </View>
+          )}
+
+          <View style={[a.pt_lg, a.gap_xl]}>
+            <Logo width={120} textFill={t.atoms.text.color} />
+            <Text style={[a.text_sm, a.italic, t.atoms.text_contrast_medium]}>
+              <Trans>
+                To log out,{' '}
+                <SimpleInlineLinkText
+                  label={_(msg`Click here to log out`)}
+                  {...createStaticClick(() => {
+                    onPressLogout()
+                  })}>
+                  click here
+                </SimpleInlineLinkText>
+                .
+              </Trans>
+            </Text>
+          </View>
+        </View>
+      </ScrollView>
+
+      <BirthDateSettingsDialog control={birthdateControl} />
+
+      {/*
+       * While this blocking overlay is up, other dialogs in the shell
+       * are not mounted, so it _should_ be safe to use these here
+       * without fear of other modals showing up.
+       */}
+      <BottomSheetOutlet />
+      <PortalOutlet />
+    </>
+  )
+}
+
+function AccessSection() {
+  const t = useTheme()
+  const {_, i18n} = useLingui()
+  const control = useDialogControl()
+  const appealControl = Dialog.useDialogControl()
+  const locationControl = Dialog.useDialogControl()
+  const getTimeAgo = useGetTimeAgo()
+  const {setDeviceGeolocation} = useDeviceGeolocationApi()
+  const computeAgeAssuranceRegionAccess = useComputeAgeAssuranceRegionAccess()
+
+  const aa = useAgeAssurance()
+  const {status, lastInitiatedAt} = aa.state
+  const isBlocked = status === aa.Status.Blocked
+  const hasInitiated = !!lastInitiatedAt
+  const timeAgo = lastInitiatedAt
+    ? getTimeAgo(lastInitiatedAt, new Date())
+    : null
+  const diff = lastInitiatedAt
+    ? dateDiff(lastInitiatedAt, new Date(), 'down')
+    : null
+
+  return (
+    <>
+      <AgeAssuranceInitDialog control={control} />
+      <AgeAssuranceAppealDialog control={appealControl} />
+
+      <View style={[a.gap_xl]}>
+        {isBlocked ? (
+          <Admonition type="warning">
+            <Trans>
+              You are currently unable to access Bluesky's Age Assurance flow.
+              Please{' '}
+              <SimpleInlineLinkText
+                label={_(msg`Contact our moderation team`)}
+                {...createStaticClick(() => {
+                  appealControl.open()
+                  logger.metric('ageAssurance:appealDialogOpen', {})
+                })}>
+                contact our moderation team
+              </SimpleInlineLinkText>{' '}
+              if you believe this is an error.
+            </Trans>
+          </Admonition>
+        ) : (
+          <>
+            <View style={[a.gap_md]}>
+              <Button
+                label={_(msg`Verify now`)}
+                size="large"
+                color={hasInitiated ? 'secondary' : 'primary'}
+                onPress={() => {
+                  control.open()
+                  logger.metric('ageAssurance:initDialogOpen', {
+                    hasInitiatedPreviously: hasInitiated,
+                  })
+                }}>
+                <ButtonIcon icon={ShieldIcon} />
+                <ButtonText>
+                  {hasInitiated ? (
+                    <Trans>Verify again</Trans>
+                  ) : (
+                    <Trans>Verify now</Trans>
+                  )}
+                </ButtonText>
+              </Button>
+
+              {lastInitiatedAt && timeAgo && diff ? (
+                <Text
+                  style={[a.text_sm, a.italic, t.atoms.text_contrast_medium]}
+                  title={i18n.date(lastInitiatedAt, {
+                    dateStyle: 'medium',
+                    timeStyle: 'medium',
+                  })}>
+                  {diff.value === 0 ? (
+                    <Trans>Last initiated just now</Trans>
+                  ) : (
+                    <Trans>Last initiated {timeAgo} ago</Trans>
+                  )}
+                </Text>
+              ) : (
+                <Text
+                  style={[a.text_sm, a.italic, t.atoms.text_contrast_medium]}>
+                  <Trans>Age assurance only takes a few minutes</Trans>
+                </Text>
+              )}
+            </View>
+          </>
+        )}
+
+        <View style={[a.gap_xs]}>
+          {isNative && (
+            <>
+              <Admonition>
+                <Trans>
+                  Is your location not accurate?{' '}
+                  <SimpleInlineLinkText
+                    label={_(msg`Confirm your location`)}
+                    {...createStaticClick(() => {
+                      locationControl.open()
+                    })}>
+                    Tap here to confirm your location.
+                  </SimpleInlineLinkText>{' '}
+                </Trans>
+              </Admonition>
+
+              <DeviceLocationRequestDialog
+                control={locationControl}
+                onLocationAcquired={props => {
+                  const access = computeAgeAssuranceRegionAccess(
+                    props.geolocation,
+                  )
+                  if (access !== aa.Access.Full) {
+                    props.disableDialogAction()
+                    props.setDialogError(
+                      _(
+                        msg`We're sorry, but based on your device's location, you are currently located in a region that requires age assurance.`,
+                      ),
+                    )
+                  } else {
+                    props.closeDialog(() => {
+                      // set this after close!
+                      setDeviceGeolocation(props.geolocation)
+                      Toast.show(_(msg`Thanks! You're all set.`), {
+                        type: 'success',
+                      })
+                    })
+                  }
+                }}
+              />
+            </>
+          )}
+        </View>
+      </View>
+    </>
+  )
+}

src/ageAssurance/components/RedirectOverlay.tsx

@@ -0,0 +1,334 @@
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react'
+import {Dimensions, View} from 'react-native'
+import * as Linking from 'expo-linking'
+import {msg, Trans} from '@lingui/macro'
+import {useLingui} from '@lingui/react'
+
+import {retry} from '#/lib/async/retry'
+import {wait} from '#/lib/async/wait'
+import {parseLinkingUrl} from '#/lib/parseLinkingUrl'
+import {isWeb} from '#/platform/detection'
+import {isIOS} from '#/platform/detection'
+import {useAgent, useSession} from '#/state/session'
+import {atoms as a, platform, useBreakpoints, useTheme} from '#/alf'
+import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
+import {Button, ButtonText} from '#/components/Button'
+import {FullWindowOverlay} from '#/components/FullWindowOverlay'
+import {CheckThick_Stroke2_Corner0_Rounded as SuccessIcon} from '#/components/icons/Check'
+import {CircleInfo_Stroke2_Corner0_Rounded as ErrorIcon} from '#/components/icons/CircleInfo'
+import {Loader} from '#/components/Loader'
+import {Text} from '#/components/Typography'
+import {refetchAgeAssuranceServerState} from '#/ageAssurance'
+import {logger} from '#/ageAssurance'
+
+export type RedirectOverlayState = {
+  result: 'success' | 'unknown'
+  actorDid: string
+}
+
+/**
+ * Validate and parse the query parameters returned from the age assurance
+ * redirect. If not valid, returns `undefined` and the dialog will not open.
+ */
+export function parseRedirectOverlayState(
+  state: {
+    result?: string
+    actorDid?: string
+  } = {},
+): RedirectOverlayState | undefined {
+  let result: RedirectOverlayState['result'] = 'unknown'
+  const actorDid = state.actorDid
+
+  switch (state.result) {
+    case 'success':
+      result = 'success'
+      break
+    case 'unknown':
+    default:
+      result = 'unknown'
+      break
+  }
+
+  if (actorDid) {
+    return {
+      result,
+      actorDid,
+    }
+  }
+}
+
+const Context = createContext<{
+  isOpen: boolean
+  open: (state: RedirectOverlayState) => void
+  close: () => void
+}>({
+  isOpen: false,
+  open: () => {},
+  close: () => {},
+})
+
+export function useRedirectOverlayContext() {
+  return useContext(Context)
+}
+
+export function Provider({children}: {children?: React.ReactNode}) {
+  const {currentAccount} = useSession()
+  const incomingUrl = Linking.useLinkingURL()
+  const [state, setState] = useState<RedirectOverlayState | null>(() => {
+    if (!incomingUrl) return null
+    const url = parseLinkingUrl(incomingUrl)
+    if (url.pathname !== '/intent/age-assurance') return null
+    const params = url.searchParams
+    const state = parseRedirectOverlayState({
+      result: params.get('result') ?? undefined,
+      actorDid: params.get('actorDid') ?? undefined,
+    })
+
+    if (isWeb) {
+      // Clear the URL parameters so they don't re-trigger
+      history.pushState(null, '', '/')
+    }
+
+    /*
+     * If we don't have an account or the account doesn't match, do
+     * nothing. By the time the user switches to their other account, AA
+     * state should be ready for them.
+     */
+    if (state && currentAccount && state.actorDid === currentAccount.did) {
+      return state
+    }
+
+    return null
+  })
+  const open = useCallback((state: RedirectOverlayState) => {
+    setState(state)
+  }, [])
+  const close = useCallback(() => {
+    setState(null)
+  }, [])
+
+  return (
+    <Context.Provider
+      value={useMemo(
+        () => ({
+          isOpen: state !== null,
+          open,
+          close,
+        }),
+        [state, open, close],
+      )}>
+      {children}
+    </Context.Provider>
+  )
+}
+
+export function RedirectOverlay() {
+  const t = useTheme()
+  const {_} = useLingui()
+  const {isOpen} = useRedirectOverlayContext()
+  const {gtMobile} = useBreakpoints()
+
+  return isOpen ? (
+    <FullWindowOverlay>
+      <View
+        style={[
+          a.fixed,
+          a.inset_0,
+          // setting a zIndex when using FullWindowOverlay on iOS
+          // means the taps pass straight through to the underlying content (???)
+          // so don't set it on iOS. FullWindowOverlay already does the job.
+          !isIOS && {zIndex: 9999},
+          t.atoms.bg,
+          gtMobile ? a.p_2xl : a.p_xl,
+          a.align_center,
+          // @ts-ignore
+          platform({
+            web: {
+              paddingTop: '35vh',
+            },
+            default: {
+              paddingTop: Dimensions.get('window').height * 0.35,
+            },
+          }),
+        ]}>
+        <View
+          role="dialog"
+          aria-role="dialog"
+          aria-label={_(msg`Verifying your age assurance status`)}>
+          <View style={[a.pb_3xl, {width: 300}]}>
+            <Inner />
+          </View>
+        </View>
+      </View>
+    </FullWindowOverlay>
+  ) : null
+}
+
+function Inner() {
+  const t = useTheme()
+  const {_} = useLingui()
+  const agent = useAgent()
+  const polling = useRef(false)
+  const unmounted = useRef(false)
+  const [error, setError] = useState(false)
+  const [success, setSuccess] = useState(false)
+  const {close} = useRedirectOverlayContext()
+
+  useEffect(() => {
+    if (polling.current) return
+
+    polling.current = true
+
+    logger.metric('ageAssurance:redirectDialogOpen', {})
+
+    wait(
+      3e3,
+      retry(
+        5,
+        () => true,
+        async () => {
+          if (!agent.session) return
+          if (unmounted.current) return
+
+          const data = await refetchAgeAssuranceServerState({agent})
+
+          if (data?.state.status !== 'assured') {
+            throw new Error(
+              `Polling for age assurance state did not receive assured status`,
+            )
+          }
+
+          return data
+        },
+        1e3,
+      ),
+    )
+      .then(async data => {
+        if (!data) return
+        if (!agent.session) return
+        if (unmounted.current) return
+
+        setSuccess(true)
+
+        logger.metric('ageAssurance:redirectDialogSuccess', {})
+      })
+      .catch(() => {
+        if (unmounted.current) return
+        setError(true)
+        logger.metric('ageAssurance:redirectDialogFail', {})
+      })
+
+    return () => {
+      unmounted.current = true
+    }
+  }, [agent])
+
+  if (success) {
+    return (
+      <>
+        <View style={[a.align_start, a.w_full]}>
+          <AgeAssuranceBadge />
+
+          <View
+            style={[
+              a.flex_row,
+              a.justify_between,
+              a.align_center,
+              a.gap_sm,
+              a.pt_lg,
+              a.pb_md,
+            ]}>
+            <SuccessIcon size="sm" fill={t.palette.positive_500} />
+            <Text style={[a.text_3xl, a.font_bold]}>
+              <Trans>Success</Trans>
+            </Text>
+          </View>
+
+          <Text style={[a.text_md, a.leading_snug]}>
+            <Trans>
+              We've confirmed your age assurance status. You can now close this
+              dialog.
+            </Trans>
+          </Text>
+
+          <View style={[a.w_full, a.pt_lg]}>
+            <Button
+              label={_(msg`Close`)}
+              size="large"
+              variant="solid"
+              color="secondary"
+              onPress={() => close()}>
+              <ButtonText>
+                <Trans>Close</Trans>
+              </ButtonText>
+            </Button>
+          </View>
+        </View>
+      </>
+    )
+  }
+
+  return (
+    <>
+      <View style={[a.align_start, a.w_full]}>
+        <AgeAssuranceBadge />
+
+        <View
+          style={[
+            a.flex_row,
+            a.justify_between,
+            a.align_center,
+            a.gap_sm,
+            a.pt_lg,
+            a.pb_md,
+          ]}>
+          {error && <ErrorIcon size="lg" fill={t.palette.negative_500} />}
+
+          <Text style={[a.text_3xl, a.font_bold]}>
+            {error ? <Trans>Connection issue</Trans> : <Trans>Verifying</Trans>}
+          </Text>
+
+          {!error && <Loader size="lg" />}
+        </View>
+
+        <Text style={[a.text_md, t.atoms.text_contrast_medium, a.leading_snug]}>
+          {error ? (
+            <Trans>
+              We were unable to receive the verification due to a connection
+              issue. It may arrive later. If it does, your account will update
+              automatically.
+            </Trans>
+          ) : (
+            <Trans>
+              We're confirming your age assurance status with our servers. This
+              should only take a few seconds.
+            </Trans>
+          )}
+        </Text>
+
+        {error && (
+          <View style={[a.w_full, a.pt_lg]}>
+            <Button
+              label={_(msg`Close`)}
+              size="large"
+              variant="solid"
+              color="secondary"
+              onPress={() => close()}>
+              <ButtonText>
+                <Trans>Close</Trans>
+              </ButtonText>
+            </Button>
+          </View>
+        )}
+      </View>
+    </>
+  )
+}

src/ageAssurance/data.tsx

@@ -0,0 +1,495 @@
+import {createContext, useCallback, useContext, useEffect, useMemo} from 'react'
+import {
+  type AppBskyAgeassuranceDefs,
+  type AppBskyAgeassuranceGetConfig,
+  type AppBskyAgeassuranceGetState,
+  AtpAgent,
+  getAgeAssuranceRegionConfig,
+} from '@atproto/api'
+import AsyncStorage from '@react-native-async-storage/async-storage'
+import {createAsyncStoragePersister} from '@tanstack/query-async-storage-persister'
+import {focusManager, QueryClient, useQuery} from '@tanstack/react-query'
+import {persistQueryClient} from '@tanstack/react-query-persist-client'
+import debounce from 'lodash.debounce'
+
+import {networkRetry} from '#/lib/async/retry'
+import {PUBLIC_BSKY_SERVICE} from '#/lib/constants'
+import {getAge} from '#/lib/strings/time'
+import {snoozeBirthdateUpdateAllowedForDid} from '#/state/birthdate'
+import {useAgent, useSession} from '#/state/session'
+import * as debug from '#/ageAssurance/debug'
+import {logger} from '#/ageAssurance/logger'
+import {isLegacyBirthdateBug} from '#/ageAssurance/util'
+import {IS_DEV} from '#/env'
+import {device} from '#/storage'
+
+/**
+ * Special query client for age assurance data so we can prefetch on app
+ * load without interfering with other queries.
+ */
+const qc = new QueryClient({
+  defaultOptions: {
+    queries: {
+      /**
+       * We clear this manually, so disable automatic garbage collection.
+       * @see https://tanstack.com/query/latest/docs/framework/react/plugins/persistQueryClient#how-it-works
+       */
+      gcTime: Infinity,
+    },
+  },
+})
+const persister = createAsyncStoragePersister({
+  storage: AsyncStorage,
+  key: 'age-assurance-query-client',
+})
+const [, cacheHydrationPromise] = persistQueryClient({
+  queryClient: qc,
+  persister,
+})
+
+function getDidFromAgentSession(agent: AtpAgent) {
+  const sessionManager = agent.sessionManager
+  if (!sessionManager || !sessionManager.did) return
+  return sessionManager.did
+}
+
+/*
+ * Optimistic data
+ */
+
+const createdAtCache = new Map<string, string>()
+export function setCreatedAtForDid({
+  did,
+  createdAt,
+}: {
+  did: string
+  createdAt: string
+}) {
+  createdAtCache.set(did, createdAt)
+}
+const birthdateCache = new Map<string, string>()
+export function setBirthdateForDid({
+  did,
+  birthdate,
+}: {
+  did: string
+  birthdate: string
+}) {
+  birthdateCache.set(did, birthdate)
+}
+
+/*
+ * Config
+ */
+
+export const configQueryKey = ['config']
+export async function getConfig() {
+  if (debug.enabled) return debug.resolve(debug.config)
+  const agent = new AtpAgent({
+    service: PUBLIC_BSKY_SERVICE,
+  })
+  const res = await agent.app.bsky.ageassurance.getConfig()
+  return res.data
+}
+export function getConfigFromCache():
+  | AppBskyAgeassuranceGetConfig.OutputSchema
+  | undefined {
+  return qc.getQueryData<AppBskyAgeassuranceGetConfig.OutputSchema>(
+    configQueryKey,
+  )
+}
+let configPrefetchPromise: Promise<void> | undefined
+export async function prefetchConfig() {
+  if (configPrefetchPromise) {
+    logger.debug(`prefetchAgeAssuranceConfig: already in progress`)
+    return
+  }
+
+  configPrefetchPromise = new Promise(async resolve => {
+    await cacheHydrationPromise
+    const cached = getConfigFromCache()
+
+    if (cached) {
+      logger.debug(`prefetchAgeAssuranceConfig: using cache`)
+      resolve()
+    } else {
+      try {
+        logger.debug(`prefetchAgeAssuranceConfig: resolving...`)
+        const res = await networkRetry(3, () => getConfig())
+        qc.setQueryData<AppBskyAgeassuranceGetConfig.OutputSchema>(
+          configQueryKey,
+          res,
+        )
+      } catch (e: any) {
+        logger.warn(`prefetchAgeAssuranceConfig: failed`, {
+          safeMessage: e.message,
+        })
+      } finally {
+        resolve()
+      }
+    }
+  })
+}
+export function useConfigQuery() {
+  return useQuery(
+    {
+      /**
+       * Will re-fetch when stale, at most every hour (or 5s in dev for easier
+       * testing).
+       *
+       * @see https://tanstack.com/query/latest/docs/framework/react/guides/initial-query-data#initial-data-from-the-cache-with-initialdataupdatedat
+       */
+      staleTime: IS_DEV ? 5e3 : 1000 * 60 * 60,
+      initialData: getConfigFromCache(),
+      initialDataUpdatedAt: () =>
+        qc.getQueryState(configQueryKey)?.dataUpdatedAt,
+      queryKey: configQueryKey,
+      async queryFn() {
+        logger.debug(`useConfigQuery: fetching config`)
+        return getConfig()
+      },
+    },
+    qc,
+  )
+}
+
+/*
+ * Server state
+ */
+
+export function createServerStateQueryKey({did}: {did: string}) {
+  return ['serverState', did]
+}
+export async function getServerState({agent}: {agent: AtpAgent}) {
+  if (debug.enabled && debug.serverState)
+    return debug.resolve(debug.serverState)
+  const geolocation = device.get(['mergedGeolocation'])
+  if (!geolocation || !geolocation.countryCode) {
+    logger.error(`getServerState: missing geolocation countryCode`)
+    return
+  }
+  const {data} = await agent.app.bsky.ageassurance.getState({
+    countryCode: geolocation.countryCode,
+    regionCode: geolocation.regionCode,
+  })
+  const did = getDidFromAgentSession(agent)
+  if (data && did && createdAtCache.has(did)) {
+    /*
+     * If account was just created, just use the local cache if available. On
+     * subsequent reloads, the server should have the correct value.
+     */
+    data.metadata.accountCreatedAt = createdAtCache.get(did)
+  }
+  return data ?? null
+}
+export function getServerStateFromCache({
+  did,
+}: {
+  did: string
+}): AppBskyAgeassuranceGetState.OutputSchema | undefined {
+  return qc.getQueryData<AppBskyAgeassuranceGetState.OutputSchema>(
+    createServerStateQueryKey({did}),
+  )
+}
+export async function prefetchServerState({agent}: {agent: AtpAgent}) {
+  const did = getDidFromAgentSession(agent)
+
+  if (!did) return
+
+  await cacheHydrationPromise
+  const qk = createServerStateQueryKey({did})
+  const cached = getServerStateFromCache({did})
+
+  if (cached) {
+    logger.debug(`prefetchServerState: using cache`)
+    return
+  }
+
+  try {
+    logger.debug(`prefetchServerState: resolving...`)
+    const res = await networkRetry(3, () => getServerState({agent}))
+    qc.setQueryData<AppBskyAgeassuranceGetState.OutputSchema>(qk, res)
+  } catch (e: any) {
+    logger.warn(`prefetchServerState: failed`, {
+      safeMessage: e.message,
+    })
+  }
+}
+export async function refetchServerState({agent}: {agent: AtpAgent}) {
+  const did = getDidFromAgentSession(agent)
+  if (!did) return
+  logger.debug(`refetchServerState: fetching...`)
+  const res = await networkRetry(3, () => getServerState({agent}))
+  qc.setQueryData<AppBskyAgeassuranceGetState.OutputSchema>(
+    createServerStateQueryKey({did}),
+    res,
+  )
+  return res
+}
+export function usePatchServerState() {
+  const {currentAccount} = useSession()
+  return useCallback(
+    async (next: AppBskyAgeassuranceDefs.State) => {
+      if (!currentAccount) return
+      const did = currentAccount.did
+      const prev = getServerStateFromCache({did})
+      const merged: AppBskyAgeassuranceGetState.OutputSchema = {
+        metadata: {},
+        ...(prev || {}),
+        state: next,
+      }
+      qc.setQueryData<AppBskyAgeassuranceGetState.OutputSchema>(
+        createServerStateQueryKey({did}),
+        merged,
+      )
+    },
+    [currentAccount],
+  )
+}
+export function useServerStateQuery() {
+  const agent = useAgent()
+  const did = getDidFromAgentSession(agent)
+  const query = useQuery(
+    {
+      enabled: !!did,
+      initialData: () => {
+        if (!did) return
+        return getServerStateFromCache({did})
+      },
+      queryKey: createServerStateQueryKey({did: did!}),
+      async queryFn() {
+        return getServerState({agent})
+      },
+    },
+    qc,
+  )
+  const refetch = useMemo(() => debounce(query.refetch, 100), [query.refetch])
+
+  const isAssured = query.data?.state?.status === 'assured'
+
+  /**
+   * `refetchOnWindowFocus` doesn't seem to want to work for this custom query
+   * client, so we manually subscribe to focus changes.
+   */
+  useEffect(() => {
+    return focusManager.subscribe(() => {
+      // logged out
+      if (!did) return
+
+      const isFocused = focusManager.isFocused()
+
+      if (!isFocused) return
+
+      const config = getConfigFromCache()
+      const geolocation = device.get(['mergedGeolocation'])
+      const isAArequired = Boolean(
+        config &&
+          geolocation &&
+          !!getAgeAssuranceRegionConfig(config, {
+            countryCode: geolocation?.countryCode ?? '',
+            regionCode: geolocation?.regionCode,
+          }),
+      )
+
+      // only refetch when needed
+      if (isAssured || !isAArequired) return
+
+      refetch()
+    })
+  }, [did, refetch, isAssured])
+
+  return query
+}
+
+/*
+ * Other required data
+ */
+
+export type OtherRequiredData = {
+  birthdate: string | undefined
+}
+export function createOtherRequiredDataQueryKey({did}: {did: string}) {
+  return ['otherRequiredData', did]
+}
+export async function getOtherRequiredData({
+  agent,
+}: {
+  agent: AtpAgent
+}): Promise<OtherRequiredData> {
+  if (debug.enabled) return debug.resolve(debug.otherRequiredData)
+  const [prefs] = await Promise.all([agent.getPreferences()])
+  const data: OtherRequiredData = {
+    birthdate: prefs.birthDate ? prefs.birthDate.toISOString() : undefined,
+  }
+  const did = getDidFromAgentSession(agent)
+  if (data && did && birthdateCache.has(did)) {
+    /*
+     * If birthdate was just set, use the local cache value. On subsequent
+     * reloads, the server should have the correct value.
+     */
+    data.birthdate = birthdateCache.get(did)
+  }
+
+  /**
+   * If the user is under the minimum age, and the birthdate is not due to
+   * the legacy bug, snooze further birthdate updates for this user.
+   */
+  if (data.birthdate && !isLegacyBirthdateBug(data.birthdate)) {
+    snoozeBirthdateUpdateAllowedForDid(did!)
+  }
+
+  return data
+}
+export function getOtherRequiredDataFromCache({
+  did,
+}: {
+  did: string
+}): OtherRequiredData | undefined {
+  return qc.getQueryData<OtherRequiredData>(
+    createOtherRequiredDataQueryKey({did}),
+  )
+}
+export async function prefetchOtherRequiredData({agent}: {agent: AtpAgent}) {
+  const did = getDidFromAgentSession(agent)
+
+  if (!did) return
+
+  await cacheHydrationPromise
+  const qk = createOtherRequiredDataQueryKey({did})
+  const cached = getOtherRequiredDataFromCache({did})
+
+  if (cached) {
+    logger.debug(`prefetchOtherRequiredData: using cache`)
+    return
+  }
+
+  try {
+    logger.debug(`prefetchOtherRequiredData: resolving...`)
+    const res = await networkRetry(3, () => getOtherRequiredData({agent}))
+    qc.setQueryData<OtherRequiredData>(qk, res)
+  } catch (e: any) {
+    logger.warn(`prefetchOtherRequiredData: failed`, {
+      safeMessage: e.message,
+    })
+  }
+}
+export function usePatchOtherRequiredData() {
+  const {currentAccount} = useSession()
+  return useCallback(
+    async (next: OtherRequiredData) => {
+      if (!currentAccount) return
+      const did = currentAccount.did
+      const prev = getOtherRequiredDataFromCache({did})
+      const merged: OtherRequiredData = {
+        ...(prev || {}),
+        ...next,
+      }
+      qc.setQueryData<OtherRequiredData>(
+        createOtherRequiredDataQueryKey({did}),
+        merged,
+      )
+    },
+    [currentAccount],
+  )
+}
+export function useOtherRequiredDataQuery() {
+  const agent = useAgent()
+  const did = getDidFromAgentSession(agent)
+  return useQuery(
+    {
+      enabled: !!did,
+      initialData: () => {
+        if (!did) return
+        return getOtherRequiredDataFromCache({did})
+      },
+      queryKey: createOtherRequiredDataQueryKey({did: did!}),
+      async queryFn() {
+        return getOtherRequiredData({agent})
+      },
+    },
+    qc,
+  )
+}
+
+/**
+ * Helper to prefetch all age assurance data.
+ */
+export function prefetchAgeAssuranceData({agent}: {agent: AtpAgent}) {
+  return Promise.allSettled([
+    // config fetch initiated at the top of the App.platform.tsx files, awaited here
+    configPrefetchPromise,
+    prefetchServerState({agent}),
+    prefetchOtherRequiredData({agent}),
+  ])
+}
+
+export function clearAgeAssuranceDataForDid({did}: {did: string}) {
+  logger.debug(`clearAgeAssuranceDataForDid: ${did}`)
+  qc.removeQueries({queryKey: createServerStateQueryKey({did}), exact: true})
+  qc.removeQueries({
+    queryKey: createOtherRequiredDataQueryKey({did}),
+    exact: true,
+  })
+}
+
+export function clearAgeAssuranceData() {
+  logger.debug(`clearAgeAssuranceData`)
+  qc.clear()
+}
+
+/*
+ * Context
+ */
+
+export type AgeAssuranceData = {
+  config: AppBskyAgeassuranceDefs.Config | undefined
+  state: AppBskyAgeassuranceDefs.State | undefined
+  data:
+    | {
+        accountCreatedAt: AppBskyAgeassuranceDefs.StateMetadata['accountCreatedAt']
+        declaredAge: number | undefined
+        birthdate: string | undefined
+      }
+    | undefined
+}
+export const AgeAssuranceDataContext = createContext<AgeAssuranceData>({
+  config: undefined,
+  state: undefined,
+  data: {
+    accountCreatedAt: undefined,
+    declaredAge: undefined,
+    birthdate: undefined,
+  },
+})
+export function useAgeAssuranceDataContext() {
+  return useContext(AgeAssuranceDataContext)
+}
+export function AgeAssuranceDataProvider({
+  children,
+}: {
+  children: React.ReactNode
+}) {
+  const {data: config} = useConfigQuery()
+  const serverState = useServerStateQuery()
+  const {state, metadata} = serverState.data || {}
+  const {data} = useOtherRequiredDataQuery()
+  const ctx = useMemo(
+    () => ({
+      config,
+      state,
+      data: {
+        accountCreatedAt: metadata?.accountCreatedAt,
+        declaredAge: data?.birthdate
+          ? getAge(new Date(data.birthdate))
+          : undefined,
+        birthdate: data?.birthdate,
+      },
+    }),
+    [config, state, data, metadata],
+  )
+  return (
+    <AgeAssuranceDataContext.Provider value={ctx}>
+      {children}
+    </AgeAssuranceDataContext.Provider>
+  )
+}

src/ageAssurance/debug.ts

@@ -0,0 +1,84 @@
+import {
+  ageAssuranceRuleIDs as ids,
+  type AppBskyAgeassuranceDefs,
+  type AppBskyAgeassuranceGetState,
+} from '@atproto/api'
+
+import {type OtherRequiredData} from '#/ageAssurance/data'
+import {IS_DEV} from '#/env'
+import {type Geolocation} from '#/geolocation'
+
+export const enabled = IS_DEV && false
+
+export const geolocation: Geolocation | undefined = enabled
+  ? {
+      countryCode: 'AA',
+      regionCode: undefined,
+    }
+  : undefined
+
+export const deviceGeolocation: Geolocation | undefined = enabled
+  ? {
+      countryCode: 'AA',
+      regionCode: undefined,
+    }
+  : undefined
+
+export const config: AppBskyAgeassuranceDefs.Config = {
+  regions: [
+    {
+      countryCode: 'AA',
+      regionCode: undefined,
+      rules: [
+        {
+          $type: ids.IfAccountNewerThan,
+          date: '2025-12-01T00:00:00Z',
+          access: 'none',
+        },
+        {
+          $type: ids.IfAssuredOverAge,
+          age: 18,
+          access: 'full',
+        },
+        {
+          $type: ids.IfAssuredOverAge,
+          age: 16,
+          access: 'safe',
+        },
+        {
+          $type: ids.IfDeclaredUnderAge,
+          age: 16,
+          access: 'none',
+        },
+        {
+          $type: ids.Default,
+          access: 'safe',
+        },
+      ],
+    },
+  ],
+}
+
+export const otherRequiredData: OtherRequiredData = {
+  birthdate: new Date(2000, 1, 1).toISOString(),
+}
+
+const serverStateEnabled = false
+export const serverState: AppBskyAgeassuranceGetState.OutputSchema | undefined =
+  serverStateEnabled
+    ? {
+        state: {
+          lastInitiatedAt: new Date(2023, 5, 1).toISOString(),
+          status: 'assured',
+          access: 'safe',
+        },
+        metadata: {
+          accountCreatedAt: new Date(2023, 11, 1).toISOString(),
+        },
+      }
+    : undefined
+
+export async function resolve<T>(data: T) {
+  await new Promise(y => setTimeout(y, 2000)) // simulate network
+  return data
+}

src/ageAssurance/index.tsx

@@ -0,0 +1,110 @@
+import {createContext, useCallback, useContext, useEffect, useMemo} from 'react'
+
+import {useGetAndRegisterPushToken} from '#/lib/notifications/notifications'
+import {Provider as RedirectOverlayProvider} from '#/ageAssurance/components/RedirectOverlay'
+import {AgeAssuranceDataProvider} from '#/ageAssurance/data'
+import {useAgeAssuranceDataContext} from '#/ageAssurance/data'
+import {logger} from '#/ageAssurance/logger'
+import {
+  useAgeAssuranceState,
+  useOnAgeAssuranceAccessUpdate,
+} from '#/ageAssurance/state'
+import {
+  AgeAssuranceAccess,
+  type AgeAssuranceState,
+  AgeAssuranceStatus,
+} from '#/ageAssurance/types'
+import {isUserUnderAdultAge} from '#/ageAssurance/util'
+
+export {
+  prefetchConfig as prefetchAgeAssuranceConfig,
+  prefetchAgeAssuranceData,
+  refetchServerState as refetchAgeAssuranceServerState,
+  usePatchOtherRequiredData as usePatchAgeAssuranceOtherRequiredData,
+  usePatchServerState as usePatchAgeAssuranceServerState,
+} from '#/ageAssurance/data'
+export {logger} from '#/ageAssurance/logger'
+
+const AgeAssuranceStateContext = createContext<{
+  Access: typeof AgeAssuranceAccess
+  Status: typeof AgeAssuranceStatus
+  state: AgeAssuranceState
+  flags: {
+    adultContentDisabled: boolean
+    chatDisabled: boolean
+  }
+}>({
+  Access: AgeAssuranceAccess,
+  Status: AgeAssuranceStatus,
+  state: {
+    lastInitiatedAt: undefined,
+    status: AgeAssuranceStatus.Unknown,
+    access: AgeAssuranceAccess.Full,
+  },
+  flags: {
+    adultContentDisabled: false,
+    chatDisabled: false,
+  },
+})
+
+/**
+ * THE MAIN AGE ASSURANCE CONTEXT HOOK
+ *
+ * Prefer this to using any of the lower-level data-provider hooks.
+ */
+export function useAgeAssurance() {
+  return useContext(AgeAssuranceStateContext)
+}
+
+export function Provider({children}: {children: React.ReactNode}) {
+  return (
+    <AgeAssuranceDataProvider>
+      <InnerProvider>
+        <RedirectOverlayProvider>{children}</RedirectOverlayProvider>
+      </InnerProvider>
+    </AgeAssuranceDataProvider>
+  )
+}
+
+function InnerProvider({children}: {children: React.ReactNode}) {
+  const state = useAgeAssuranceState()
+  const {data} = useAgeAssuranceDataContext()
+  const getAndRegisterPushToken = useGetAndRegisterPushToken()
+
+  const handleAccessUpdate = useCallback(
+    (s: AgeAssuranceState) => {
+      getAndRegisterPushToken({
+        isAgeRestricted: s.access !== AgeAssuranceAccess.Full,
+      })
+    },
+    [getAndRegisterPushToken],
+  )
+  useOnAgeAssuranceAccessUpdate(handleAccessUpdate)
+
+  useEffect(() => {
+    logger.debug(`useAgeAssuranceState`, {state})
+  }, [state])
+
+  return (
+    <AgeAssuranceStateContext.Provider
+      value={useMemo(() => {
+        const chatDisabled = state.access !== AgeAssuranceAccess.Full
+        const isUnderage = data?.birthdate
+          ? isUserUnderAdultAge(data.birthdate)
+          : true
+        const adultContentDisabled =
+          state.access !== AgeAssuranceAccess.Full || isUnderage
+        return {
+          Access: AgeAssuranceAccess,
+          Status: AgeAssuranceStatus,
+          state,
+          flags: {
+            adultContentDisabled,
+            chatDisabled,
+          },
+        }
+      }, [state, data])}>
+      {children}
+    </AgeAssuranceStateContext.Provider>
+  )
+}

src/ageAssurance/state.ts

@@ -0,0 +1,100 @@
+import {useEffect, useMemo, useState} from 'react'
+import {computeAgeAssuranceRegionAccess} from '@atproto/api'
+
+import {useSession} from '#/state/session'
+import {useAgeAssuranceDataContext} from '#/ageAssurance/data'
+import {logger} from '#/ageAssurance/logger'
+import {
+  AgeAssuranceAccess,
+  type AgeAssuranceState,
+  AgeAssuranceStatus,
+  parseAccessFromString,
+  parseStatusFromString,
+} from '#/ageAssurance/types'
+import {getAgeAssuranceRegionConfigWithFallback} from '#/ageAssurance/util'
+import {useGeolocation} from '#/geolocation'
+
+export function useAgeAssuranceState(): AgeAssuranceState {
+  const {hasSession} = useSession()
+  const geolocation = useGeolocation()
+  const {config, state, data} = useAgeAssuranceDataContext()
+
+  return useMemo(() => {
+    /**
+     * This is where we control logged-out moderation prefs. It's all
+     * downstream of AA now.
+     */
+    if (!hasSession)
+      return {
+        status: AgeAssuranceStatus.Unknown,
+        access: AgeAssuranceAccess.Safe,
+      }
+
+    // should never happen, but need to guard
+    if (!config) {
+      logger.warn('useAgeAssuranceState: missing config')
+      return {
+        status: AgeAssuranceStatus.Unknown,
+        access: AgeAssuranceAccess.Unknown,
+      }
+    }
+
+    const region = getAgeAssuranceRegionConfigWithFallback(config, geolocation)
+    const isAARequired = region.countryCode !== '*'
+    const isTerminalState =
+      state?.status === 'assured' || state?.status === 'blocked'
+
+    /*
+     * If we are in a terminal state and AA is required for this region,
+     * we can trust the server state completely and avoid recomputing.
+     */
+    if (isTerminalState && isAARequired) {
+      return {
+        lastInitiatedAt: state.lastInitiatedAt,
+        status: parseStatusFromString(state.status),
+        access: parseAccessFromString(state.access),
+      }
+    }
+
+    /*
+     * Otherwise, we need to compute the access based on the latest data. For
+     * accounts with an accurate birthdate, our default fallback rules should
+     * ensure correct access.
+     */
+    const result = computeAgeAssuranceRegionAccess(region, data)
+    const computed = {
+      lastInitiatedAt: state?.lastInitiatedAt,
+      // prefer server state
+      status: state?.status
+        ? parseStatusFromString(state?.status)
+        : AgeAssuranceStatus.Unknown,
+      // prefer server state
+      access: result
+        ? parseAccessFromString(result.access)
+        : AgeAssuranceAccess.Full,
+    }
+    logger.debug('debug useAgeAssuranceState', {
+      region,
+      state,
+      data,
+      computed,
+    })
+    return computed
+  }, [hasSession, geolocation, config, state, data])
+}
+
+export function useOnAgeAssuranceAccessUpdate(
+  cb: (state: AgeAssuranceState) => void,
+) {
+  const state = useAgeAssuranceState()
+  // start with null to ensure callback is called on first render
+  const [prevAccess, setPrevAccess] = useState<AgeAssuranceAccess | null>(null)
+
+  useEffect(() => {
+    if (prevAccess !== state.access) {
+      setPrevAccess(state.access)
+      cb(state)
+      logger.debug(`useOnAgeAssuranceAccessUpdate`, {state})
+    }
+  }, [cb, state, prevAccess])
+}

src/ageAssurance/types.ts

@@ -0,0 +1,53 @@
+import {logger} from '#/ageAssurance/logger'
+
+export enum AgeAssuranceAccess {
+  Unknown = 'unknown',
+  None = 'none',
+  Safe = 'safe',
+  Full = 'full',
+}
+
+export enum AgeAssuranceStatus {
+  Unknown = 'unknown',
+  Pending = 'pending',
+  Assured = 'assured',
+  Blocked = 'blocked',
+}
+
+export type AgeAssuranceState = {
+  lastInitiatedAt?: string
+  status: AgeAssuranceStatus
+  access: AgeAssuranceAccess
+}
+
+export function parseStatusFromString(raw: string) {
+  switch (raw) {
+    case 'unknown':
+      return AgeAssuranceStatus.Unknown
+    case 'pending':
+      return AgeAssuranceStatus.Pending
+    case 'assured':
+      return AgeAssuranceStatus.Assured
+    case 'blocked':
+      return AgeAssuranceStatus.Blocked
+    default:
+      logger.error(`parseStatusFromString: unknown status value: ${raw}`)
+      return AgeAssuranceStatus.Unknown
+  }
+}
+
+export function parseAccessFromString(raw: string) {
+  switch (raw) {
+    case 'unknown':
+      return AgeAssuranceAccess.Unknown
+    case 'none':
+      return AgeAssuranceAccess.None
+    case 'safe':
+      return AgeAssuranceAccess.Safe
+    case 'full':
+      return AgeAssuranceAccess.Full
+    default:
+      logger.error(`parseAccessFromString: unknown access value: ${raw}`)
+      return AgeAssuranceAccess.Full
+  }
+}

src/ageAssurance/useBeginAgeAssurance.ts

@@ -0,0 +1,74 @@
+import {type AppBskyAgeassuranceBegin, AtpAgent} from '@atproto/api'
+import {useMutation} from '@tanstack/react-query'
+
+import {wait} from '#/lib/async/wait'
+import {
+  DEV_ENV_APPVIEW,
+  PUBLIC_APPVIEW,
+  PUBLIC_APPVIEW_DID,
+} from '#/lib/constants'
+import {isNetworkError} from '#/lib/hooks/useCleanError'
+import {logger} from '#/logger'
+import {useAgent} from '#/state/session'
+import {usePatchAgeAssuranceServerState} from '#/ageAssurance'
+import {BLUESKY_PROXY_DID} from '#/env'
+import {useGeolocation} from '#/geolocation'
+
+const IS_DEV_ENV = BLUESKY_PROXY_DID !== PUBLIC_APPVIEW_DID
+const APPVIEW = IS_DEV_ENV ? DEV_ENV_APPVIEW : PUBLIC_APPVIEW
+
+export function useBeginAgeAssurance() {
+  const agent = useAgent()
+  const geolocation = useGeolocation()
+  const patchAgeAssuranceStateResponse = usePatchAgeAssuranceServerState()
+
+  return useMutation({
+    async mutationFn(
+      props: Omit<
+        AppBskyAgeassuranceBegin.InputSchema,
+        'countryCode' | 'regionCode'
+      >,
+    ) {
+      const countryCode = geolocation?.countryCode
+      const regionCode = geolocation?.regionCode
+      if (!countryCode) {
+        throw new Error(`Geolocation not available, cannot init age assurance.`)
+      }
+
+      const {
+        data: {token},
+      } = await agent.com.atproto.server.getServiceAuth({
+        aud: BLUESKY_PROXY_DID,
+        lxm: `app.bsky.ageassurance.begin`,
+      })
+
+      const appView = new AtpAgent({service: APPVIEW})
+      appView.sessionManager.session = {...agent.session!}
+      appView.sessionManager.session.accessJwt = token
+      appView.sessionManager.session.refreshJwt = ''
+
+      /*
+       * 2s wait is good actually. Email sending takes a hot sec and this helps
+       * ensure the email is ready for the user once they open their inbox.
+       */
+      const {data} = await wait(
+        2e3,
+        appView.app.bsky.ageassurance.begin({
+          ...props,
+          countryCode: countryCode.toUpperCase(),
+          regionCode: regionCode ? regionCode.toUpperCase() : undefined,
+        }),
+      )
+
+      // Just keeps this in sync, not necessarily used right now
+      patchAgeAssuranceStateResponse(data)
+    },
+    onError(e) {
+      if (!isNetworkError(e)) {
+        logger.error(`useBeginAgeAssurance failed`, {
+          safeMessage: e,
+        })
+      }
+    },
+  })
+}

src/ageAssurance/useComputeAgeAssuranceRegionAccess.ts

@@ -0,0 +1,29 @@
+import {useCallback} from 'react'
+import {computeAgeAssuranceRegionAccess} from '@atproto/api'
+
+import {useAgeAssuranceDataContext} from '#/ageAssurance/data'
+import {logger} from '#/ageAssurance/logger'
+import {AgeAssuranceAccess, parseAccessFromString} from '#/ageAssurance/types'
+import {getAgeAssuranceRegionConfigWithFallback} from '#/ageAssurance/util'
+import {type Geolocation} from '#/geolocation'
+
+export function useComputeAgeAssuranceRegionAccess() {
+  const {config, data} = useAgeAssuranceDataContext()
+  return useCallback(
+    (geolocation: Geolocation) => {
+      if (!config) {
+        logger.warn('useComputeAgeAssuranceRegionAccess: missing config')
+        return AgeAssuranceAccess.Unknown
+      }
+      const region = getAgeAssuranceRegionConfigWithFallback(
+        config,
+        geolocation,
+      )
+      const result = computeAgeAssuranceRegionAccess(region, data)
+      return result
+        ? parseAccessFromString(result.access)
+        : AgeAssuranceAccess.Full
+    },
+    [config, data],
+  )
+}

src/ageAssurance/util.ts

@@ -0,0 +1,88 @@
+import {useMemo} from 'react'
+import {
+  ageAssuranceRuleIDs as ids,
+  type AppBskyAgeassuranceDefs,
+  getAgeAssuranceRegionConfig,
+} from '@atproto/api'
+
+import {getAge} from '#/lib/strings/time'
+import {useAgeAssuranceDataContext} from '#/ageAssurance/data'
+import {AgeAssuranceAccess} from '#/ageAssurance/types'
+import {type Geolocation, useGeolocation} from '#/geolocation'
+
+const DEFAULT_MIN_AGE = 13
+
+/**
+ * Get age assurance region config based on geolocation, with fallback to
+ * app defaults if no region config is found.
+ *
+ * See {@link getAgeAssuranceRegionConfig} for the generic option, which can
+ * return undefined if the geolocation does not match any AA region.
+ */
+export function getAgeAssuranceRegionConfigWithFallback(
+  config: AppBskyAgeassuranceDefs.Config,
+  geolocation: Geolocation,
+): AppBskyAgeassuranceDefs.ConfigRegion {
+  const region = getAgeAssuranceRegionConfig(config, {
+    countryCode: geolocation.countryCode ?? '',
+    regionCode: geolocation.regionCode,
+  })
+
+  return (
+    region || {
+      countryCode: '*',
+      regionCode: undefined,
+      rules: [
+        {
+          $type: ids.IfDeclaredOverAge,
+          age: DEFAULT_MIN_AGE,
+          access: AgeAssuranceAccess.Full,
+        },
+        {
+          $type: ids.Default,
+          access: AgeAssuranceAccess.None,
+        },
+      ],
+    }
+  )
+}
+
+/**
+ * Hook to get the age assurance region config based on current geolocation.
+ * Does not fall-back to our app defaults. If no config is found, returns
+ * undefined, which indicates no regional age assurance rules apply.
+ */
+export function useAgeAssuranceRegionConfig() {
+  const geolocation = useGeolocation()
+  const {config} = useAgeAssuranceDataContext()
+  return useMemo(() => {
+    if (!config) return
+    // use generic helper, we want to potentially return undefined
+    return getAgeAssuranceRegionConfig(config, {
+      countryCode: geolocation.countryCode ?? '',
+      regionCode: geolocation.regionCode,
+    })
+  }, [config, geolocation])
+}
+
+/**
+ * Some users may have erroneously set their birth date to the current date
+ * if one wasn't set on their account. We previously didn't do validation on
+ * the bday dialog, and it defaulted to the current date. This bug _has_ been
+ * seen in production, so we need to check for it where possible.
+ */
+export function isLegacyBirthdateBug(birthDate: string) {
+  return ['2025', '2024', '2023'].includes((birthDate || '').slice(0, 4))
+}
+
+/**
+ * Returns whether the user is under the minimum age required to use the app.
+ * This applies to all regions.
+ */
+export function isUserUnderMinimumAge(birthDate: string) {
+  return getAge(new Date(birthDate)) < DEFAULT_MIN_AGE
+}
+
+export function isUserUnderAdultAge(birthDate: string) {
+  return getAge(new Date(birthDate)) < 18
+}

src/components/BlockedGeoOverlay.tsx

@@ -1,193 +0,0 @@
-import {useEffect} from 'react'
-import {ScrollView, View} from 'react-native'
-import {useSafeAreaInsets} from 'react-native-safe-area-context'
-import {msg, Trans} from '@lingui/macro'
-import {useLingui} from '@lingui/react'
-
-import {logger} from '#/logger'
-import {isWeb} from '#/platform/detection'
-import {useDeviceGeolocationApi} from '#/state/geolocation'
-import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
-import {Button, ButtonIcon, ButtonText} from '#/components/Button'
-import * as Dialog from '#/components/Dialog'
-import {DeviceLocationRequestDialog} from '#/components/dialogs/DeviceLocationRequestDialog'
-import {Divider} from '#/components/Divider'
-import {Full as Logo, Mark} from '#/components/icons/Logo'
-import {PinLocation_Stroke2_Corner0_Rounded as LocationIcon} from '#/components/icons/PinLocation'
-import {SimpleInlineLinkText as InlineLinkText} from '#/components/Link'
-import {Outlet as PortalOutlet} from '#/components/Portal'
-import * as Toast from '#/components/Toast'
-import {Text} from '#/components/Typography'
-import {BottomSheetOutlet} from '#/../modules/bottom-sheet'
-
-export function BlockedGeoOverlay() {
-  const t = useTheme()
-  const {_} = useLingui()
-  const {gtPhone} = useBreakpoints()
-  const insets = useSafeAreaInsets()
-  const geoDialog = Dialog.useDialogControl()
-  const {setDeviceGeolocation} = useDeviceGeolocationApi()
-
-  useEffect(() => {
-    // just counting overall hits here
-    logger.metric(`blockedGeoOverlay:shown`, {})
-  }, [])
-
-  const textStyles = [a.text_md, a.leading_normal]
-  const links = {
-    blog: {
-      to: `https://bsky.social/about/blog/08-22-2025-mississippi-hb1126`,
-      label: _(msg`Read our blog post`),
-      overridePresentation: false,
-      disableMismatchWarning: true,
-      style: textStyles,
-    },
-  }
-
-  const blocks = [
-    _(msg`Unfortunately, Bluesky is unavailable in Mississippi right now.`),
-    _(
-      msg`A new Mississippi law requires us to implement age verification for all users before they can access Bluesky. We think this law creates challenges that go beyond its child safety goals, and creates significant barriers that limit free speech and disproportionately harm smaller platforms and emerging technologies.`,
-    ),
-    _(
-      msg`As a small team, we cannot justify building the expensive infrastructure this requirement demands while legal challenges to this law are pending.`,
-    ),
-    _(
-      msg`For now, we have made the difficult decision to block access to Bluesky in the state of Mississippi.`,
-    ),
-    <>
-      To learn more, read our{' '}
-      <InlineLinkText {...links.blog}>blog post</InlineLinkText>.
-    </>,
-  ]
-
-  return (
-    <>
-      <ScrollView
-        contentContainerStyle={[
-          a.px_2xl,
-          {
-            paddingTop: isWeb ? a.p_5xl.padding : insets.top + a.p_2xl.padding,
-            paddingBottom: 100,
-          },
-        ]}>
-        <View
-          style={[
-            a.mx_auto,
-            web({
-              maxWidth: 380,
-              paddingTop: gtPhone ? '8vh' : undefined,
-            }),
-          ]}>
-          <View style={[a.align_start]}>
-            <View
-              style={[
-                a.pl_md,
-                a.pr_lg,
-                a.py_sm,
-                a.rounded_full,
-                a.flex_row,
-                a.align_center,
-                a.gap_xs,
-                {
-                  backgroundColor: t.palette.primary_25,
-                },
-              ]}>
-              <Mark fill={t.palette.primary_600} width={14} />
-              <Text
-                style={[
-                  a.font_semi_bold,
-                  {
-                    color: t.palette.primary_600,
-                  },
-                ]}>
-                <Trans>Announcement</Trans>
-              </Text>
-            </View>
-          </View>
-
-          <View style={[a.gap_lg, {paddingTop: 32}]}>
-            {blocks.map((block, index) => (
-              <Text key={index} style={[textStyles]}>
-                {block}
-              </Text>
-            ))}
-          </View>
-
-          {!isWeb && (
-            <>
-              <View style={[a.pt_2xl]}>
-                <Divider />
-              </View>
-
-              <View style={[a.mt_xl, a.align_start]}>
-                <Text style={[a.text_lg, a.font_bold, a.leading_snug, a.pb_xs]}>
-                  <Trans>Not in Mississippi?</Trans>
-                </Text>
-                <Text
-                  style={[
-                    a.text_sm,
-                    a.leading_snug,
-                    t.atoms.text_contrast_medium,
-                    a.pb_md,
-                  ]}>
-                  <Trans>
-                    Confirm your location with GPS. Your location data is not
-                    tracked and does not leave your device.
-                  </Trans>
-                </Text>
-                <Button
-                  label={_(msg`Confirm your location`)}
-                  onPress={() => geoDialog.open()}
-                  size="small"
-                  color="primary_subtle">
-                  <ButtonIcon icon={LocationIcon} />
-                  <ButtonText>
-                    <Trans>Confirm your location</Trans>
-                  </ButtonText>
-                </Button>
-              </View>
-
-              <DeviceLocationRequestDialog
-                control={geoDialog}
-                onLocationAcquired={props => {
-                  if (props.geolocationStatus.isAgeBlockedGeo) {
-                    props.disableDialogAction()
-                    props.setDialogError(
-                      _(
-                        msg`We're sorry, but based on your device's location, you are currently located in a region where we cannot provide access at this time.`,
-                      ),
-                    )
-                  } else {
-                    props.closeDialog(() => {
-                      // set this after close!
-                      setDeviceGeolocation({
-                        countryCode: props.geolocationStatus.countryCode,
-                        regionCode: props.geolocationStatus.regionCode,
-                      })
-                      Toast.show(_(msg`Thanks! You're all set.`), {
-                        type: 'success',
-                      })
-                    })
-                  }
-                }}
-              />
-            </>
-          )}
-
-          <View style={[{paddingTop: 48}]}>
-            <Logo width={120} textFill={t.atoms.text.color} />
-          </View>
-        </View>
-      </ScrollView>
-
-      {/*
-       * While this blocking overlay is up, other dialogs in the shell
-       * are not mounted, so it _should_ be safe to use these here
-       * without fear of other modals showing up.
-       */}
-      <BottomSheetOutlet />
-      <PortalOutlet />
-    </>
-  )
-}

src/components/Button.tsx

@@ -798,13 +798,14 @@ export function ButtonIcon({
        * also so that we can calculate transforms.
        */
       const iconSize = {
-        '2xs': 8,
         xs: 12,
         sm: 16,
         md: 18,
         lg: 24,
         xl: 28,
+        '2xs': 8,
         '2xl': 32,
+        '3xl': 40,
       }[iconSizeShorthand]
 
       /*

src/components/Link.tsx

@@ -421,6 +421,7 @@ export function SimpleInlineLinkText({
   label,
   disableUnderline,
   shouldProxy,
+  onPress: outerOnPress,
   ...rest
 }: Omit<
   InlineLinkProps,
@@ -428,7 +429,6 @@ export function SimpleInlineLinkText({
   | 'action'
   | 'disableMismatchWarning'
   | 'overridePresentation'
-  | 'onPress'
   | 'onLongPress'
   | 'shareOnLongPress'
 > & {
@@ -448,7 +448,9 @@ export function SimpleInlineLinkText({
     href = createProxiedUrl(href)
   }
 
-  const onPress = () => {
+  const onPress = (e: GestureResponderEvent) => {
+    const exitEarlyIfFalse = outerOnPress?.(e)
+    if (exitEarlyIfFalse === false) return
     Linking.openURL(href)
   }
 
@@ -517,7 +519,7 @@ export function WebOnlyInlineLinkText({
 export function createStaticClick(
   onPressHandler: Exclude<BaseLinkProps['onPress'], undefined>,
 ): {
-  to: BaseLinkProps['to']
+  to: string
   onPress: Exclude<BaseLinkProps['onPress'], undefined>
 } {
   return {

src/components/Lists.tsx

@@ -4,6 +4,10 @@ import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
 import {cleanError} from '#/lib/strings/errors'
+import {
+  EmptyState,
+  type EmptyStateButtonProps,
+} from '#/view/com/util/EmptyState'
 import {CenteredView} from '#/view/com/util/Views'
 import {atoms as a, useBreakpoints, useTheme} from '#/alf'
 import {Button, ButtonText} from '#/components/Button'
@@ -129,6 +133,9 @@ let ListMaybePlaceholder = ({
   hideBackButton,
   sideBorders,
   topBorder = false,
+  emptyStateIcon,
+  emptyStateButton,
+  useEmptyState = false,
 }: {
   isLoading: boolean
   noEmpty?: boolean
@@ -143,6 +150,9 @@ let ListMaybePlaceholder = ({
   hideBackButton?: boolean
   sideBorders?: boolean
   topBorder?: boolean
+  emptyStateIcon?: React.ComponentType<any> | React.ReactElement
+  emptyStateButton?: EmptyStateButtonProps
+  useEmptyState?: boolean
 }): React.ReactNode => {
   const t = useTheme()
   const {_} = useLingui()
@@ -180,6 +190,23 @@ let ListMaybePlaceholder = ({
     )
   }
 
+  if (useEmptyState) {
+    return (
+      <View style={[t.atoms.border_contrast_low]}>
+        <EmptyState
+          icon={emptyStateIcon}
+          message={
+            emptyMessage ??
+            (emptyType === 'results'
+              ? _(msg`No results found`)
+              : _(msg`Page not found`))
+          }
+          button={emptyStateButton}
+        />
+      </View>
+    )
+  }
+
   if (!noEmpty) {
     return (
       <Error

src/components/PostControls/RepostButton.tsx

@@ -8,8 +8,8 @@ import {useRequireAuth} from '#/state/session'
 import {atoms as a, useTheme} from '#/alf'
 import {Button, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
-import {CloseQuote_Stroke2_Corner1_Rounded as Quote} from '#/components/icons/Quote'
-import {Repost_Stroke2_Corner3_Rounded as Repost} from '#/components/icons/Repost'
+import {CloseQuote_Stroke2_Corner1_Rounded as QuoteIcon} from '#/components/icons/Quote'
+import {Repost_Stroke2_Corner3_Rounded as RepostIcon} from '#/components/icons/Repost'
 import {useFormatPostStatCount} from '#/components/PostControls/util'
 import {Text} from '#/components/Typography'
 import {
@@ -84,7 +84,7 @@ let RepostButton = ({
                 }),
               )
         }>
-        <PostControlButtonIcon icon={Repost} />
+        <PostControlButtonIcon icon={RepostIcon} />
         {typeof repostCount !== 'undefined' && repostCount > 0 && (
           <PostControlButtonText testID="repostCount">
             {formatPostStatCount(repostCount)}
@@ -156,7 +156,7 @@ let RepostButtonDialogInner = ({
             size="large"
             variant="ghost"
             color="primary">
-            <Repost size="lg" fill={t.palette.primary_500} />
+            <RepostIcon size="lg" fill={t.palette.primary_500} />
             <Text style={[a.font_semi_bold, a.text_xl]}>
               {isReposted ? (
                 <Trans>Remove repost</Trans>
@@ -178,7 +178,7 @@ let RepostButtonDialogInner = ({
             size="large"
             variant="ghost"
             color="primary">
-            <Quote
+            <QuoteIcon
               size="lg"
               fill={
                 embeddingDisabled

src/components/PostControls/ShareMenu/ShareMenuItems.tsx

@@ -11,7 +11,6 @@ import {shareText, shareUrl} from '#/lib/sharing'
 import {toShareUrl} from '#/lib/strings/url-helpers'
 import {logger} from '#/logger'
 import {isIOS} from '#/platform/detection'
-import {useAgeAssurance} from '#/state/ageAssurance/useAgeAssurance'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {useSession} from '#/state/session'
 import * as Toast from '#/view/com/util/Toast'
@@ -24,6 +23,7 @@ import {ChainLink_Stroke2_Corner0_Rounded as ChainLinkIcon} from '#/components/i
 import {Clipboard_Stroke2_Corner2_Rounded as ClipboardIcon} from '#/components/icons/Clipboard'
 import {PaperPlane_Stroke2_Corner0_Rounded as PaperPlaneIcon} from '#/components/icons/PaperPlane'
 import * as Menu from '#/components/Menu'
+import {useAgeAssurance} from '#/ageAssurance'
 import {useDevMode} from '#/storage/hooks/dev-mode'
 import {RecentChats} from './RecentChats'
 import {type ShareMenuItemsProps} from './ShareMenuItems.types'
@@ -37,7 +37,7 @@ let ShareMenuItems = ({
   const navigation = useNavigation<NavigationProp>()
   const sendViaChatControl = useDialogControl()
   const [devModeEnabled] = useDevMode()
-  const {isAgeRestricted} = useAgeAssurance()
+  const aa = useAgeAssurance()
 
   const postUri = post.uri
   const postAuthor = useProfileShadow(post.author)
@@ -91,7 +91,7 @@ let ShareMenuItems = ({
   return (
     <>
       <Menu.Outer>
-        {hasSession && !isAgeRestricted && (
+        {hasSession && aa.state.access === aa.Access.Full && (
           <Menu.Group>
             <Menu.ContainerItem>
               <RecentChats postUri={postUri} />

src/components/PostControls/ShareMenu/ShareMenuItems.web.tsx

@@ -10,7 +10,6 @@ import {shareText, shareUrl} from '#/lib/sharing'
 import {toShareUrl} from '#/lib/strings/url-helpers'
 import {logger} from '#/logger'
 import {isWeb} from '#/platform/detection'
-import {useAgeAssurance} from '#/state/ageAssurance/useAgeAssurance'
 import {useProfileShadow} from '#/state/cache/profile-shadow'
 import {useSession} from '#/state/session'
 import {useBreakpoints} from '#/alf'
@@ -22,6 +21,7 @@ import {Clipboard_Stroke2_Corner2_Rounded as ClipboardIcon} from '#/components/i
 import {CodeBrackets_Stroke2_Corner0_Rounded as CodeBracketsIcon} from '#/components/icons/CodeBrackets'
 import {PaperPlane_Stroke2_Corner0_Rounded as Send} from '#/components/icons/PaperPlane'
 import * as Menu from '#/components/Menu'
+import {useAgeAssurance} from '#/ageAssurance'
 import {useDevMode} from '#/storage/hooks/dev-mode'
 import {type ShareMenuItemsProps} from './ShareMenuItems.types'
 
@@ -38,7 +38,7 @@ let ShareMenuItems = ({
   const embedPostControl = useDialogControl()
   const sendViaChatControl = useDialogControl()
   const [devModeEnabled] = useDevMode()
-  const {isAgeRestricted} = useAgeAssurance()
+  const aa = useAgeAssurance()
 
   const postUri = post.uri
   const postCid = post.cid
@@ -97,7 +97,7 @@ let ShareMenuItems = ({
       <Menu.Outer>
         {!hideInPWI && copyLinkItem}
 
-        {hasSession && !isAgeRestricted && (
+        {hasSession && aa.state.access === aa.Access.Full && (
           <Menu.Item
             testID="postDropdownSendViaDMBtn"
             label={_(msg`Send via direct message`)}

src/components/ProfileCard.tsx

@@ -1,5 +1,11 @@
 import {useMemo} from 'react'
-import {type GestureResponderEvent, View} from 'react-native'
+import {
+  type GestureResponderEvent,
+  type StyleProp,
+  type TextStyle,
+  View,
+  type ViewStyle,
+} from 'react-native'
 import {
   moderateProfile,
   type ModerationOpts,
@@ -283,9 +289,13 @@ function InlineNameAndHandle({
 export function Name({
   profile,
   moderationOpts,
+  style,
+  textStyle,
 }: {
   profile: bsky.profile.AnyProfileView
   moderationOpts: ModerationOpts
+  style?: StyleProp<ViewStyle>
+  textStyle?: StyleProp<TextStyle>
 }) {
   const moderation = moderateProfile(profile, moderationOpts)
   const name = sanitizeDisplayName(
@@ -294,7 +304,7 @@ export function Name({
   )
   const verification = useSimpleVerificationState({profile})
   return (
-    <View style={[a.flex_row, a.align_center, a.max_w_full]}>
+    <View style={[a.flex_row, a.align_center, a.max_w_full, style]}>
       <Text
         emoji
         style={[
@@ -303,6 +313,7 @@ export function Name({
           a.leading_snug,
           a.self_start,
           a.flex_shrink,
+          textStyle,
         ]}
         numberOfLines={1}>
         {name}

src/components/ProgressGuide/FollowDialog.tsx

@@ -8,7 +8,7 @@ import {popularInterests, useInterestsDisplayNames} from '#/lib/interests'
 import {logEvent} from '#/lib/statsig/statsig'
 import {isWeb} from '#/platform/detection'
 import {useModerationOpts} from '#/state/preferences/moderation-opts'
-import {useActorSearchPaginated} from '#/state/queries/actor-search'
+import {useActorSearch} from '#/state/queries/actor-search'
 import {usePreferencesQuery} from '#/state/queries/preferences'
 import {useGetSuggestedUsersQuery} from '#/state/queries/trending/useGetSuggestedUsersQuery'
 import {useSession} from '#/state/session'
@@ -128,7 +128,7 @@ function DialogInner({guide}: {guide: Follow10ProgressGuide}) {
     isFetching: isFetchingSearchResults,
     error: searchResultsError,
     isError: isSearchResultsError,
-  } = useActorSearchPaginated({
+  } = useActorSearch({
     enabled: !!searchText,
     query: searchText,
   })

src/components/StarterPack/Main/PostsList.tsx

@@ -9,6 +9,7 @@ import {PostFeed} from '#/view/com/posts/PostFeed'
 import {EmptyState} from '#/view/com/util/EmptyState'
 import {type ListRef} from '#/view/com/util/List'
 import {type SectionRef} from '#/screens/Profile/Sections/types'
+import {HashtagWide_Stroke1_Corner0_Rounded as HashtagWideIcon} from '#/components/icons/Hashtag'
 
 interface ProfilesListProps {
   listUri: string
@@ -33,7 +34,13 @@ export const PostsList = React.forwardRef<SectionRef, ProfilesListProps>(
     }))
 
     const renderPostsEmpty = useCallback(() => {
-      return <EmptyState icon="hashtag" message={_(msg`This feed is empty.`)} />
+      return (
+        <EmptyState
+          icon={HashtagWideIcon}
+          iconSize="2xl"
+          message={_(msg`This feed is empty.`)}
+        />
+      )
     }, [_])
 
     return (

src/components/StarterPack/ProfileStarterPacks.tsx

@@ -21,6 +21,10 @@ import {parseStarterPackUri} from '#/lib/strings/starter-pack'
 import {logger} from '#/logger'
 import {isIOS} from '#/platform/detection'
 import {useActorStarterPacksQuery} from '#/state/queries/actor-starter-packs'
+import {
+  EmptyState,
+  type EmptyStateButtonProps,
+} from '#/view/com/util/EmptyState'
 import {List, type ListRef} from '#/view/com/util/List'
 import {FeedLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder'
 import {atoms as a, ios, useTheme} from '#/alf'
@@ -47,6 +51,9 @@ interface ProfileFeedgensProps {
   testID?: string
   setScrollViewTag: (tag: number | null) => void
   isMe: boolean
+  emptyStateMessage?: string
+  emptyStateButton?: EmptyStateButtonProps
+  emptyStateIcon?: React.ComponentType<any> | React.ReactElement
 }
 
 function keyExtractor(item: AppBskyGraphDefs.StarterPackView) {
@@ -63,6 +70,9 @@ export function ProfileStarterPacks({
   testID,
   setScrollViewTag,
   isMe,
+  emptyStateMessage,
+  emptyStateButton,
+  emptyStateIcon,
 }: ProfileFeedgensProps) {
   const t = useTheme()
   const bottomBarOffset = useBottomBarOffset(100)
@@ -79,6 +89,28 @@ export function ProfileStarterPacks({
   const {isTabletOrDesktop} = useWebMediaQueries()
 
   const items = data?.pages.flatMap(page => page.starterPacks)
+  const {_} = useLingui()
+
+  const EmptyComponent = useCallback(() => {
+    if (emptyStateMessage || emptyStateButton || emptyStateIcon) {
+      return (
+        <View style={[a.px_lg, a.align_center, a.justify_center]}>
+          <EmptyState
+            icon={emptyStateIcon}
+            iconSize="3xl"
+            message={
+              emptyStateMessage ??
+              _(
+                'Starter packs let you share your favorite feeds and people with your friends.',
+              )
+            }
+            button={emptyStateButton}
+          />
+        </View>
+      )
+    }
+    return <Empty />
+  }, [_, emptyStateMessage, emptyStateButton, emptyStateIcon])
 
   useImperativeHandle(ref, () => ({
     scrollToTop: () => {},
@@ -146,7 +178,7 @@ export function ProfileStarterPacks({
         onEndReached={onEndReached}
         onRefresh={onRefresh}
         ListEmptyComponent={
-          data ? (isMe ? Empty : undefined) : FeedLoadingPlaceholder
+          data ? (isMe ? EmptyComponent : undefined) : FeedLoadingPlaceholder
         }
         ListFooterComponent={
           !!data && items?.length !== 0 && isMe ? CreateAnother : undefined

src/components/activity-notifications/SubscribeProfileButton.tsx

@@ -18,9 +18,11 @@ import {SubscribeProfileDialog} from './SubscribeProfileDialog'
 export function SubscribeProfileButton({
   profile,
   moderationOpts,
+  disableHint,
 }: {
   profile: bsky.profile.AnyProfileView
   moderationOpts: ModerationOpts
+  disableHint?: boolean
 }) {
   const {_} = useLingui()
   const requireEmailVerification = useRequireEmailVerification()
@@ -69,7 +71,7 @@ export function SubscribeProfileButton({
   return (
     <>
       <Tooltip.Outer
-        visible={showTooltip}
+        visible={showTooltip && !disableHint}
         onVisibleChange={onDismissTooltip}
         position="bottom">
         <Tooltip.Target>

src/components/ageAssurance/AgeAssuranceAccountCard.tsx

@@ -4,9 +4,6 @@ import {useLingui} from '@lingui/react'
 
 import {dateDiff, useGetTimeAgo} from '#/lib/hooks/useTimeAgo'
 import {isNative} from '#/platform/detection'
-import {useAgeAssurance} from '#/state/ageAssurance/useAgeAssurance'
-import {logger} from '#/state/ageAssurance/util'
-import {useDeviceGeolocationApi} from '#/state/geolocation'
 import {atoms as a, useBreakpoints, useTheme, type ViewStyleProp} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {AgeAssuranceAppealDialog} from '#/components/ageAssurance/AgeAssuranceAppealDialog'
@@ -23,14 +20,13 @@ import {Divider} from '#/components/Divider'
 import {createStaticClick, InlineLinkText} from '#/components/Link'
 import * as Toast from '#/components/Toast'
 import {Text} from '#/components/Typography'
+import {logger, useAgeAssurance} from '#/ageAssurance'
+import {useComputeAgeAssuranceRegionAccess} from '#/ageAssurance/useComputeAgeAssuranceRegionAccess'
+import {useDeviceGeolocationApi} from '#/geolocation'
 
 export function AgeAssuranceAccountCard({style}: ViewStyleProp & {}) {
-  const {isReady, isAgeRestricted, isDeclaredUnderage} = useAgeAssurance()
-
-  if (!isReady) return null
-  if (isDeclaredUnderage) return null
-  if (!isAgeRestricted) return null
-
+  const aa = useAgeAssurance()
+  if (aa.state.access === aa.Access.Full) return null
   return <Inner style={style} />
 }
 
@@ -43,10 +39,12 @@ function Inner({style}: ViewStyleProp & {}) {
   const getTimeAgo = useGetTimeAgo()
   const {gtPhone} = useBreakpoints()
   const {setDeviceGeolocation} = useDeviceGeolocationApi()
+  const computeAgeAssuranceRegionAccess = useComputeAgeAssuranceRegionAccess()
 
   const copy = useAgeAssuranceCopy()
-  const {status, lastInitiatedAt} = useAgeAssurance()
-  const isBlocked = status === 'blocked'
+  const aa = useAgeAssurance()
+  const {status, lastInitiatedAt} = aa.state
+  const isBlocked = status === aa.Status.Blocked
   const hasInitiated = !!lastInitiatedAt
   const timeAgo = lastInitiatedAt
     ? getTimeAgo(lastInitiatedAt, new Date())
@@ -98,7 +96,10 @@ function Inner({style}: ViewStyleProp & {}) {
                 <DeviceLocationRequestDialog
                   control={locationControl}
                   onLocationAcquired={props => {
-                    if (props.geolocationStatus.isAgeRestrictedGeo) {
+                    const access = computeAgeAssuranceRegionAccess(
+                      props.geolocation,
+                    )
+                    if (access !== aa.Access.Full) {
                       props.disableDialogAction()
                       props.setDialogError(
                         _(
@@ -108,10 +109,7 @@ function Inner({style}: ViewStyleProp & {}) {
                     } else {
                       props.closeDialog(() => {
                         // set this after close!
-                        setDeviceGeolocation({
-                          countryCode: props.geolocationStatus.countryCode,
-                          regionCode: props.geolocationStatus.regionCode,
-                        })
+                        setDeviceGeolocation(props.geolocation)
                         Toast.show(_(msg`Thanks! You're all set.`), {
                           type: 'success',
                         })

src/components/ageAssurance/AgeAssuranceAdmonition.tsx

@@ -2,25 +2,23 @@ import {View} from 'react-native'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
-import {useAgeAssurance} from '#/state/ageAssurance/useAgeAssurance'
-import {logger} from '#/state/ageAssurance/util'
 import {atoms as a, select, useTheme, type ViewStyleProp} from '#/alf'
 import {useDialogControl} from '#/components/ageAssurance/AgeAssuranceInitDialog'
 import type * as Dialog from '#/components/Dialog'
 import {ShieldCheck_Stroke2_Corner0_Rounded as Shield} from '#/components/icons/Shield'
 import {InlineLinkText} from '#/components/Link'
 import {Text} from '#/components/Typography'
+import {useAgeAssurance} from '#/ageAssurance'
+import {logger} from '#/ageAssurance'
 
 export function AgeAssuranceAdmonition({
   children,
   style,
 }: ViewStyleProp & {children: React.ReactNode}) {
   const control = useDialogControl()
-  const {isReady, isDeclaredUnderage, isAgeRestricted} = useAgeAssurance()
+  const aa = useAgeAssurance()
 
-  if (!isReady) return null
-  if (isDeclaredUnderage) return null
-  if (!isAgeRestricted) return null
+  if (aa.state.access === aa.Access.Full) return null
 
   return (
     <Inner style={style} control={control}>

src/components/ageAssurance/AgeAssuranceAppealDialog.tsx

@@ -6,7 +6,6 @@ import {useLingui} from '@lingui/react'
 import {useMutation} from '@tanstack/react-query'
 
 import {BLUESKY_MOD_SERVICE_HEADERS} from '#/lib/constants'
-import {logger} from '#/state/ageAssurance/util'
 import {useAgent, useSession} from '#/state/session'
 import * as Toast from '#/view/com/util/Toast'
 import {atoms as a, useBreakpoints, web} from '#/alf'
@@ -15,6 +14,7 @@ import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
+import {logger} from '#/ageAssurance'
 
 export function AgeAssuranceAppealDialog({
   control,

src/components/ageAssurance/AgeAssuranceDismissibleFeedBanner.tsx

@@ -3,8 +3,6 @@ import {View} from 'react-native'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
-import {useAgeAssurance} from '#/state/ageAssurance/useAgeAssurance'
-import {logger} from '#/state/ageAssurance/util'
 import {Nux, useNux, useSaveNux} from '#/state/queries/nuxs'
 import {atoms as a, select, useTheme} from '#/alf'
 import {useAgeAssuranceCopy} from '#/components/ageAssurance/useAgeAssuranceCopy'
@@ -13,30 +11,22 @@ import {ShieldCheck_Stroke2_Corner0_Rounded as Shield} from '#/components/icons/
 import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times'
 import {Link} from '#/components/Link'
 import {Text} from '#/components/Typography'
+import {useAgeAssurance} from '#/ageAssurance'
+import {logger} from '#/ageAssurance'
 
 export function useInternalState() {
-  const {isReady, isDeclaredUnderage, isAgeRestricted, lastInitiatedAt} =
-    useAgeAssurance()
+  const aa = useAgeAssurance()
   const {nux} = useNux(Nux.AgeAssuranceDismissibleFeedBanner)
   const {mutate: save, variables} = useSaveNux()
   const hidden = !!variables
 
   const visible = useMemo(() => {
-    if (!isReady) return false
-    if (isDeclaredUnderage) return false
-    if (!isAgeRestricted) return false
-    if (lastInitiatedAt) return false
+    if (aa.state.access === aa.Access.Full) return false
+    if (aa.state.lastInitiatedAt) return false
     if (hidden) return false
     if (nux && nux.completed) return false
     return true
-  }, [
-    isReady,
-    isDeclaredUnderage,
-    isAgeRestricted,
-    lastInitiatedAt,
-    hidden,
-    nux,
-  ])
+  }, [aa, hidden, nux])
 
   const close = () => {
     save({

src/components/ageAssurance/AgeAssuranceDismissibleNotice.tsx

@@ -2,28 +2,25 @@ import {View} from 'react-native'
 import {msg} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
-import {useAgeAssurance} from '#/state/ageAssurance/useAgeAssurance'
-import {logger} from '#/state/ageAssurance/util'
 import {Nux, useNux, useSaveNux} from '#/state/queries/nuxs'
 import {atoms as a, type ViewStyleProp} from '#/alf'
 import {AgeAssuranceAdmonition} from '#/components/ageAssurance/AgeAssuranceAdmonition'
 import {useAgeAssuranceCopy} from '#/components/ageAssurance/useAgeAssuranceCopy'
 import {Button, ButtonIcon} from '#/components/Button'
 import {TimesLarge_Stroke2_Corner0_Rounded as X} from '#/components/icons/Times'
+import {useAgeAssurance} from '#/ageAssurance'
+import {logger} from '#/ageAssurance'
 
 export function AgeAssuranceDismissibleNotice({style}: ViewStyleProp & {}) {
   const {_} = useLingui()
-  const {isReady, isDeclaredUnderage, isAgeRestricted, lastInitiatedAt} =
-    useAgeAssurance()
+  const aa = useAgeAssurance()
   const {nux} = useNux(Nux.AgeAssuranceDismissibleNotice)
   const copy = useAgeAssuranceCopy()
   const {mutate: save, variables} = useSaveNux()
   const hidden = !!variables
 
-  if (!isReady) return null
-  if (isDeclaredUnderage) return null
-  if (!isAgeRestricted) return null
-  if (lastInitiatedAt) return null
+  if (aa.state.access === aa.Access.Full) return null
+  if (aa.state.lastInitiatedAt) return null
   if (hidden) return null
   if (nux && nux.completed) return null
 

src/components/ageAssurance/AgeAssuranceInitDialog.tsx

@@ -14,9 +14,6 @@ import {useGetTimeAgo} from '#/lib/hooks/useTimeAgo'
 import {useTLDs} from '#/lib/hooks/useTLDs'
 import {isEmailMaybeInvalid} from '#/lib/strings/email'
 import {type AppLanguage} from '#/locale/languages'
-import {useAgeAssuranceContext} from '#/state/ageAssurance'
-import {useInitAgeAssurance} from '#/state/ageAssurance/useInitAgeAssurance'
-import {logger} from '#/state/ageAssurance/util'
 import {useLanguagePrefs} from '#/state/preferences'
 import {useSession} from '#/state/session'
 import {atoms as a, useTheme, web} from '#/alf'
@@ -30,9 +27,12 @@ import {Divider} from '#/components/Divider'
 import * as TextField from '#/components/forms/TextField'
 import {ShieldCheck_Stroke2_Corner0_Rounded as Shield} from '#/components/icons/Shield'
 import {LanguageSelect} from '#/components/LanguageSelect'
-import {InlineLinkText} from '#/components/Link'
+import {SimpleInlineLinkText} from '#/components/Link'
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
+import {logger} from '#/ageAssurance'
+import {useAgeAssurance} from '#/ageAssurance'
+import {useBeginAgeAssurance} from '#/ageAssurance/useBeginAgeAssurance'
 
 export {useDialogControl} from '#/components/Dialog/context'
 
@@ -69,7 +69,8 @@ function Inner() {
   const langPrefs = useLanguagePrefs()
   const cleanError = useCleanError()
   const {close} = Dialog.useDialogContext()
-  const {lastInitiatedAt} = useAgeAssuranceContext()
+  const aa = useAgeAssurance()
+  const lastInitiatedAt = aa.state.lastInitiatedAt
   const getTimeAgo = useGetTimeAgo()
   const tlds = useTLDs()
   const createSupportLink = useCreateSupportLink()
@@ -88,7 +89,7 @@ function Inner() {
   )
   const [error, setError] = useState<React.ReactNode>(null)
 
-  const {mutateAsync: init, isPending} = useInitAgeAssurance()
+  const {mutateAsync: begin, isPending} = useBeginAgeAssurance()
 
   const runEmailValidation = () => {
     if (validateEmail(email)) {
@@ -127,7 +128,7 @@ function Inner() {
         return
       }
 
-      await init({
+      await begin({
         email,
         language,
       })
@@ -150,11 +151,11 @@ function Inner() {
               <Trans>
                 We're having issues initializing the age assurance process for
                 your account. Please{' '}
-                <InlineLinkText
+                <SimpleInlineLinkText
                   to={createSupportLink({code: SupportCode.AA_DID, email})}
                   label={_(msg`Contact support`)}>
                   contact support
-                </InlineLinkText>{' '}
+                </SimpleInlineLinkText>{' '}
                 for assistance.
               </Trans>
             </>
@@ -195,14 +196,12 @@ function Inner() {
               <Text style={[a.text_sm, a.leading_snug]}>
                 <Trans>
                   We have partnered with{' '}
-                  <InlineLinkText
-                    overridePresentation
-                    disableMismatchWarning
+                  <SimpleInlineLinkText
                     label={_(msg`KWS website`)}
                     to={urls.kwsHome}
                     style={[a.text_sm, a.leading_snug]}>
                     KWS
-                  </InlineLinkText>{' '}
+                  </SimpleInlineLinkText>{' '}
                   to verify that you’re an adult. When you click "Begin" below,
                   KWS will check if you have previously verified your age using
                   this email address for other games/services powered by KWS
@@ -328,24 +327,20 @@ function Inner() {
               style={[a.text_xs, a.leading_snug, t.atoms.text_contrast_medium]}>
               <Trans>
                 By continuing, you agree to the{' '}
-                <InlineLinkText
-                  overridePresentation
-                  disableMismatchWarning
+                <SimpleInlineLinkText
                   label={_(msg`KWS Terms of Use`)}
                   to={urls.kwsTermsOfUse}
                   style={[a.text_xs, a.leading_snug]}>
                   KWS Terms of Use
-                </InlineLinkText>{' '}
+                </SimpleInlineLinkText>{' '}
                 and acknowledge that KWS will store your verified status with
                 your hashed email address in accordance with the{' '}
-                <InlineLinkText
-                  overridePresentation
-                  disableMismatchWarning
+                <SimpleInlineLinkText
                   label={_(msg`KWS Privacy Policy`)}
                   to={urls.kwsPrivacyPolicy}
                   style={[a.text_xs, a.leading_snug]}>
                   KWS Privacy Policy
-                </InlineLinkText>
+                </SimpleInlineLinkText>
                 . This means you won’t need to verify again the next time you
                 use this email for other apps, games, and services powered by
                 KWS technology.

src/components/ageAssurance/AgeAssuranceRedirectDialog.tsx

@@ -6,8 +6,6 @@ import {useLingui} from '@lingui/react'
 import {retry} from '#/lib/async/retry'
 import {wait} from '#/lib/async/wait'
 import {isNative} from '#/platform/detection'
-import {useAgeAssuranceAPIContext} from '#/state/ageAssurance'
-import {logger} from '#/state/ageAssurance/util'
 import {useAgent} from '#/state/session'
 import {atoms as a, useTheme, web} from '#/alf'
 import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
@@ -18,6 +16,8 @@ import {CheckThick_Stroke2_Corner0_Rounded as SuccessIcon} from '#/components/ic
 import {CircleInfo_Stroke2_Corner0_Rounded as ErrorIcon} from '#/components/icons/CircleInfo'
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
+import {refetchAgeAssuranceServerState} from '#/ageAssurance'
+import {logger} from '#/ageAssurance'
 
 export type AgeAssuranceRedirectDialogState = {
   result: 'success' | 'unknown'
@@ -63,7 +63,7 @@ export function AgeAssuranceRedirectDialog() {
   const {_} = useLingui()
   const control = useAgeAssuranceRedirectDialogControl()
 
-  // TODO for testing
+  // for testing
   // Dialog.useAutoOpen(control.control, 3e3)
 
   return (
@@ -88,7 +88,6 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
   const control = useAgeAssuranceRedirectDialogControl()
   const [error, setError] = useState(false)
   const [success, setSuccess] = useState(false)
-  const {refetch: refreshAgeAssuranceState} = useAgeAssuranceAPIContext()
 
   useEffect(() => {
     if (polling.current) return
@@ -106,9 +105,9 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
           if (!agent.session) return
           if (unmounted.current) return
 
-          const {data} = await agent.app.bsky.unspecced.getAgeAssuranceState()
+          const data = await refetchAgeAssuranceServerState({agent})
 
-          if (data.status !== 'assured') {
+          if (data?.state.status !== 'assured') {
             throw new Error(
               `Polling for age assurance state did not receive assured status`,
             )
@@ -124,9 +123,6 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
         if (!agent.session) return
         if (unmounted.current) return
 
-        // success! update state
-        await refreshAgeAssuranceState()
-
         setSuccess(true)
 
         logger.metric('ageAssurance:redirectDialogSuccess', {})
@@ -134,15 +130,13 @@ export function Inner({}: {optimisticState?: AgeAssuranceRedirectDialogState}) {
       .catch(() => {
         if (unmounted.current) return
         setError(true)
-        // try a refetch anyway
-        refreshAgeAssuranceState()
         logger.metric('ageAssurance:redirectDialogFail', {})
       })
 
     return () => {
       unmounted.current = true
     }
-  }, [agent, control, refreshAgeAssuranceState])
+  }, [agent, control])
 
   if (success) {
     return (

src/components/ageAssurance/AgeRestrictedScreen.tsx

@@ -2,8 +2,6 @@ import {View} from 'react-native'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
 
-import {useAgeAssurance} from '#/state/ageAssurance/useAgeAssurance'
-import {logger} from '#/state/ageAssurance/util'
 import {atoms as a} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {AgeAssuranceBadge} from '#/components/ageAssurance/AgeAssuranceBadge'
@@ -13,6 +11,8 @@ import {ChevronRight_Stroke2_Corner0_Rounded as ChevronRight} from '#/components
 import * as Layout from '#/components/Layout'
 import {Link} from '#/components/Link'
 import {Text} from '#/components/Typography'
+import {useAgeAssurance} from '#/ageAssurance'
+import {logger} from '#/ageAssurance'
 
 export function AgeRestrictedScreen({
   children,
@@ -27,22 +27,9 @@ export function AgeRestrictedScreen({
 }) {
   const {_} = useLingui()
   const copy = useAgeAssuranceCopy()
-  const {isReady, isAgeRestricted} = useAgeAssurance()
+  const aa = useAgeAssurance()
 
-  if (!isReady) {
-    return (
-      <Layout.Screen>
-        <Layout.Header.Outer>
-          <Layout.Header.Content>
-            <Layout.Header.TitleText> </Layout.Header.TitleText>
-          </Layout.Header.Content>
-          <Layout.Header.Slot />
-        </Layout.Header.Outer>
-        <Layout.Content />
-      </Layout.Screen>
-    )
-  }
-  if (!isAgeRestricted) return children
+  if (aa.state.access === aa.Access.Full) return children
 
   return (
     <Layout.Screen>

src/components/ageAssurance/useAgeAssuranceCopy.ts

@@ -8,7 +8,7 @@ export function useAgeAssuranceCopy() {
   return useMemo(() => {
     return {
       notice: _(
-        msg`The laws in your location require you to verify you're an adult before accessing certain features on Bluesky, like adult content and direct messaging.`,
+        msg`Due to laws in your region, certain features on Bluesky are currently restricted until you're able to verify you're an adult.`,
       ),
       banner: _(
         msg`The laws in your location require you to verify you're an adult to access certain features. Tap to learn more.`,

src/components/dialogs/BirthDateSettings.tsx

@@ -7,10 +7,13 @@ import {cleanError} from '#/lib/strings/errors'
 import {getAge, getDateAgo} from '#/lib/strings/time'
 import {logger} from '#/logger'
 import {isIOS, isWeb} from '#/platform/detection'
+import {
+  useBirthdateMutation,
+  useIsBirthdateUpdateAllowed,
+} from '#/state/birthdate'
 import {
   usePreferencesQuery,
   type UsePreferencesQueryResponse,
-  usePreferencesSetBirthDateMutation,
 } from '#/state/queries/preferences'
 import {ErrorMessage} from '#/view/com/util/error/ErrorMessage'
 import {atoms as a, useTheme, web} from '#/alf'
@@ -18,7 +21,7 @@ import {Admonition} from '#/components/Admonition'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
 import {DateField} from '#/components/forms/DateField'
-import {InlineLinkText} from '#/components/Link'
+import {SimpleInlineLinkText} from '#/components/Link'
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
 
@@ -30,42 +33,71 @@ export function BirthDateSettingsDialog({
   const t = useTheme()
   const {_} = useLingui()
   const {isLoading, error, data: preferences} = usePreferencesQuery()
+  const isBirthdateUpdateAllowed = useIsBirthdateUpdateAllowed()
 
   return (
     <Dialog.Outer control={control} nativeOptions={{preventExpansion: true}}>
       <Dialog.Handle />
-      <Dialog.ScrollableInner
-        label={_(msg`My Birthday`)}
-        style={web({maxWidth: 400})}>
-        <View style={[a.gap_sm]}>
-          <Text style={[a.text_xl, a.font_semi_bold]}>
-            <Trans>My Birthday</Trans>
-          </Text>
-          <Text style={[a.leading_snug, t.atoms.text_contrast_medium]}>
-            <Trans>
-              This information is private and not shared with other users.
-            </Trans>
-          </Text>
+      {isBirthdateUpdateAllowed ? (
+        <Dialog.ScrollableInner
+          label={_(msg`My Birthdate`)}
+          style={web({maxWidth: 400})}>
+          <View style={[a.gap_md]}>
+            <Text style={[a.text_xl, a.font_semi_bold]}>
+              <Trans>My Birthdate</Trans>
+            </Text>
+            <Text
+              style={[a.text_md, a.leading_snug, t.atoms.text_contrast_medium]}>
+              <Trans>
+                This information is private and not shared with other users.
+              </Trans>
+            </Text>
 
-          {isLoading ? (
-            <Loader size="xl" />
-          ) : error || !preferences ? (
-            <ErrorMessage
-              message={
-                error?.toString() ||
-                _(
-                  msg`We were unable to load your birth date preferences. Please try again.`,
-                )
-              }
-              style={[a.rounded_sm]}
-            />
-          ) : (
-            <BirthdayInner control={control} preferences={preferences} />
-          )}
-        </View>
+            {isLoading ? (
+              <Loader size="xl" />
+            ) : error || !preferences ? (
+              <ErrorMessage
+                message={
+                  error?.toString() ||
+                  _(
+                    msg`We were unable to load your birthdate preferences. Please try again.`,
+                  )
+                }
+                style={[a.rounded_sm]}
+              />
+            ) : (
+              <BirthdayInner control={control} preferences={preferences} />
+            )}
+          </View>
 
-        <Dialog.Close />
-      </Dialog.ScrollableInner>
+          <Dialog.Close />
+        </Dialog.ScrollableInner>
+      ) : (
+        <Dialog.ScrollableInner
+          label={_(msg`You recently changed your birthdate`)}
+          style={web({maxWidth: 400})}>
+          <View style={[a.gap_sm]}>
+            <Text
+              style={[
+                a.text_xl,
+                a.font_semi_bold,
+                a.leading_snug,
+                {paddingRight: 32},
+              ]}>
+              <Trans>You recently changed your birthdate</Trans>
+            </Text>
+            <Text
+              style={[a.text_md, a.leading_snug, t.atoms.text_contrast_medium]}>
+              <Trans>
+                There is a limit to how often you can change your birthdate. You
+                may need to wait a day or two before updating it again.
+              </Trans>
+            </Text>
+          </View>
+
+          <Dialog.Close />
+        </Dialog.ScrollableInner>
+      )}
     </Dialog.Outer>
   )
 }
@@ -86,7 +118,7 @@ function BirthdayInner({
     isError,
     error,
     mutateAsync: setBirthDate,
-  } = usePreferencesSetBirthDateMutation()
+  } = useBirthdateMutation()
   const hasChanged = date !== preferences.birthDate
 
   const age = getAge(new Date(date))
@@ -112,8 +144,8 @@ function BirthdayInner({
           testID="birthdayInput"
           value={date}
           onChangeDate={newDate => setDate(new Date(newDate))}
-          label={_(msg`Birthday`)}
-          accessibilityHint={_(msg`Enter your birth date`)}
+          label={_(msg`Birthdate`)}
+          accessibilityHint={_(msg`Enter your birthdate`)}
         />
       </View>
 
@@ -130,11 +162,11 @@ function BirthdayInner({
         <Admonition type="error">
           <Trans>
             You must be at least 13 years old to use Bluesky. Read our{' '}
-            <InlineLinkText
+            <SimpleInlineLinkText
               to="https://bsky.social/about/support/tos"
               label={_(msg`Terms of Service`)}>
               Terms of Service
-            </InlineLinkText>{' '}
+            </SimpleInlineLinkText>{' '}
             for more information.
           </Trans>
         </Admonition>
@@ -146,7 +178,7 @@ function BirthdayInner({
 
       <View style={isWeb && [a.flex_row, a.justify_end]}>
         <Button
-          label={hasChanged ? _(msg`Save birthday`) : _(msg`Done`)}
+          label={hasChanged ? _(msg`Save birthdate`) : _(msg`Done`)}
           size="large"
           onPress={onSave}
           variant="solid"

src/components/dialogs/DeviceLocationRequestDialog.tsx

@@ -7,12 +7,6 @@ import {wait} from '#/lib/async/wait'
 import {isNetworkError, useCleanError} from '#/lib/hooks/useCleanError'
 import {logger} from '#/logger'
 import {isWeb} from '#/platform/detection'
-import {
-  computeGeolocationStatus,
-  type GeolocationStatus,
-  useGeolocationConfig,
-} from '#/state/geolocation'
-import {useRequestDeviceLocation} from '#/state/geolocation/useRequestDeviceLocation'
 import {atoms as a, useTheme, web} from '#/alf'
 import {Admonition} from '#/components/Admonition'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -20,10 +14,11 @@ import * as Dialog from '#/components/Dialog'
 import {PinLocation_Stroke2_Corner0_Rounded as LocationIcon} from '#/components/icons/PinLocation'
 import {Loader} from '#/components/Loader'
 import {Text} from '#/components/Typography'
+import {type Geolocation, useRequestDeviceGeolocation} from '#/geolocation'
 
 export type Props = {
   onLocationAcquired?: (props: {
-    geolocationStatus: GeolocationStatus
+    geolocation: Geolocation
     setDialogError: (error: string) => void
     disableDialogAction: () => void
     closeDialog: (callback?: () => void) => void
@@ -57,8 +52,7 @@ function DeviceLocationRequestDialogInner({onLocationAcquired}: Props) {
   const t = useTheme()
   const {_} = useLingui()
   const {close} = Dialog.useDialogContext()
-  const requestDeviceLocation = useRequestDeviceLocation()
-  const {config} = useGeolocationConfig()
+  const requestDeviceLocation = useRequestDeviceGeolocation()
   const cleanError = useCleanError()
 
   const [isRequesting, setIsRequesting] = useState(false)
@@ -76,9 +70,8 @@ function DeviceLocationRequestDialogInner({onLocationAcquired}: Props) {
         const location = req.location
 
         if (location && location.countryCode) {
-          const geolocationStatus = computeGeolocationStatus(location, config)
           onLocationAcquired?.({
-            geolocationStatus,
+            geolocation: location,
             setDialogError: setError,
             disableDialogAction: () => setDialogDisabled(true),
             closeDialog: close,

src/components/dialogs/EmailDialog/data/useConfirmEmail.ts

@@ -2,7 +2,10 @@ import {useMutation} from '@tanstack/react-query'
 
 import {useAgent, useSession} from '#/state/session'
 
-export function useConfirmEmail() {
+export function useConfirmEmail({
+  onSuccess,
+  onError,
+}: {onSuccess?: () => void; onError?: () => void} = {}) {
   const agent = useAgent()
   const {currentAccount} = useSession()
 
@@ -13,11 +16,13 @@ export function useConfirmEmail() {
       }
 
       await agent.com.atproto.server.confirmEmail({
-        email: currentAccount.email,
+        email: currentAccount.email.trim(),
         token: token.trim(),
       })
       // will update session state at root of app
       await agent.resumeSession(agent.session!)
     },
+    onSuccess,
+    onError,
   })
 }

src/components/icons/BulletList.tsx

@@ -1,5 +1,13 @@
 import {createSinglePathSVG} from './TEMPLATE'
 
+export const BulletList_Stroke1_Corner0_Rounded = createSinglePathSVG({
+  viewBox: '0 0 47 38',
+  strokeLinecap: 'round',
+  strokeLinejoin: 'round',
+  strokeWidth: 2,
+  path: 'M22.333 31.667H45M22.333 6.333H45m-33.333 0A5.333 5.333 0 1 1 1 6.333a5.333 5.333 0 0 1 10.667 0Zm0 25.334a5.333 5.333 0 1 1-10.667 0 5.333 5.333 0 0 1 10.667 0Z',
+})
+
 export const BulletList_Stroke2_Corner0_Rounded = createSinglePathSVG({
   path: 'M6 6a1 1 0 1 0 0 2 1 1 0 0 0 0-2ZM3 7a3 3 0 1 1 6 0 3 3 0 0 1-6 0Zm9 0a1 1 0 0 1 1-1h7a1 1 0 1 1 0 2h-7a1 1 0 0 1-1-1Zm-6 9a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm-3 1a3 3 0 1 1 6 0 3 3 0 0 1-6 0Zm9 0a1 1 0 0 1 1-1h7a1 1 0 1 1 0 2h-7a1 1 0 0 1-1-1Z',
 })

src/components/icons/CircleAndSquare.tsx

@@ -0,0 +1,7 @@
+import {createSinglePathSVG} from './TEMPLATE'
+
+export const Circle_And_Square_Stroke1_Corner0_Rounded_Filled =
+  createSinglePathSVG({
+    viewBox: '0 0 62 53',
+    path: 'M28.173.231a5.653 5.653 0 0 1 7.018 3.83l2.66 9.046a20 20 0 0 1 3.986-.397c11.026 0 19.964 8.937 19.964 19.962l-.006.516c-.274 10.787-9.104 19.448-19.958 19.448l-.514-.007c-8.332-.21-15.394-5.528-18.178-12.938l-8.805 2.59a5.654 5.654 0 0 1-7.02-3.83L.232 14.34a5.654 5.654 0 0 1 3.83-7.018L28.172.23ZM41.838 14.71c-1.17 0-2.313.111-3.42.325l3.863 13.137a5.653 5.653 0 0 1-3.83 7.019L25.07 39.126c2.593 6.732 9.122 11.51 16.768 11.51 9.92 0 17.963-8.043 17.963-17.964S51.758 14.71 41.837 14.71ZM33.271 4.624a3.653 3.653 0 0 0-4.535-2.474L4.624 9.24a3.653 3.653 0 0 0-2.475 4.535l7.09 24.113a3.654 3.654 0 0 0 4.536 2.475l8.762-2.577a20 20 0 0 1-.662-5.114c0-8.961 5.905-16.544 14.037-19.069l-2.64-8.98Zm3.204 10.899c-7.302 2.28-12.601 9.096-12.601 17.15 0 1.571.203 3.095.582 4.548l13.431-3.948a3.654 3.654 0 0 0 2.474-4.536l-3.886-13.214Z',
+  })

src/components/icons/EditBig.tsx

@@ -1,5 +1,10 @@
 import {createSinglePathSVG} from './TEMPLATE'
 
+export const EditBig_Stroke1_Corner0_Rounded = createSinglePathSVG({
+  viewBox: '0 0 48 48',
+  path: 'M19.667 4.458a1 1 0 1 0 0-2v2Zm25 23a1 1 0 0 0-2 0h2ZM3.912 45.543l.454-.891-.454.89Zm-2.33-2.33.89-.455h0l-.89.454Zm39.173 2.33-.454-.891h0l.454.89Zm2.33-2.33-.89-.455.89.454ZM1.581 6.37l-.89-.454h0l.89.454Zm2.331-2.331-.454-.891.454.89ZM14.333 32.79h-1a1 1 0 0 0 1 1v-1Zm.781-8.781.707.707-.707-.707ZM36.562 2.562l-.707-.707v0l.707.707Zm7.543 0-.707.707v0l.707-.707Zm.457.458.707-.707v0l-.707.707Zm0 7.542.707.707-.707-.707ZM23.114 32.01l.707.707-.707-.707Zm12.02 14.114v-1h-25.6v2h25.6v-1ZM1 37.591h1v-25.6H0v25.6h1ZM9.533 3.458v1h10.134v-2H9.533v1Zm34.134 24h-1V37.59h2V27.457h-1ZM9.533 46.124v-1c-1.51 0-2.582 0-3.421-.07-.828-.067-1.34-.195-1.746-.402l-.454.89-.454.892c.735.374 1.54.537 2.491.614.94.077 2.107.076 3.584.076v-1ZM1 37.591H0c0 1.477 0 2.645.076 3.584.078.951.24 1.756.614 2.491l.891-.454.891-.454c-.207-.406-.335-.918-.403-1.746C2.001 40.173 2 39.101 2 37.591H1Zm2.912 7.952.454-.891a4.33 4.33 0 0 1-1.894-1.894l-.89.454-.892.454a6.33 6.33 0 0 0 2.768 2.768l.454-.891Zm31.221.581v1c1.477 0 2.645.001 3.585-.076.95-.078 1.756-.24 2.49-.614l-.453-.891-.454-.891c-.406.207-.919.335-1.746.403-.84.068-1.912.07-3.422.07v1Zm8.534-8.533h-1c0 1.51-.001 2.582-.07 3.421-.067.828-.196 1.34-.403 1.746l.891.454.891.454c.375-.735.537-1.54.615-2.49.076-.94.076-2.108.076-3.585h-1Zm-2.912 7.952.454.89a6.33 6.33 0 0 0 2.767-2.767l-.89-.454-.892-.454a4.33 4.33 0 0 1-1.893 1.894l.454.89ZM1 11.99h1c0-1.51 0-2.582.07-3.422.067-.827.195-1.34.402-1.745l-.89-.454-.892-.454c-.374.734-.536 1.54-.614 2.49C-.001 9.345 0 10.513 0 11.99h1Zm8.533-8.533v-1c-1.477 0-2.645-.001-3.584.076-.951.077-1.756.24-2.49.614l.453.89.454.892c.406-.207.918-.336 1.746-.403.839-.069 1.911-.07 3.421-.07v-1ZM1.581 6.37l.891.454A4.33 4.33 0 0 1 4.366 4.93l-.454-.891-.454-.891A6.33 6.33 0 0 0 .69 5.916l.891.454Zm12.752 19.525h-1v6.896h2v-6.896h-1Zm0 6.896v1h6.896v-2h-6.896v1Zm.781-8.781.707.707L37.27 3.269l-.707-.707-.707-.707-21.448 21.448.707.707Zm28.99-21.448-.706.707.457.458.707-.707.707-.707-.457-.458-.707.707Zm.458 8-.707-.707-21.448 21.448.707.707.707.707L45.27 11.269l-.707-.707Zm0-7.542-.707.707a4.333 4.333 0 0 1 0 6.128l.707.707.707.707a6.333 6.333 0 0 0 0-8.956l-.707.707Zm-8-.458.707.707a4.333 4.333 0 0 1 6.129 0l.707-.707.707-.707a6.333 6.333 0 0 0-8.957 0l.707.707ZM21.23 32.791v1c.972 0 1.905-.386 2.593-1.074l-.708-.707-.707-.707a1.67 1.67 0 0 1-1.178.488v1Zm-6.896-6.896h1c0-.442.176-.866.489-1.178l-.708-.707-.707-.707a3.67 3.67 0 0 0-1.074 2.592h1Z',
+})
+
 export const EditBig_Stroke2_Corner0_Rounded = createSinglePathSVG({
   path: 'M17.293 2.293a1 1 0 0 1 1.414 0l3 3a1 1 0 0 1 0 1.414l-9 9A1 1 0 0 1 12 16H9a1 1 0 0 1-1-1v-3a1 1 0 0 1 .293-.707l9-9ZM10 12.414V14h1.586l8-8L18 4.414l-8 8ZM3 4a1 1 0 0 1 1-1h7a1 1 0 1 1 0 2H5v14h14v-6a1 1 0 1 1 2 0v7a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V4Z',
 })

src/components/icons/Hashtag.tsx

@@ -1,5 +1,13 @@
 import {createSinglePathSVG} from './TEMPLATE'
 
+export const HashtagWide_Stroke1_Corner0_Rounded = createSinglePathSVG({
+  viewBox: '0 0 46 46',
+  strokeLinecap: 'round',
+  strokeLinejoin: 'round',
+  strokeWidth: 2,
+  path: 'M14.333 1 9 45M37 1l-5.333 44M1 11.667h44m0 22.666H1',
+})
+
 export const Hashtag_Stroke2_Corner0_Rounded = createSinglePathSVG({
   path: 'M9.124 3.008a1 1 0 0 1 .868 1.116L9.632 7h5.985l.39-3.124a1 1 0 0 1 1.985.248L17.632 7H20a1 1 0 1 1 0 2h-2.617l-.75 6H20a1 1 0 1 1 0 2h-3.617l-.39 3.124a1 1 0 1 1-1.985-.248l.36-2.876H8.382l-.39 3.124a1 1 0 1 1-1.985-.248L6.368 17H4a1 1 0 1 1 0-2h2.617l.75-6H4a1 1 0 1 1 0-2h3.617l.39-3.124a1 1 0 0 1 1.117-.868ZM9.383 9l-.75 6h5.984l.75-6H9.383Z',
 })

src/components/icons/Heart2.tsx

@@ -1,5 +1,12 @@
 import {createSinglePathSVG} from './TEMPLATE'
 
+export const Heart2_Stroke1_Corner0_Rounded = createSinglePathSVG({
+  viewBox: '0 0 51 46',
+  strokeLinejoin: 'round',
+  strokeWidth: 2,
+  path: 'M49 17c0 15.333-22 26.667-24 26.667S1 32.333 1 17C1 6.333 7.667 1 14.333 1S25 5 25 5s4-4 10.667-4S49 6.333 49 17Z',
+})
+
 export const Heart2_Stroke2_Corner0_Rounded = createSinglePathSVG({
   path: 'M16.734 5.091c-1.238-.276-2.708.047-4.022 1.38a1 1 0 0 1-1.424 0C9.974 5.137 8.504 4.814 7.266 5.09c-1.263.282-2.379 1.206-2.92 2.556C3.33 10.18 4.252 14.84 12 19.348c7.747-4.508 8.67-9.168 7.654-11.7-.541-1.351-1.657-2.275-2.92-2.557Zm4.777 1.812c1.604 4-.494 9.69-9.022 14.47a1 1 0 0 1-.978 0C2.983 16.592.885 10.902 2.49 6.902c.779-1.942 2.414-3.334 4.342-3.764 1.697-.378 3.552.003 5.169 1.286 1.617-1.283 3.472-1.664 5.17-1.286 1.927.43 3.562 1.822 4.34 3.764Z',
 })

src/components/icons/Image.tsx

@@ -1,5 +1,12 @@
 import {createSinglePathSVG} from './TEMPLATE'
 
+export const Image_Stroke1_Corner0_Rounded = createSinglePathSVG({
+  viewBox: '0 0 46 46',
+  strokeLinecap: 'round',
+  strokeWidth: 1.5,
+  path: 'm1.417 28.645 7.586-5.676a5.33 5.33 0 0 1 6.867.809c3.98 4.286 8.594 8.182 14.88 8.182 5.794 0 9.633-2.147 13.333-5.847m-38 18.637h33.334a5.333 5.333 0 0 0 5.333-5.333V6.083A5.333 5.333 0 0 0 39.417.75H6.083A5.333 5.333 0 0 0 .75 6.083v33.334a5.333 5.333 0 0 0 5.333 5.333ZM36.75 14.083a5.333 5.333 0 1 1-10.667 0 5.333 5.333 0 0 1 10.667 0Z',
+})
+
 export const Image_Stroke2_Corner0_Rounded = createSinglePathSVG({
   path: 'M3 4a1 1 0 0 1 1-1h16a1 1 0 0 1 1 1v16a1 1 0 0 1-1 1H4a1 1 0 0 1-1-1V4Zm2 1v7.213l1.246-.932.044-.03a3 3 0 0 1 3.863.454c1.468 1.58 2.941 2.749 4.847 2.749 1.703 0 2.855-.555 4-1.618V5H5Zm14 10.357c-1.112.697-2.386 1.097-4 1.097-2.81 0-4.796-1.755-6.313-3.388a1 1 0 0 0-1.269-.164L5 14.712V19h14v-3.643ZM15 8a1 1 0 1 0 0 2 1 1 0 0 0 0-2Zm-3 1a3 3 0 1 1 6 0 3 3 0 0 1-6 0Z',
 })

src/components/icons/Message.tsx

@@ -1,5 +1,13 @@
 import {createSinglePathSVG} from './TEMPLATE'
 
+export const Message_Stroke1_Corner0_Rounded_Filled = createSinglePathSVG({
+  viewBox: '0 0 51 51',
+  strokeWidth: 2,
+  strokeLinecap: 'square',
+  strokeLinejoin: 'round',
+  path: 'M9 1h32a8 8 0 0 1 8 8v21.333a8 8 0 0 1-8 8H27.667L14.333 49V38.333H9a8 8 0 0 1-8-8V9a8 8 0 0 1 8-8Z',
+})
+
 export const Message_Stroke2_Corner0_Rounded_Filled = createSinglePathSVG({
   path: 'M2 12C2 6.477 6.477 2 12 2s10 4.477 10 10-4.477 10-10 10a9.968 9.968 0 0 1-4.136-.893l-4.68.876a1 1 0 0 1-1.164-1.184l.931-4.537A9.965 9.965 0 0 1 2 12Zm4.25 0a1.25 1.25 0 1 0 2.5 0 1.25 1.25 0 0 0-2.5 0Zm4.5 0a1.25 1.25 0 1 0 2.5 0 1.25 1.25 0 0 0-2.5 0Zm5.75 1.25a1.25 1.25 0 1 1 0-2.5 1.25 1.25 0 0 1 0 2.5Z',
 })

src/components/icons/PeopleRemove2.tsx

@@ -1,5 +1,13 @@
 import {createSinglePathSVG} from './TEMPLATE'
 
+export const PeopleRemove2_Stroke1_Corner0_Rounded = createSinglePathSVG({
+  viewBox: '-15 0 65 64',
+  strokeWidth: 2,
+  strokeLinecap: 'round',
+  strokeLinejoin: 'round',
+  path: 'M20.603 46.333H3.532c-1.572 0-2.816-1.358-2.472-2.891 2.033-9.046 9.421-15.775 19.543-15.775q1.367 0 2.666.16m18.667 7.84L36.603 41m0 0-5.334 5.333M36.603 41l-5.334-5.333M36.603 41l5.333 5.333m-12-36A9.333 9.333 0 1 1 20.603 1a9.333 9.333 0 0 1 9.333 9.333Z',
+})
+
 export const PeopleRemove2_Stroke2_Corner0_Rounded = createSinglePathSVG({
   path: 'M10 4a2.5 2.5 0 1 0 0 5 2.5 2.5 0 0 0 0-5ZM5.5 6.5a4.5 4.5 0 1 1 9 0 4.5 4.5 0 0 1-9 0ZM16 11a1 1 0 0 1 1-1h5a1 1 0 1 1 0 2h-5a1 1 0 0 1-1-1ZM3.678 19h12.644c-.71-2.909-3.092-5-6.322-5s-5.613 2.091-6.322 5Zm-2.174.906C1.917 15.521 5.242 12 10 12c4.758 0 8.083 3.521 8.496 7.906A1 1 0 0 1 17.5 21h-15a1 1 0 0 1-.996-1.094Z',
 })

src/components/icons/TEMPLATE.tsx

@@ -28,7 +28,50 @@ export const IconTemplate_Stroke2_Corner0_Rounded = React.forwardRef(
   },
 )
 
-export function createSinglePathSVG({path}: {path: string}) {
+export function createSinglePathSVG({
+  path,
+  viewBox,
+  strokeWidth = 0,
+  strokeLinecap = 'butt',
+  strokeLinejoin = 'miter',
+}: {
+  path: string
+  viewBox?: string
+  strokeWidth?: number
+  strokeLinecap?: 'butt' | 'round' | 'square'
+  strokeLinejoin?: 'miter' | 'round' | 'bevel'
+}) {
+  return React.forwardRef<Svg, Props>(function LogoImpl(props, ref) {
+    const {fill, size, style, gradient, ...rest} = useCommonSVGProps(props)
+
+    const hasStroke = strokeWidth > 0
+
+    return (
+      <Svg
+        fill="none"
+        {...rest}
+        ref={ref}
+        viewBox={viewBox || '0 0 24 24'}
+        width={size}
+        height={size}
+        style={[style]}>
+        {gradient}
+        <Path
+          fill={hasStroke ? 'none' : fill}
+          stroke={hasStroke ? fill : 'none'}
+          strokeWidth={strokeWidth}
+          strokeLinecap={strokeLinecap}
+          strokeLinejoin={strokeLinejoin}
+          fillRule="evenodd"
+          clipRule="evenodd"
+          d={path}
+        />
+      </Svg>
+    )
+  })
+}
+
+export function createSinglePathSVG2({path}: {path: string}) {
   return React.forwardRef<Svg, Props>(function LogoImpl(props, ref) {
     const {fill, size, style, gradient, ...rest} = useCommonSVGProps(props)
 

src/components/icons/VideoClip.tsx

@@ -1,5 +1,13 @@
 import {createSinglePathSVG} from './TEMPLATE'
 
+export const VideoClip_Stroke1_Corner0_Rounded = createSinglePathSVG({
+  viewBox: '0 0 46 46',
+  strokeLinecap: 'square',
+  strokeLinejoin: 'round',
+  strokeWidth: 2,
+  path: 'M1 23h10.667M1 23V12m0 11v11m10.667-11h22.666m-22.666 0v11m0-11V12m22.666 11H45m-10.667 0v12.222m0-12.222V12M45 23V12m0 11v12.222M34.333 45h5.334A5.333 5.333 0 0 0 45 39.667v-4.445M34.333 45v-9.778m0 9.778H11.667M34.333 1h5.334A5.333 5.333 0 0 1 45 6.333V12M34.333 1v11m0-11H11.667m22.666 11H45M34.333 35.222H45M11.667 45H6.333A5.333 5.333 0 0 1 1 39.667V34m10.667 11V34m0-33H6.333A5.333 5.333 0 0 0 1 6.333V12M11.667 1v11M1 12h10.667M1 34h10.667',
+})
+
 export const VideoClip_Stroke2_Corner0_Rounded = createSinglePathSVG({
   path: 'M3 4a1 1 0 011-1h16a1 1 0 011 1v16a1 1 0 01-1 1H4a1 1 0 01-1-1V4Zm2 1v2h2V5H5Zm4 0v6h6V5H9Zm8 0v2h2V5h-2Zm2 4h-2v2h2V9Zm0 4h-2v2h2V13Zm0 4h-2V19h2ZM15 19v-6H9v6h6Zm-8 0v-2H5v2h2Zm-2-4h2v-2H5v2Zm0-4h2V9H5v2Z',
 })

src/components/icons/common.tsx

@@ -20,6 +20,7 @@ export const sizes = {
   lg: 24,
   xl: 28,
   '2xl': 32,
+  '3xl': 48,
 } as const
 
 export function useCommonSVGProps(props: Props) {

src/components/intents/VerifyEmailIntentDialog.tsx

@@ -1,4 +1,4 @@
-import React from 'react'
+import {useEffect, useState} from 'react'
 import {View} from 'react-native'
 import {msg, Trans} from '@lingui/macro'
 import {useLingui} from '@lingui/react'
@@ -9,6 +9,7 @@ import {atoms as a, useBreakpoints, useTheme} from '#/alf'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
 import * as Dialog from '#/components/Dialog'
 import {type DialogControlProps} from '#/components/Dialog'
+import {useConfirmEmail} from '#/components/dialogs/EmailDialog/data/useConfirmEmail'
 import {Divider} from '#/components/Divider'
 import {ArrowRotateCounterClockwise_Stroke2_Corner0_Rounded as Resend} from '#/components/icons/ArrowRotateCounterClockwise'
 import {useIntentDialogs} from '#/components/intents/IntentDialogs'
@@ -31,29 +32,22 @@ function Inner({}: {control: DialogControlProps}) {
   const {gtMobile} = useBreakpoints()
   const {_} = useLingui()
   const {verifyEmailState: state} = useIntentDialogs()
-  const [status, setStatus] = React.useState<
+  const [status, setStatus] = useState<
     'loading' | 'success' | 'failure' | 'resent'
   >('loading')
-  const [sending, setSending] = React.useState(false)
+  const [sending, setSending] = useState(false)
   const agent = useAgent()
   const {currentAccount} = useSession()
+  const {mutate: confirmEmail} = useConfirmEmail({
+    onSuccess: () => setStatus('success'),
+    onError: () => setStatus('failure'),
+  })
 
-  React.useEffect(() => {
-    ;(async () => {
-      if (!state?.code) {
-        return
-      }
-      try {
-        await agent.com.atproto.server.confirmEmail({
-          email: (currentAccount?.email || '').trim(),
-          token: state.code.trim(),
-        })
-        setStatus('success')
-      } catch (e) {
-        setStatus('failure')
-      }
-    })()
-  }, [agent.com.atproto.server, currentAccount?.email, state?.code])
+  useEffect(() => {
+    if (state?.code) {
+      confirmEmail({token: state.code})
+    }
+  }, [state?.code, confirmEmail])
 
   const onPressResendEmail = async () => {
     setSending(true)
@@ -121,11 +115,10 @@ function Inner({}: {control: DialogControlProps}) {
             <Button
               label={_(msg`Resend Verification Email`)}
               onPress={onPressResendEmail}
-              variant="solid"
               color="secondary_inverted"
               size="large"
               disabled={sending}>
-              <ButtonIcon icon={sending ? Loader : Resend} position="left" />
+              <ButtonIcon icon={sending ? Loader : Resend} />
               <ButtonText>
                 <Trans>Resend Email</Trans>
               </ButtonText>

src/env/common.ts

@@ -100,14 +100,11 @@ export const GCP_PROJECT_ID: number =
     : Number(process.env.EXPO_PUBLIC_GCP_PROJECT_ID)
 
 /**
- * URL for the bapp-config web worker _development_ environment. Can be a
+ * URLs for the app config web worker. Can be a
  * locally running server, see `env.example` for more.
  */
 export const BAPP_CONFIG_DEV_URL = process.env.BAPP_CONFIG_DEV_URL
-
-/**
- * Dev environment passthrough value for bapp-config web worker. Allows local
- * dev access to the web worker running in `development` mode.
- */
-export const BAPP_CONFIG_DEV_BYPASS_SECRET: string =
-  process.env.BAPP_CONFIG_DEV_BYPASS_SECRET
+export const BAPP_CONFIG_PROD_URL = `https://ip.bsky.app`
+export const BAPP_CONFIG_URL = IS_DEV
+  ? (BAPP_CONFIG_DEV_URL ?? BAPP_CONFIG_PROD_URL)
+  : BAPP_CONFIG_PROD_URL

src/geolocation/const.ts

@@ -0,0 +1,12 @@
+import {BAPP_CONFIG_URL} from '#/env'
+import {type Geolocation} from '#/geolocation/types'
+
+export const GEOLOCATION_SERVICE_URL = `${BAPP_CONFIG_URL}/geolocation`
+
+/**
+ * Default geolocation config.
+ */
+export const FALLBACK_GEOLOCATION_SERVICE_RESPONSE: Geolocation = {
+  countryCode: undefined,
+  regionCode: undefined,
+}

src/geolocation/debug.ts

@@ -0,0 +1,19 @@
+import * as aaDebug from '#/ageAssurance/debug'
+import {IS_DEV} from '#/env'
+import {type Geolocation} from '#/geolocation/types'
+
+const localEnabled = false
+export const enabled = IS_DEV && (localEnabled || aaDebug.geolocation)
+export const geolocation: Geolocation = aaDebug.geolocation ?? {
+  countryCode: 'AU',
+  regionCode: undefined,
+}
+export const deviceGeolocation: Geolocation = aaDebug.deviceGeolocation ?? {
+  countryCode: 'AU',
+  regionCode: undefined,
+}
+
+export async function resolve<T>(data: T) {
+  await new Promise(y => setTimeout(y, 2000)) // simulate network
+  return data
+}

src/geolocation/device.ts

@@ -0,0 +1,144 @@
+import {useCallback, useEffect, useRef} from 'react'
+import * as Location from 'expo-location'
+import {createPermissionHook} from 'expo-modules-core'
+
+import {isNative} from '#/platform/detection'
+import * as debug from '#/geolocation/debug'
+import {logger} from '#/geolocation/logger'
+import {type Geolocation} from '#/geolocation/types'
+import {normalizeDeviceLocation} from '#/geolocation/util'
+import {device} from '#/storage'
+
+/**
+ * Location.useForegroundPermissions on web just errors if the
+ * navigator.permissions API is not available. We need to catch and ignore it,
+ * since it's effectively denied.
+ *
+ * @see https://github.com/expo/expo/blob/72f1562ed9cce5ff6dfe04aa415b71632a3d4b87/packages/expo-location/src/Location.ts#L290-L293
+ */
+const useForegroundPermissions = createPermissionHook({
+  getMethod: () =>
+    Location.getForegroundPermissionsAsync().catch(error => {
+      logger.debug(
+        'useForegroundPermission: error getting location permissions',
+        {safeMessage: error},
+      )
+      return {
+        status: Location.PermissionStatus.DENIED,
+        granted: false,
+        canAskAgain: false,
+        expires: 0,
+      }
+    }),
+  requestMethod: () =>
+    Location.requestForegroundPermissionsAsync().catch(error => {
+      logger.debug(
+        'useForegroundPermission: error requesting location permissions',
+        {safeMessage: error},
+      )
+      return {
+        status: Location.PermissionStatus.DENIED,
+        granted: false,
+        canAskAgain: false,
+        expires: 0,
+      }
+    }),
+})
+
+export async function getDeviceGeolocation(): Promise<Geolocation> {
+  if (debug.enabled) return debug.resolve(debug.deviceGeolocation)
+
+  try {
+    const geocode = await Location.getCurrentPositionAsync()
+    const locations = await Location.reverseGeocodeAsync({
+      latitude: geocode.coords.latitude,
+      longitude: geocode.coords.longitude,
+    })
+    const location = locations.at(0)
+    const normalized = location ? normalizeDeviceLocation(location) : undefined
+    return {
+      countryCode: normalized?.countryCode ?? undefined,
+      regionCode: normalized?.regionCode ?? undefined,
+    }
+  } catch (e) {
+    logger.error('getDeviceGeolocation: failed', {safeMessage: e})
+    return {
+      countryCode: undefined,
+      regionCode: undefined,
+    }
+  }
+}
+
+export function useRequestDeviceGeolocation(): () => Promise<
+  | {
+      granted: true
+      location: Geolocation | undefined
+    }
+  | {
+      granted: false
+    }
+> {
+  return useCallback(async () => {
+    const status = await Location.requestForegroundPermissionsAsync()
+    if (status.granted) {
+      return {
+        granted: true,
+        location: await getDeviceGeolocation(),
+      }
+    } else {
+      return {
+        granted: false,
+      }
+    }
+  }, [])
+}
+
+/**
+ * Hook to get and sync the device geolocation from the device GPS and store it
+ * using device storage. If permissions are not granted, it will clear any cached
+ * storage value.
+ */
+export function useSyncDeviceGeolocationOnStartup(
+  sync: (location: Geolocation | undefined) => void,
+) {
+  const synced = useRef(false)
+  const [status] = useForegroundPermissions()
+  useEffect(() => {
+    if (!isNative) return
+
+    async function get() {
+      // no need to set this more than once per session
+      if (synced.current) return
+      logger.debug('useSyncDeviceGeolocationOnStartup: checking perms')
+      if (status?.granted) {
+        const location = await getDeviceGeolocation()
+        if (location) {
+          logger.debug('useSyncDeviceGeolocationOnStartup: got location')
+          sync(location)
+          synced.current = true
+        }
+      } else {
+        const hasCachedValue = device.get(['deviceGeolocation']) !== undefined
+        /**
+         * If we have a cached value, but user has revoked permissions,
+         * quietly (will take effect lazily) clear this out.
+         */
+        if (hasCachedValue) {
+          logger.debug(
+            'useSyncDeviceGeolocationOnStartup: clearing cached location, perms revoked',
+          )
+          device.set(['deviceGeolocation'], undefined)
+        }
+      }
+    }
+
+    get().catch(e => {
+      logger.error(
+        'useSyncDeviceGeolocationOnStartup: failed to get location',
+        {
+          safeMessage: e,
+        },
+      )
+    })
+  }, [status, sync])
+}

src/geolocation/index.tsx

@@ -0,0 +1,65 @@
+import {
+  createContext,
+  type ReactNode,
+  useContext,
+  useEffect,
+  useMemo,
+} from 'react'
+
+import {useSyncDeviceGeolocationOnStartup} from '#/geolocation/device'
+import {useGeolocationServiceResponse} from '#/geolocation/service'
+import {type Geolocation} from '#/geolocation/types'
+import {mergeGeolocations} from '#/geolocation/util'
+import {device, useStorage} from '#/storage'
+
+export {useRequestDeviceGeolocation} from '#/geolocation/device'
+export {resolve} from '#/geolocation/service'
+export * from '#/geolocation/types'
+
+const GeolocationContext = createContext<Geolocation>({
+  countryCode: undefined,
+  regionCode: undefined,
+})
+
+const DeviceGeolocationAPIContext = createContext<{
+  setDeviceGeolocation(deviceGeolocation: Geolocation): void
+}>({
+  setDeviceGeolocation: () => {},
+})
+
+export function useGeolocation() {
+  return useContext(GeolocationContext)
+}
+
+export function useDeviceGeolocationApi() {
+  return useContext(DeviceGeolocationAPIContext)
+}
+
+export function Provider({children}: {children: ReactNode}) {
+  const geolocationService = useGeolocationServiceResponse()
+  const [deviceGeolocation, setDeviceGeolocation] = useStorage(device, [
+    'deviceGeolocation',
+  ])
+  const geolocation = useMemo(() => {
+    return mergeGeolocations(deviceGeolocation, geolocationService)
+  }, [deviceGeolocation, geolocationService])
+
+  useEffect(() => {
+    /**
+     * Save this for out-of-band-reads during future cold starts of the app.
+     * Needs to be available for the data prefetching we do on boot.
+     */
+    device.set(['mergedGeolocation'], geolocation)
+  }, [geolocation])
+
+  useSyncDeviceGeolocationOnStartup(setDeviceGeolocation)
+
+  return (
+    <GeolocationContext.Provider value={geolocation}>
+      <DeviceGeolocationAPIContext.Provider
+        value={useMemo(() => ({setDeviceGeolocation}), [setDeviceGeolocation])}>
+        {children}
+      </DeviceGeolocationAPIContext.Provider>
+    </GeolocationContext.Provider>
+  )
+}

src/geolocation/service.ts

@@ -0,0 +1,136 @@
+import {useEffect, useState} from 'react'
+import EventEmitter from 'eventemitter3'
+
+import {networkRetry} from '#/lib/async/retry'
+import {
+  FALLBACK_GEOLOCATION_SERVICE_RESPONSE,
+  GEOLOCATION_SERVICE_URL,
+} from '#/geolocation/const'
+import * as debug from '#/geolocation/debug'
+import {logger} from '#/geolocation/logger'
+import {type Geolocation} from '#/geolocation/types'
+import {device} from '#/storage'
+
+const events = new EventEmitter()
+const EVENT = 'geolocation-service-response-updated'
+const emitGeolocationServiceResponseUpdate = (data: Geolocation) => {
+  events.emit(EVENT, data)
+}
+const onGeolocationServiceResponseUpdate = (
+  listener: (data: Geolocation) => void,
+) => {
+  events.on(EVENT, listener)
+  return () => {
+    events.off(EVENT, listener)
+  }
+}
+
+async function fetchGeolocationServiceData(
+  url: string,
+): Promise<Geolocation | undefined> {
+  if (debug.enabled) return debug.resolve(debug.geolocation)
+  const res = await fetch(url)
+  if (!res.ok) {
+    throw new Error(`fetchGeolocationServiceData failed ${res.status}`)
+  }
+  return res.json() as Promise<Geolocation>
+}
+
+/**
+ * Local promise used within this file only.
+ */
+let geolocationServicePromise: Promise<{success: boolean}> | undefined
+
+/**
+ * Begin the process of resolving geolocation config. This is called right away
+ * at app start, and the promise is awaited later before proceeding with app
+ * startup.
+ */
+export async function resolve() {
+  if (geolocationServicePromise) {
+    const cached = device.get(['geolocationServiceResponse'])
+    if (cached) {
+      logger.debug(`resolve(): using cache`)
+    } else {
+      logger.debug(`resolve(): no cache`)
+      const {success} = await geolocationServicePromise
+      if (success) {
+        logger.debug(`resolve(): resolved`)
+      } else {
+        logger.info(`resolve(): failed`)
+      }
+    }
+  } else {
+    logger.debug(`resolve(): initiating`)
+
+    /**
+     * THIS PROMISE SHOULD NEVER `reject()`! We want the app to proceed with
+     * startup, even if geolocation resolution fails.
+     */
+    geolocationServicePromise = new Promise(async resolve => {
+      let success = false
+
+      function cacheResponseOrThrow(response: Geolocation | undefined) {
+        if (response) {
+          device.set(['geolocationServiceResponse'], response)
+          emitGeolocationServiceResponseUpdate(response)
+        } else {
+          // endpoint should throw on all failures, this is insurance
+          throw new Error(`fetchGeolocationServiceData returned no data`)
+        }
+      }
+
+      try {
+        // Try once, fail fast
+        const config = await fetchGeolocationServiceData(
+          GEOLOCATION_SERVICE_URL,
+        )
+        cacheResponseOrThrow(config)
+        success = true
+      } catch (e: any) {
+        logger.debug(
+          `resolve(): fetchGeolocationServiceData failed initial request`,
+          {
+            safeMessage: e.message,
+          },
+        )
+
+        // retry 3 times, but don't await, proceed with default
+        networkRetry(3, () =>
+          fetchGeolocationServiceData(GEOLOCATION_SERVICE_URL),
+        )
+          .then(config => {
+            cacheResponseOrThrow(config)
+          })
+          .catch((e: any) => {
+            // complete fail closed
+            logger.debug(
+              `resolve(): fetchGeolocationServiceData failed retries`,
+              {
+                safeMessage: e.message,
+              },
+            )
+          })
+      } finally {
+        resolve({success})
+      }
+    })
+  }
+}
+
+export function useGeolocationServiceResponse() {
+  const [config, setConfig] = useState(() => {
+    const initial =
+      device.get(['geolocationServiceResponse']) ||
+      FALLBACK_GEOLOCATION_SERVICE_RESPONSE
+    return initial
+  })
+
+  useEffect(() => {
+    return onGeolocationServiceResponseUpdate(config => {
+      setConfig(config!)
+    })
+  }, [])
+
+  return config
+}

src/geolocation/types.ts

@@ -0,0 +1,4 @@
+export type Geolocation = {
+  countryCode: string | undefined
+  regionCode: string | undefined
+}

src/geolocation/util.ts

@@ -0,0 +1,113 @@
+import {type LocationGeocodedAddress} from 'expo-location'
+
+import {logger} from '#/geolocation/logger'
+import {type Geolocation} from '#/geolocation/types'
+
+/**
+ * Maps full US region names to their short codes.
+ *
+ * Context: in some cases, like on Android, we get the full region name instead
+ * of the short code. We may need to expand this in the future to other
+ * countries, hence the prefix.
+ */
+export const USRegionNameToRegionCode: {
+  [regionName: string]: string
+} = {
+  Alabama: 'AL',
+  Alaska: 'AK',
+  Arizona: 'AZ',
+  Arkansas: 'AR',
+  California: 'CA',
+  Colorado: 'CO',
+  Connecticut: 'CT',
+  Delaware: 'DE',
+  Florida: 'FL',
+  Georgia: 'GA',
+  Hawaii: 'HI',
+  Idaho: 'ID',
+  Illinois: 'IL',
+  Indiana: 'IN',
+  Iowa: 'IA',
+  Kansas: 'KS',
+  Kentucky: 'KY',
+  Louisiana: 'LA',
+  Maine: 'ME',
+  Maryland: 'MD',
+  Massachusetts: 'MA',
+  Michigan: 'MI',
+  Minnesota: 'MN',
+  Mississippi: 'MS',
+  Missouri: 'MO',
+  Montana: 'MT',
+  Nebraska: 'NE',
+  Nevada: 'NV',
+  ['New Hampshire']: 'NH',
+  ['New Jersey']: 'NJ',
+  ['New Mexico']: 'NM',
+  ['New York']: 'NY',
+  ['North Carolina']: 'NC',
+  ['North Dakota']: 'ND',
+  Ohio: 'OH',
+  Oklahoma: 'OK',
+  Oregon: 'OR',
+  Pennsylvania: 'PA',
+  ['Rhode Island']: 'RI',
+  ['South Carolina']: 'SC',
+  ['South Dakota']: 'SD',
+  Tennessee: 'TN',
+  Texas: 'TX',
+  Utah: 'UT',
+  Vermont: 'VT',
+  Virginia: 'VA',
+  Washington: 'WA',
+  ['West Virginia']: 'WV',
+  Wisconsin: 'WI',
+  Wyoming: 'WY',
+}
+
+/**
+ * Normalizes a `LocationGeocodedAddress` into a `Geolocation`.
+ *
+ * We don't want or care about the full location data, so we trim it down and
+ * normalize certain fields, like region, into the format we need.
+ */
+export function normalizeDeviceLocation(
+  location: LocationGeocodedAddress,
+): Geolocation {
+  let {isoCountryCode, region} = location
+
+  if (region) {
+    if (isoCountryCode === 'US') {
+      region = USRegionNameToRegionCode[region] ?? region
+    }
+  }
+
+  return {
+    countryCode: isoCountryCode ?? undefined,
+    regionCode: region ?? undefined,
+  }
+}
+
+/**
+ * Combines precise location data with the geolocation config fetched from the
+ * IP service, with preference to the precise data.
+ */
+export function mergeGeolocations(
+  device?: Geolocation,
+  geolocationService?: Geolocation,
+): Geolocation {
+  let geolocation: Geolocation = {
+    countryCode: geolocationService?.countryCode ?? undefined,
+    regionCode: geolocationService?.regionCode ?? undefined,
+  }
+  // prefer GPS
+  if (device?.countryCode) {
+    geolocation = device
+  }
+  logger.debug('merged geolocation data', {
+    device,
+    service: geolocationService,
+    merged: geolocation,
+  })
+  return geolocation
+}

src/lib/__tests__/parseLinkingUrl.test.ts

@@ -0,0 +1,23 @@
+import {describe, expect, it} from '@jest/globals'
+
+import {parseLinkingUrl} from '../parseLinkingUrl'
+
+describe('parseLinkingUrl', () => {
+  it('should correctly parse bluesky:// URLs', () => {
+    const url =
+      'bluesky://intent/age-assurance?result=success&actorDid=did:example:123'
+    const urlp = parseLinkingUrl(url)
+    expect(urlp.protocol).toBe('bluesky:')
+    expect(urlp.host).toBe('')
+    expect(urlp.pathname).toBe('/intent/age-assurance')
+  })
+
+  it('should correctly parse standard URLs', () => {
+    const url =
+      'https://bsky.app/intent/age-assurance?result=success&actorDid=did:example:123'
+    const urlp = parseLinkingUrl(url)
+    expect(urlp.protocol).toBe('https:')
+    expect(urlp.host).toBe('bsky.app')
+    expect(urlp.pathname).toBe('/intent/age-assurance')
+  })
+})

src/lib/api/resolve.ts

@@ -163,6 +163,7 @@ export async function resolveLink(
       const res = await agent.resolveHandle({
         handle: urip.host,
       })
+      // @ts-expect-error TODO new-sdk-migration
       urip.host = res.data.did
     }
     const res = await agent.getPosts({

src/lib/constants.ts

@@ -204,6 +204,7 @@ export const urls = {
   website: {
     blog: {
       initialVerificationAnnouncement: `https://bsky.social/about/blog/04-21-2025-verification`,
+      searchTipsAndTricks: 'https://bsky.social/about/blog/05-31-2024-search',
     },
   },
 }
@@ -213,6 +214,7 @@ export const PUBLIC_APPVIEW_DID = 'did:web:api.bsky.app'
 export const PUBLIC_STAGING_APPVIEW_DID = 'did:web:api.staging.bsky.dev'
 
 export const DEV_ENV_APPVIEW = `http://localhost:2584` // always the same
+export const DEV_ENV_APPVIEW_DID = `did:plc:dw4kbjf5mn7nhenabiqpkyh3` // always the same
 
 // temp hack for e2e - esb
 export const BLUESKY_PROXY_HEADER = {