Merge master into qa to clear the release PR's conflicts

.env.example

@@ -2,6 +2,7 @@ EXPO_PUBLIC_BASE_URL= # Frontend domain (e.g., https://app.solix.xyz)
 EXPO_PUBLIC_ALCHEMY_API_KEY=
 # TODO: Move Pimlico API Key to backend
 EXPO_PUBLIC_PIMLICO_API_KEY=
+EXPO_PUBLIC_PIMLICO_SPONSORSHIP_POLICY_ID=sp_romantic_fallen_one
 EXPO_PUBLIC_FLASH_API_BASE_URL=
 EXPO_PUBLIC_FLASH_ANALYTICS_API_BASE_URL=
 EXPO_PUBLIC_BRIDGE_AUTO_DEPOSIT_ADDRESS=
@@ -68,6 +69,12 @@ EXPO_PUBLIC_CARD_SPEND_V2=true
 EXPO_PUBLIC_CASH_MODULE_V2_ADDRESS=
 # SolidSpendLens on Fuse — the cohort-aware read serving both module generations.
 EXPO_PUBLIC_SPEND_LENS_V2_ADDRESS=
+# Earlier SolidCashModuleV2 cores the address above replaced, comma-separated. Any of
+# these still enabled on a Safe is disabled in the same batch that puts it on the live
+# core — the backend no longer reads them, so a Safe left there declines every payment.
+# Empty means the 2026-09-24 retiree (0xE2d4FB3d1eeD6Bdc3fD62A93ab35A33FC3c97b2B).
+# Append here on the next redeploy, and change BOTH addresses above in the same release.
+EXPO_PUBLIC_RETIRED_CASH_MODULE_V2_ADDRESSES=
 
 # ---- Base: the EURC spend instance -------------------------------------------
 # A SECOND, INDEPENDENT deployment of the spend module, not a setting on the Fuse

README.md

@@ -193,6 +193,7 @@ Key environment variables (see `.env.example`):
 - `EXPO_PUBLIC_ALCHEMY_API_KEY`: Alchemy API key for blockchain data
 - `EXPO_PUBLIC_ETHEREUM_API_KEY`: Ethereum API key
 - `EXPO_PUBLIC_PIMLICO_API_KEY`: Pimlico paymaster API key
+- `EXPO_PUBLIC_PIMLICO_SPONSORSHIP_POLICY_ID`: Pimlico sponsorship policy attached to every user operation
 - `EXPO_PUBLIC_FLASH_API_BASE_URL`: Solid API configuration
 - `EXPO_PUBLIC_FLASH_ANALYTICS_API_BASE_URL`: Solid analytics endpoint
 - `EXPO_PUBLIC_BRIDGE_AUTO_DEPOSIT_ADDRESS`: Bridge auto-deposit address

app.config.ts

