Merge branch 'main' into ipad-fixes

__e2e__/mock-server.ts

@@ -1,5 +1,6 @@
 import {createServer as createHTTPServer} from 'node:http'
 import {parse} from 'node:url'
+
 import {createServer, TestPDS} from '../jest/test-pds'
 
 async function main() {
@@ -14,7 +15,8 @@ async function main() {
       await server?.close()
       console.log('Starting new server')
       const inviteRequired = url?.query && 'invite' in url.query
-      server = await createServer({inviteRequired})
+      const phoneRequired = url?.query && 'phone' in url.query
+      server = await createServer({inviteRequired, phoneRequired})
       console.log('Listening at', server.pdsUrl)
       if (url?.query) {
         if ('users' in url.query) {
@@ -502,6 +504,9 @@ async function main() {
               createdAt: new Date().toISOString(),
             },
           )
+
+          // flush caches
+          await server.mocker.testNet.processAll()
         }
       }
       console.log('Ready')