diff --git a/modules/BlueskyClip/ViewController.swift b/modules/BlueskyClip/ViewController.swift index 5385ab7001..e8adb53259 100644 --- a/modules/BlueskyClip/ViewController.swift +++ b/modules/BlueskyClip/ViewController.swift @@ -34,6 +34,7 @@ class ViewController: UIViewController, WKScriptMessageHandler, WKNavigationDele webView.navigationDelegate = self self.view.addSubview(webView) self.webView = webView + self.webView?.load(URLRequest(url: URL(string: "https://bsky.app/?splash=true&clip=true")!)) } func userContentController(_ userContentController: WKUserContentController, didReceive message: WKScriptMessage) { @@ -45,13 +46,11 @@ class ViewController: UIViewController, WKScriptMessageHandler, WKNavigationDele switch payload.action { case .present: - guard let url = self.starterPackUrl else { - return - } - self.presentAppStoreOverlay() - defaults?.setValue(url.absoluteString, forKey: "starterPackUri") + if let url = self.starterPackUrl { + defaults?.setValue(url.absoluteString, forKey: "starterPackUri") + } case .store: guard let keyToStoreAs = payload.keyToStoreAs, let jsonToStore = payload.jsonToStore else { return diff --git a/package.json b/package.json index 8356c87e97..1d4d0d460b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bsky.app", - "version": "1.92.0", + "version": "1.93.0", "private": true, "engines": { "node": ">=18" diff --git a/src/components/Typography.tsx b/src/components/Typography.tsx index 19eba35fbe..69e0732713 100644 --- a/src/components/Typography.tsx +++ b/src/components/Typography.tsx @@ -26,7 +26,7 @@ export type TextProps = Omit & { title?: string } & ( | { - emoji: true + emoji?: true children: StringChild } | { diff --git a/src/components/dialogs/VerifyEmailDialog.tsx b/src/components/dialogs/VerifyEmailDialog.tsx index 5988673a18..8dfb9bc490 100644 --- a/src/components/dialogs/VerifyEmailDialog.tsx +++ b/src/components/dialogs/VerifyEmailDialog.tsx @@ -8,10 +8,11 @@ import {logger} from '#/logger' import {useModalControls} from '#/state/modals' import {useAgent, useSession} from '#/state/session' import {ErrorMessage} from '#/view/com/util/error/ErrorMessage' -import {atoms as a, useBreakpoints, useTheme} from '#/alf' +import {atoms as a, useBreakpoints} from '#/alf' import {Button, ButtonText} from '#/components/Button' import * as Dialog from '#/components/Dialog' import * as TextField from '#/components/forms/TextField' +import {InlineLinkText} from '#/components/Link' import {Loader} from '#/components/Loader' import {Text} from '#/components/Typography' @@ -55,7 +56,6 @@ export function Inner({ const {_} = useLingui() const {currentAccount} = useSession() const agent = useAgent() - const t = useTheme() const {openModal} = useModalControls() const {gtMobile} = useBreakpoints() @@ -116,7 +116,12 @@ export function Inner({ } return ( - + + @@ -129,26 +134,28 @@ export function Inner({ ) : null} {currentStep === 'StepOne' ? ( - - You'll receive an email at{' '} - - {currentAccount?.email} - {' '} - to verify it's you.{' '} - { + <> + + You'll receive an email at{' '} + + {currentAccount?.email} + {' '} + to verify it's you. + {' '} + { + e.preventDefault() control.close(() => { openModal({name: 'change-email'}) }) - }} - style={[ - a.text_md, - a.leading_snug, - {color: t.palette.primary_500}, - ]}> + return false + }}> Need to change it? - - + + ) : ( uiStrings[currentStep].message )} @@ -187,8 +194,8 @@ export function Inner({