@@ -51,7 +51,7 @@ export default ({ config }: ConfigContext): ExpoConfig => ({
   ...config,
   name: 'Solid',
   slug: 'flash-frontend',
-  version: '2.0.1',
+  version: '2.0.2',
   orientation: 'portrait',
   icon: './assets/images/adaptive-icon.png',
   scheme: 'solid',

app/(protected)/(tabs)/index.native.tsx

@@ -17,6 +17,7 @@
 import LazyWalletTabs from '@/components/Wallet/LazyWalletTabs';
 import TokenListSkeleton from '@/components/Wallet/WalletTokenTab/TokenListSkeleton';
 import { SPIN_WIN_MODAL } from '@/constants/modals';
+import { useActivityRefresh } from '@/hooks/useActivityRefresh';
 import { useUserTransactions } from '@/hooks/useAnalytics';
 import { useCardDetails } from '@/hooks/useCardDetails';
 import { useCardStatus } from '@/hooks/useCardStatus';
@@ -43,11 +44,12 @@
  * qa/preview builds see the redesigned `HomeScreenNew`; production keeps this
  * `LegacyHome`. The gate lives in the default export below.
  */
 function LegacyHome() {
   useRenderMonitor({ componentName: MONITORED_COMPONENTS.HOME_SCREEN });
 
   const { user } = useUser();
   const queryClient = useQueryClient();
+  const { refetchAll, isRefreshing } = useActivityRefresh();
   const { data: balance, isLoading: isBalanceLoading } = useVaultBalance(
     user?.safeAddress as Address,
   );
@@ -127,7 +129,7 @@
   const showAssets = isLoadingTokens || hasTokens || !!tokenError;
 
   return (
-    <PageLayout mobileTitle={mobileHeaderBalance}>
+    <PageLayout mobileTitle={mobileHeaderBalance} onRefresh={refetchAll} refreshing={isRefreshing}>
       <View className="mb-5 w-full gap-8 pb-20">
         {isBalanceSectionLoading ? (
           <View className="items-center pt-6">

app/(protected)/activity/index.tsx

@@ -52,6 +52,7 @@ export default function Activity() {
     items,
     isLoading,
     isSyncing,
+    isRefreshing,
     isSyncStale,
     hasNextPage,
     isFetchingNextPage,
@@ -73,7 +74,11 @@ export default function Activity() {
   const searchTerm = query.trim();
 
   const pageHeader = (
-    <View className="mx-auto w-full max-w-7xl px-4 pb-[10px] pt-6 md:pt-12">
+    <View
+      className={cn('mx-auto w-full max-w-7xl pb-[10px] pt-6 md:pt-12', {
+        'px-4': isWeb,
+      })}
+    >
       <View className="flex-row items-center justify-between">
         <Text className="text-3xl font-semibold">Activity</Text>
 
@@ -89,42 +94,56 @@ export default function Activity() {
     </View>
   );
 
+  const filters = (
+    <View className="pb-2 pt-2">
+      <ActivityFilters
+        value={tab}
+        onChange={handleTabChange}
+        query={query}
+        onQueryChange={setQuery}
+        isSearchOpen={isSearchOpen}
+        onSearchOpenChange={setIsSearchOpen}
+        showSourceFilters={userHasCard}
+      />
+    </View>
+  );
+
   return (
     <PageLayout
       isLoading={isCardStatusLoading}
       mobileHeaderLeftAction="back"
       mobileHeaderRightAction="help"
       onMobileHeaderHelpPress={() => openSupportDrawer()}
+      scrollable={isWeb}
     >
-      {pageHeader}
+      {isWeb && pageHeader}
       <View
         className={cn('mx-auto w-full max-w-7xl px-4 pb-8 md:pb-12', {
           'flex-1': !isWeb,
         })}
       >
-        <View className="pb-2 pt-2">
-          <ActivityFilters
-            value={tab}
-            onChange={handleTabChange}
-            query={query}
-            onQueryChange={setQuery}
-            isSearchOpen={isSearchOpen}
-            onSearchOpenChange={setIsSearchOpen}
-            showSourceFilters={userHasCard}
-          />
-        </View>
+        {isWeb && filters}
 
         <UnifiedActivityList
           items={visibleItems}
           tab={tab}
           userHasCard={userHasCard}
           isLoading={isLoading}
           isSyncing={isSyncing}
+          isRefreshing={isRefreshing}
           isSyncStale={isSyncStale}
           hasNextPage={hasNextPage}
           isFetchingNextPage={isFetchingNextPage}
           onLoadMore={loadMore}
           onRefresh={refetchAll}
+          listHeaderComponent={
+            !isWeb ? (
+              <>
+                {pageHeader}
+                {filters}
+              </>
+            ) : undefined
+          }
           emptyTitle={searchTerm ? 'No matching activity' : 'No transactions found'}
           emptyDescription={
             searchTerm

app/_layout.tsx

@@ -45,6 +45,7 @@ import CashbackStoreReviewTrigger from '@/components/StoreReview/CashbackStoreRe
 import ThirdwebConnectionBridge from '@/components/ThirdwebConnectionBridge';
 import { toastProps } from '@/components/Toast';
 import { TurnkeyProvider } from '@/components/TurnkeyProvider';
+import { path } from '@/constants/path';
 import { getInfoClient } from '@/graphql/clients';
 import { useAttributionInitialization } from '@/hooks/useAttributionInitialization';
 import { useDimension } from '@/hooks/useDimension';
@@ -57,6 +58,7 @@ import { EXPO_PUBLIC_ENVIRONMENT, isProduction } from '@/lib/config';
 import { configureObserve, markAppInteractive, withObserve } from '@/lib/observe';
 import { config } from '@/lib/wagmi';
 import { useUserStore } from '@/store/useUserStore';
+import { useWhatsNewStore } from '@/store/useWhatsNewStore';
 
 import type { ErrorBoundaryProps } from 'expo-router';
 
@@ -162,7 +164,9 @@ SplashScreen.setOptions({
 // Note: Only rendered when hasSelectedUser is true (see conditional render below)
 // Uses LazyWhatsNewModal to defer react-native-reanimated-carousel bundle
 function WhatsNewWrapper() {
-  const { whatsNew, isVisible, closeWhatsNew } = useWhatsNew();
+  const pathname = usePathname();
+  const isHomeReady = useWhatsNewStore(state => state.isHomeReady);
+  const { whatsNew, isVisible, closeWhatsNew } = useWhatsNew(pathname === path.HOME && isHomeReady);
 
   if (!whatsNew) return null;