Only consider US for apple external billing

Author: AnthonyRonning

.gitignore

@@ -65,3 +65,12 @@ frontend/*.local
 *.tsbuildinfo
 
 **/.claude/settings.local.json
+
+# Rust build directories
+target/
+**/target/
+plugins/*/target/
+
+# iOS build artifacts 
+frontend/src-tauri/gen/apple/build/
+frontend/src-tauri/gen/apple/DerivedData/

flake.nix

@@ -16,7 +16,7 @@
         };
 
         # Use specific rust version required by Tauri
-        rustToolchain = pkgs.rust-bin.stable."1.78.0".default.override {
+        rustToolchain = pkgs.rust-bin.stable."1.81.0".default.override {
           extensions = [ "rust-src" ];
         };
       in

frontend/src-tauri/Cargo.lock

@@ -32,3 +32,8 @@ tauri-plugin-os = "2"
 tauri-plugin-sign-in-with-apple = "1.0.2"
 tokio = { version = "1.0", features = ["time"] }
 once_cell = "1.18.0"
+store = { path = "../../plugins/store", features = [] }
+
+[target.'cfg(target_os = "ios")'.dependencies.store]
+path = "../../plugins/store"
+features = ["mobile"]

frontend/src-tauri/Cargo.toml

@@ -1,6 +1,11 @@
 use tauri::Emitter;
 use tauri_plugin_deep_link::DeepLinkExt;
 use tauri_plugin_opener;
+
+#[cfg(all(not(desktop), target_os = "ios"))]
+use store;
+
+#[cfg(all(not(desktop), target_os = "ios"))]
 use tauri_plugin_sign_in_with_apple;
 
 // This handles incoming deep links
@@ -198,7 +203,9 @@ pub fn run() {
     // Only add the Apple Sign In plugin on iOS
     #[cfg(all(not(desktop), target_os = "ios"))]
     {
-        builder = builder.plugin(tauri_plugin_sign_in_with_apple::init());
+        builder = builder
+            .plugin(tauri_plugin_sign_in_with_apple::init())
+            .plugin(store::init());
     }
 
     #[cfg(not(desktop))]

frontend/src-tauri/src/lib.rs

@@ -88,7 +88,8 @@ function PricingTier({
   ctaText,
   popular = false,
   productId = "", // Add productId parameter
-  isIOS = false // Add iOS detection parameter
+  isIOS = false, // Add iOS detection parameter
+  externalBillingAllowed = true // Add external billing parameter with default to true
 }: {
   name: string;
   price: string;
@@ -98,6 +99,7 @@ function PricingTier({
   popular?: boolean;
   productId?: string; // Add type for productId
   isIOS?: boolean; // Add type for iOS detection
+  externalBillingAllowed?: boolean; // Add type for external billing
 }) {
   const isTeamPlan = name.toLowerCase().includes("team");
   const isFreeplan = name.toLowerCase().includes("free");
@@ -133,19 +135,49 @@ function PricingTier({
           </div>
         ))}
       </div>
-      {/* For iOS devices, disable paid plans with "Coming Soon" text */}
+      {/* For iOS devices, check if external billing is allowed */}
       {isIOS && !isFreeplan ? (
-        <button
-          disabled={true}
-          className="mt-auto py-3 px-6 rounded-lg text-center font-medium transition-all duration-300 
-            dark:bg-white/90 dark:text-black dark:hover:bg-[hsl(var(--purple))]/80 dark:hover:text-[hsl(var(--foreground))] dark:active:bg-white/80
-            bg-background text-foreground hover:bg-[hsl(var(--purple))] hover:text-[hsl(var(--foreground))] active:bg-background/80 
-            border border-[hsl(var(--purple))]/30 hover:border-[hsl(var(--purple))]
-            shadow-[0_0_15px_rgba(var(--purple-rgb),0.2)] hover:shadow-[0_0_25px_rgba(var(--purple-rgb),0.3)]
-            opacity-50 cursor-not-allowed"
-        >
-          Coming Soon
-        </button>
+        externalBillingAllowed ? (
+          // If external billing is allowed, handle product selection normally
+          productId ? (
+            <button
+              onClick={() => {
+                window.location.href = `/signup?next=/pricing&selected_plan=${productId}`;
+              }}
+              className="mt-auto py-3 px-6 rounded-lg text-center font-medium transition-all duration-300 
+                dark:bg-white/90 dark:text-black dark:hover:bg-[hsl(var(--purple))]/80 dark:hover:text-[hsl(var(--foreground))] dark:active:bg-white/80
+                bg-background text-foreground hover:bg-[hsl(var(--purple))] hover:text-[hsl(var(--foreground))] active:bg-background/80 
+                border border-[hsl(var(--purple))]/30 hover:border-[hsl(var(--purple))]
+                shadow-[0_0_15px_rgba(var(--purple-rgb),0.2)] hover:shadow-[0_0_25px_rgba(var(--purple-rgb),0.3)]"
+            >
+              {ctaText}
+            </button>
+          ) : (
+            <Link
+              to="/signup"
+              className="mt-auto py-3 px-6 rounded-lg text-center font-medium transition-all duration-300 
+                dark:bg-white/90 dark:text-black dark:hover:bg-[hsl(var(--purple))]/80 dark:hover:text-[hsl(var(--foreground))] dark:active:bg-white/80
+                bg-background text-foreground hover:bg-[hsl(var(--purple))] hover:text-[hsl(var(--foreground))] active:bg-background/80 
+                border border-[hsl(var(--purple))]/30 hover:border-[hsl(var(--purple))]
+                shadow-[0_0_15px_rgba(var(--purple-rgb),0.2)] hover:shadow-[0_0_25px_rgba(var(--purple-rgb),0.3)]"
+            >
+              {ctaText}
+            </Link>
+          )
+        ) : (
+          // If external billing is not allowed, show "Coming Soon" text
+          <button
+            disabled={true}
+            className="mt-auto py-3 px-6 rounded-lg text-center font-medium transition-all duration-300 
+              dark:bg-white/90 dark:text-black dark:hover:bg-[hsl(var(--purple))]/80 dark:hover:text-[hsl(var(--foreground))] dark:active:bg-white/80
+              bg-background text-foreground hover:bg-[hsl(var(--purple))] hover:text-[hsl(var(--foreground))] active:bg-background/80 
+              border border-[hsl(var(--purple))]/30 hover:border-[hsl(var(--purple))]
+              shadow-[0_0_15px_rgba(var(--purple-rgb),0.2)] hover:shadow-[0_0_25px_rgba(var(--purple-rgb),0.3)]
+              opacity-50 cursor-not-allowed"
+          >
+            Coming Soon
+          </button>
+        )
       ) : isTeamPlan ? (
         // For team plans, add "Contact Us" button that opens email
         <button
@@ -195,8 +227,9 @@ function PricingTier({
 
 export function Marketing() {
   const [isIOS, setIsIOS] = useState(false);
+  const [externalBillingAllowed, setExternalBillingAllowed] = useState(true);
 
-  // Check if the app is running on iOS
+  // Check if the app is running on iOS and check if external billing is allowed
   useEffect(() => {
     const checkPlatform = async () => {
       try {
@@ -208,7 +241,22 @@ export function Marketing() {
         if (isTauriEnv) {
           // Only check platform type if we're in a Tauri environment
           const platform = await type();
-          setIsIOS(platform === "ios");
+          const isIosDevice = platform === "ios";
+          setIsIOS(isIosDevice);
+
+          // If we're on iOS, check if external billing is allowed
+          if (isIosDevice) {
+            try {
+              // Import dynamically to prevent issues on non-Tauri environments
+              const { allowExternalBilling } = await import("@/utils/region-gate");
+              const allowed = await allowExternalBilling();
+              setExternalBillingAllowed(allowed);
+              console.log("External billing allowed (Marketing):", allowed);
+            } catch (err) {
+              console.error("Error checking store region:", err);
+              setExternalBillingAllowed(false); // Default to false if there's an error
+            }
+          }
         } else {
           setIsIOS(false);
         }
@@ -661,6 +709,7 @@ export function Marketing() {
               ctaText="Start Chatting"
               productId={getProductId("Starter")}
               isIOS={isIOS}
+              externalBillingAllowed={externalBillingAllowed}
             />
             <PricingTier
               name="Pro"
@@ -676,6 +725,7 @@ export function Marketing() {
               popular={true}
               productId={getProductId("Pro")}
               isIOS={isIOS}
+              externalBillingAllowed={externalBillingAllowed}
             />
             <PricingTier
               name="Team"
@@ -690,6 +740,7 @@ export function Marketing() {
               ctaText="Contact Us"
               productId={getProductId("Team")}
               isIOS={isIOS}
+              externalBillingAllowed={externalBillingAllowed}
             />
           </div>
         </div>

frontend/src/components/Marketing.tsx

@@ -120,7 +120,7 @@ function OAuthCallback() {
     };
 
     processCallback();
-  }, [handleGitHubCallback, handleGoogleCallback, navigate, provider]);
+  }, [handleGitHubCallback, handleGoogleCallback, navigate, provider, handleSuccessfulAuth]);
 
   // If this is a Tauri app auth flow (desktop or mobile), show a different UI
   if (localStorage.getItem("redirect-to-native") === "true") {

frontend/src/routes/auth.$provider.callback.tsx

@@ -148,7 +148,9 @@ function PricingPage() {
   const isLoggedIn = !!os.auth.user;
   const { selected_plan } = Route.useSearch();
 
-  // Check if the app is running on iOS
+  // Check if the app is running on iOS and check if external billing is allowed
+  const [externalBillingAllowed, setExternalBillingAllowed] = useState(true);
+
   useEffect(() => {
     const checkPlatform = async () => {
       try {
@@ -160,7 +162,22 @@ function PricingPage() {
         if (isTauriEnv) {
           // Only check platform type if we're in a Tauri environment
           const platform = await type();
-          setIsIOS(platform === "ios");
+          const isIosDevice = platform === "ios";
+          setIsIOS(isIosDevice);
+
+          // If we're on iOS, check if external billing is allowed
+          if (isIosDevice) {
+            try {
+              // Import dynamically to prevent issues on non-Tauri environments
+              const { allowExternalBilling } = await import("@/utils/region-gate");
+              const allowed = await allowExternalBilling();
+              setExternalBillingAllowed(allowed);
+              console.log("External billing allowed:", allowed);
+            } catch (err) {
+              console.error("Error checking store region:", err);
+              setExternalBillingAllowed(false); // Default to false if there's an error
+            }
+          }
         } else {
           setIsIOS(false);
         }
@@ -185,12 +202,15 @@ function PricingPage() {
     enabled: isLoggedIn
   });
 
-  // Auto-enable Bitcoin toggle for Zaprite users (except on iOS)
+  // Auto-enable Bitcoin toggle for Zaprite users (except on iOS or if external billing is not allowed)
   useEffect(() => {
-    if (freshBillingStatus?.payment_provider === "zaprite" && !isIOS) {
+    if (
+      freshBillingStatus?.payment_provider === "zaprite" &&
+      (!isIOS || (isIOS && externalBillingAllowed))
+    ) {
       setUseBitcoin(true);
     }
-  }, [freshBillingStatus?.payment_provider, isIOS]);
+  }, [freshBillingStatus?.payment_provider, isIOS, externalBillingAllowed]);
 
   // Always try to fetch portal URL if logged in
   const { data: portalUrl } = useQuery({
@@ -245,6 +265,11 @@ function PricingPage() {
   const { success, canceled } = Route.useSearch();
 
   const getButtonText = (product: Product) => {
+    // For iOS with paid plans (not Free) in non-US regions, show "Coming Soon"
+    if (isIOS && !product.name.toLowerCase().includes("free") && !externalBillingAllowed) {
+      return "Coming Soon";
+    }
+
     if (loadingProductId === product.id) {
       return (
         <>
@@ -422,6 +447,13 @@ function PricingPage() {
 
   const handleButtonClick = useCallback(
     (product: Product) => {
+      // This check is now redundant since we disable the button and show "Coming Soon"
+      // But keep it as a safeguard
+      if (isIOS && !product.name.toLowerCase().includes("free") && !externalBillingAllowed) {
+        // Don't allow any action on paid plans if on iOS and external billing not allowed
+        return;
+      }
+
       if (!isLoggedIn) {
         const targetPlanName = product.name.toLowerCase();
         const isTeamPlan = targetPlanName.includes("team");
@@ -500,7 +532,8 @@ function PricingPage() {
       navigate,
       portalUrl,
       newHandleSubscribe,
-      isIOS
+      isIOS,
+      externalBillingAllowed
     ]
   );
 
@@ -646,7 +679,7 @@ function PricingPage() {
           </div>
         )}
 
-        {!isIOS && (
+        {(!isIOS || (isIOS && externalBillingAllowed)) && (
           <div className="w-full max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 flex justify-center">
             <div className="inline-flex items-center gap-4 px-6 py-2.5 rounded-full bg-[hsl(var(--marketing-card))]/50 backdrop-blur-sm border border-[hsl(var(--marketing-card-border))]">
               <div className="flex items-center gap-2 text-[hsl(var(--bitcoin))] text-base font-light">
@@ -778,7 +811,9 @@ function PricingPage() {
                       <button
                         onClick={() => handleButtonClick(product)}
                         disabled={
-                          loadingProductId === product.id || (useBitcoin && product.name === "Team")
+                          loadingProductId === product.id || 
+                          (useBitcoin && product.name === "Team") ||
+                          (isIOS && !product.name.toLowerCase().includes("free") && !externalBillingAllowed)
                         }
                         className={`w-full 
                           dark:bg-white/90 dark:text-black dark:hover:bg-[hsl(var(--purple))]/80 dark:hover:text-[hsl(var(--foreground))] dark:active:bg-white/80

frontend/src/routes/pricing.tsx

@@ -0,0 +1,17 @@
+import { invoke } from "@tauri-apps/api/core";
+
+const US_CODES = ["USA", "ASM", "GUM", "PRI", "VIR", "MNP", "UMI"]; // US and territories
+
+/**
+ * Checks if external billing is allowed based on the App Store region.
+ * Returns true for US regions, false for all others or on errors.
+ */
+export async function allowExternalBilling(): Promise<boolean> {
+  try {
+    const code = await invoke<string>("plugin:store|get_region");
+    return US_CODES.includes(code);
+  } catch (error) {
+    console.error("Error checking store region:", error);
+    return false; // Safest fallback is to not allow external billing
+  }
+}

frontend/src/utils/region-gate.ts

@@ -0,0 +1,10 @@
+.DS_Store
+/.build
+/Packages
+/*.xcodeproj
+xcuserdata/
+DerivedData/
+.swiftpm/config/registries.json
+.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
+.netrc
+Package.resolved