fix(native): typecheck, lint and knip on the native code; wire he's native bundle

The full suite, which the feature-branch CI does not run, catches four things the
native work still had: a non-narrowed union in the claim flow (tsc), a helper
named useFake that the react-hooks rule read as a hook (eslint), two iap types
exported but used only inside the file (knip), and the Hebrew native strings
present as a file but never spread into he's merged bundle (the aggregated key
parity test). All four fixed.
This commit is contained in:
Maurice
2026-11-05 16:44:31 +01:00
parent cc01f7df32
commit bde3bb4a57
3 changed files with 19 additions and 20 deletions
+13 -16
View File
@@ -432,11 +432,8 @@ async function slugStatus(slug: string): Promise<SlugStatus> {
}
}
interface RedeemOk {
ok: true
instanceUrl: string
}
async function redeemPurchase(slug: string, email: string, purchase: Purchase): Promise<RedeemOk | { ok: false; code: string }> {
type RedeemResult = { ok: true; instanceUrl: string } | { ok: false; code: string }
async function redeemPurchase(slug: string, email: string, purchase: Purchase): Promise<RedeemResult> {
try {
const res = await CapacitorHttp.post({
url: `${CLOUD_URL}/api/iap/redeem`,
@@ -561,19 +558,19 @@ function showClaim(plan: CloudPlan, interval: 'month' | 'year', opts: { back?: b
}
const redeemed = await redeemPurchase(slug, email, outcome.purchase)
if (redeemed.ok) {
showProvisioning(redeemed.instanceUrl)
if (!redeemed.ok) {
void notify(NotificationType.Error)
restore()
if (redeemed.code === 'slug-taken') {
shake(slugField)
slugNote.textContent = t('native.claim.taken')
slugNote.className = 'hint bad'
} else {
error.textContent = t('native.claim.redeemFailed')
}
return
}
void notify(NotificationType.Error)
restore()
if (redeemed.code === 'slug-taken') {
shake(slugField)
slugNote.textContent = t('native.claim.taken')
slugNote.className = 'hint bad'
} else {
error.textContent = t('native.claim.redeemFailed')
}
showProvisioning(redeemed.instanceUrl)
})
show(
+4 -4
View File
@@ -9,7 +9,7 @@
* half-wired ever faces a customer.
*/
export type IapPlatform = 'apple' | 'google';
type IapPlatform = 'apple' | 'google';
/** The receipt a completed purchase yields, in the shape `/api/iap/redeem` takes. */
export interface Purchase {
@@ -19,7 +19,7 @@ export interface Purchase {
}
/** What a purchase attempt came to. `cancelled` is the customer backing out, not an error. */
export type PurchaseOutcome =
type PurchaseOutcome =
| { kind: 'bought'; purchase: Purchase }
| { kind: 'cancelled' }
| { kind: 'failed' };
@@ -78,7 +78,7 @@ export const nativeIapClient: IapClient = {
* preview build with `localStorage['trek-iap-fake'] = '1'`, so the flow can be
* shown without a store. Off in a store build, where the native client decides.
*/
function useFake(): boolean {
function fakeEnabled(): boolean {
try {
if (import.meta.env?.DEV) return true;
return typeof localStorage !== 'undefined' && localStorage.getItem('trek-iap-fake') === '1';
@@ -88,5 +88,5 @@ function useFake(): boolean {
}
export function getIapClient(): IapClient {
return useFake() ? fakeIapClient : nativeIapClient;
return fakeEnabled() ? fakeIapClient : nativeIapClient;
}
+2
View File
@@ -47,6 +47,7 @@ import mobileSettings from './mobileSettings';
import mobileTrip from './mobileTrip';
import mobileVacay from './mobileVacay';
import nav from './nav';
import native from './native';
import notif from './notif';
import notifications from './notifications';
import oauth from './oauth';
@@ -124,6 +125,7 @@ const locale = {
...collab,
...perm,
...undo,
...native,
...notifications,
...todo,
...notif,