corrected minor bugs and version naming updated

Author: ehsan6sha

apps/box/android/app/build.gradle

@@ -82,8 +82,8 @@ android {
         applicationId "land.fx.blox"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 244
-        versionName "2.1.5"
+        versionCode 245
+        versionName "2.2.0"
         // buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         testBuildType System.getProperty('testBuildType', 'debug')

apps/box/ios/Box.xcodeproj/project.pbxproj

@@ -665,7 +665,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.5;
+				MARKETING_VERSION = 2.2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -702,7 +702,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.5;
+				MARKETING_VERSION = 2.2.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

apps/box/package.json

@@ -1,6 +1,6 @@
 {
   "name": "box",
-  "version": "2.1.5",
+  "version": "2.2.0",
   "private": true,
   "dependencies": {
     "@functionland/fula-sec": "*",

apps/box/src/components/Cards/EarningCard.tsx

@@ -9,7 +9,7 @@ import {
   FxButton,
   useToast,
 } from '@functionland/component-library';
-import { ActivityIndicator, StyleSheet } from 'react-native';
+import { ActivityIndicator, StyleSheet, Linking } from 'react-native';
 import { useTranslation } from 'react-i18next';
 import { useFulaBalance, useFormattedFulaBalance } from '../../hooks/useFulaBalance';
 import { useClaimableTokens } from '../../hooks/useClaimableTokens';
@@ -93,22 +93,15 @@ export const EarningCard = ({
     onRefreshPress?.();
   };
 
-  // Handler for claiming tokens
-  const handleClaimTokens = async () => {
+  // Handler for opening claim web portal
+  const handleOpenClaimPortal = async () => {
     try {
-      await claimTokens();
-      queueToast({
-        type: 'success',
-        title: t('earningCard.rewardsClaimed'),
-        message: t('earningCard.rewardsClaimedMessage', { amount: formattedTotalUnclaimed }),
-      });
-      // Refresh balance after claiming
-      refreshBalance();
+      await Linking.openURL('https://claim-web.fula.network');
     } catch (error: any) {
       queueToast({
         type: 'error',
         title: t('earningCard.claimFailed'),
-        message: typeof error === 'object' && 'message' in error ? error.message : t('earningCard.claimFailedMessage'),
+        message: 'Unable to open claim portal',
       });
     }
   };
@@ -188,13 +181,12 @@ export const EarningCard = ({
         </FxCard.Row.Data>
       </FxCard.Row>
 
-      {canClaim && (
+      {(account || manualSignatureWalletAddress) && (
         <FxBox marginTop="12">
           <FxButton
-            onPress={handleClaimTokens}
-            disabled={claimableLoading || !canClaim}
+            onPress={handleOpenClaimPortal}
           >
-            {claimableLoading ? t('earningCard.claiming') : t('earningCard.claimRewards')}
+            {t('earningCard.claimRewards')}
           </FxButton>
         </FxBox>
       )}

apps/box/src/hooks/useClaimableTokens.ts

@@ -41,7 +41,8 @@ export const useClaimableTokens = () => {
   });
 
   // Determine effective account (MetaMask or manual signature)
-  const effectiveAccount = connectedAccount || manualSignatureWalletAddress;
+  // When MetaMask is ready, use connectedAccount. Otherwise use manual signature as fallback.
+  const effectiveAccount = isReady ? connectedAccount : (connectedAccount || manualSignatureWalletAddress);
   const useReadOnlyService = !isReady && !!manualSignatureWalletAddress;
 
   const fetchClaimableTokens = useCallback(async () => {
@@ -165,9 +166,14 @@ export const useClaimableTokens = () => {
       console.error('Error fetching claimable rewards:', error);
 
       let errorMessage = 'Failed to fetch claimable rewards';
-
-      // Handle specific network errors
-      if (error.message?.includes('underlying network changed')) {
+      let shouldShowError = true;
+
+      // Handle specific errors
+      if (error.message?.includes('NotPoolMember') || error.errorName === 'NotPoolMember') {
+        // User is not a member of the pool - show 0 rewards without error
+        console.log('⚠️ Account is not a member of the pool, showing 0 rewards');
+        shouldShowError = false;
+      } else if (error.message?.includes('underlying network changed')) {
         errorMessage = 'Network changed during operation. Please refresh and try again.';
       } else if (error.message?.includes('timeout')) {
         errorMessage = 'Request timed out. Please try again.';
@@ -184,7 +190,7 @@ export const useClaimableTokens = () => {
         lastClaimedTimestamp: 0,
         timeSinceLastClaim: 0,
         loading: false,
-        error: errorMessage,
+        error: shouldShowError ? errorMessage : null,
         canClaim: false,
       });
     }

apps/box/src/hooks/usePoolsWithFallback.ts

@@ -59,7 +59,8 @@ export const usePoolsWithFallback = () => {
 
   // Determine which account to use and which service to use
   const effectiveAccount = metamaskAccount || manualSignatureWalletAddress;
-  const useReadOnlyService = !connected && !!manualSignatureWalletAddress;
+  // Use read-only service when MetaMask account is not available but manual signature wallet is
+  const useReadOnlyService = !metamaskAccount && !!manualSignatureWalletAddress;
 
   console.log('usePoolsWithFallback state:', {
     hasHydrated,

apps/box/src/hooks/useTasksLogic.ts

@@ -1,8 +1,9 @@
 import { useState, useEffect, useCallback } from 'react';
 import { useNavigation } from '@react-navigation/native';
 import { useTranslation } from 'react-i18next';
-import { usePools } from './usePools';
+import { usePoolsWithFallback } from './usePoolsWithFallback';
 import { useWalletConnection } from './useWalletConnection';
+import { useUserProfileStore } from '../stores/useUserProfileStore';
 import { Routes } from '../navigation/navigationConfig';
 
 export interface Task {
@@ -23,8 +24,11 @@ export interface TasksState {
 export const useTasksLogic = () => {
   const { t } = useTranslation('tasks');
   const navigation = useNavigation();
-  const { userIsMemberOfAnyPool, userActiveRequests } = usePools();
+  const { userIsMemberOfAnyPool, userActiveRequests } = usePoolsWithFallback();
   const { connected, connectWallet } = useWalletConnection();
+  const manualSignatureWalletAddress = useUserProfileStore(
+    (state) => state.manualSignatureWalletAddress
+  );
 
   const [state, setState] = useState<TasksState>({
     tasks: [],
@@ -46,20 +50,23 @@ export const useTasksLogic = () => {
     userActiveRequests.length > 0 &&
     userActiveRequests[0] !== '0';
 
+  // Determine if wallet is connected (either MetaMask or manual signature)
+  const hasWallet = connected || !!manualSignatureWalletAddress;
+
   // Generate tasks based on current state
   const generateTasks = useCallback((): Task[] => {
     const tasks: Task[] = [
       {
         id: 'connect-wallet',
         title: t('connectWallet'),
-        route: connected ? undefined : connectWallet,
-        isCompleted: connected,
+        route: hasWallet ? undefined : connectWallet,
+        isCompleted: hasWallet,
       },
       {
         id: 'join-pool',
         title: hasPendingRequest ? t('joinPoolPending') : t('joinPool'),
         route:
-          connected && !userIsMemberOfAnyPool && !hasPendingRequest
+          hasWallet && !userIsMemberOfAnyPool && !hasPendingRequest
             ? handleNavigateToPools
             : undefined,
         isCompleted: userIsMemberOfAnyPool,
@@ -70,7 +77,7 @@ export const useTasksLogic = () => {
     return tasks;
   }, [
     t,
-    connected,
+    hasWallet,
     userIsMemberOfAnyPool,
     hasPendingRequest,
     connectWallet,

apps/box/src/screens/Blox/Blox.screen.tsx

@@ -492,7 +492,7 @@ export const BloxScreen = () => {
         ref={bloxInfoBottomSheetRef}
         bloxInfo={bloxs[currentBloxPeerId]}
         onBloxRemovePress={handleOnBloxRemovePress}
-        onRestToHotspotPress={handleOnResetToHotspotPress}
+        onResetToHotspotPress={handleOnResetToHotspotPress}
         onRebootBloxPress={handleOnRebootBloxPress}
         onClearCachePress={handleOnClearCachePress}
         resetingBloxHotspot={resetingBloxHotspot}

apps/box/src/screens/InitialSetup/LinkPassword.screen.tsx

@@ -451,23 +451,20 @@ export const LinkPasswordScreen = () => {
                 <>
                   <FxButton
                     size="large"
-                    disabled={!passwordInput || !iKnow || !metamaskOpen}
+                    disabled={!passwordInput || !iKnow || !metamaskOpen || !provider}
                     onPress={
-                      provider
-                        ? linking
-                          ? disconnectWallet
-                          : handleLinkPassword
-                        : () => {}
+                      linking
+                        ? disconnectWallet
+                        : handleLinkPassword
                     }
                   >
-                    {provider ? (
-                      linking ? (
-                        t('linkPassword.cancel')
-                      ) : (
-                        t('linkPassword.signWithMetamask')
-                      )
+                    {linking ? (
+                      <>
+                        <ActivityIndicator />
+                        <FxText marginLeft="8">{t('linkPassword.cancel')}</FxText>
+                      </>
                     ) : (
-                      <ActivityIndicator />
+                      t('linkPassword.signWithMetamask')
                     )}
                   </FxButton>
                   <FxSpacer height={10} />

apps/box/src/screens/Settings/ChainSelection.screen.tsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Alert } from 'react-native';
+import { Alert, ScrollView } from 'react-native';
 import { useWalletConnection } from '../../hooks/useWalletConnection';
 import { useContractIntegration } from '../../hooks/useContractIntegration';
 import { useSDK } from '@metamask/sdk-react';
@@ -134,8 +134,9 @@ export const ChainSelectionScreen = () => {
 
   return (
     <FxSafeAreaBox flex={1} edges={['top']}>
-      <FxBox paddingHorizontal="20" paddingVertical="12">
-        <FxHeader title="Chain Selection" />
+      <ScrollView contentContainerStyle={{ flexGrow: 1 }} showsVerticalScrollIndicator={true}>
+        <FxBox paddingHorizontal="20" paddingVertical="12">
+          <FxHeader title="Chain Selection" />
 
         {/* Wallet Connect/Disconnect Button */}
         <FxBox marginTop="16" marginBottom="8" flexDirection="row" alignItems="center">
@@ -153,6 +154,10 @@ export const ChainSelectionScreen = () => {
                 {account}
               </FxText>
             </>
+          ) : manualSignatureWalletAddress ? (
+            <FxText variant="bodyXSRegular" color="content2">
+              Manual wallet stored
+            </FxText>
           ) : (
             <FxButton
               onPress={connectWallet}
@@ -175,7 +180,7 @@ export const ChainSelectionScreen = () => {
             <FxText variant="bodyMediumRegular">
               Wallet Account
             </FxText>
-            {!connected && (
+            {!account && (
               <FxButton
                 variant="inverted"
                 onPress={() => setIsEditingWalletAddress(!isEditingWalletAddress)}
@@ -186,7 +191,7 @@ export const ChainSelectionScreen = () => {
           </FxBox>
 
           {/* Display Mode - MetaMask Connected (Read-only) */}
-          {connected && account && (
+          {account && (
             <FxBox>
               <FxText variant="bodyXSRegular" color="content2" marginBottom="4">
                 Connected via MetaMask
@@ -198,7 +203,7 @@ export const ChainSelectionScreen = () => {
           )}
 
           {/* Display Mode - Manual Signature Stored (Read-only) */}
-          {!connected && manualSignatureWalletAddress && !isEditingWalletAddress && (
+          {!account && manualSignatureWalletAddress && !isEditingWalletAddress && (
             <FxBox>
               <FxText variant="bodyXSRegular" color="content2" marginBottom="4">
                 Manual Signature Wallet
@@ -210,7 +215,7 @@ export const ChainSelectionScreen = () => {
           )}
 
           {/* Display Mode - No Account */}
-          {!connected && !manualSignatureWalletAddress && !isEditingWalletAddress && (
+          {!account && !manualSignatureWalletAddress && !isEditingWalletAddress && (
             <FxBox>
               <FxText variant="bodyXSRegular" color="content2">
                 No wallet connected. Connect MetaMask or enter a wallet address manually.
@@ -219,7 +224,7 @@ export const ChainSelectionScreen = () => {
           )}
 
           {/* Edit Mode - Manual Wallet Address Input */}
-          {!connected && isEditingWalletAddress && (
+          {!account && isEditingWalletAddress && (
             <FxBox>
               <FxTextInput
                 placeholder="0x..."
@@ -398,7 +403,8 @@ export const ChainSelectionScreen = () => {
             </FxText>
           </FxBox>
         </FxBox>
-      </FxBox>
+        </FxBox>
+      </ScrollView>
     </FxSafeAreaBox>
   );
 };