holders fixes

tonkeeper · May 13, 2024 · 823a5d0 · 823a5d0
1 parent 6568c71
commit 823a5d0
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 26 deletions.
diff --git a/packages/mobile/android/app/build.gradle b/packages/mobile/android/app/build.gradle
@@ -92,7 +92,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 433
-        versionName "4.2.0"
+        versionName "4.4.2"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'
     }

diff --git a/packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj b/packages/mobile/ios/ton_keeper.xcodeproj/project.pbxproj
@@ -1294,7 +1294,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.2.0;
+				MARKETING_VERSION = 4.4.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -1328,7 +1328,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 4.2.0;
+				MARKETING_VERSION = 4.4.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

diff --git a/packages/mobile/src/components/CardsWidget/CardsWidget.tsx b/packages/mobile/src/components/CardsWidget/CardsWidget.tsx
@@ -8,14 +8,17 @@ import { useCardsState } from '$wallet/hooks';
 export const CardsWidget = memo(() => {
   const state = useCardsState();
 
+  const shouldRenderCardsList =
+    state.accounts.filter((account) =>
+      ['PENDING_CONTRACT', 'ACTIVE'].includes(account.state),
+    ).length || state.prepaidCards.length;
+
   return (
     <View style={styles.container}>
       {!state.accounts.length && !state.onboardBannerDismissed ? (
         <OnboardBanner onDismissBanner={() => tk.wallet.cards.dismissOnboardBanner()} />
       ) : null}
-      {state.accounts.filter((account) =>
-        ['PENDING_CONTRACT', 'ACTIVE'].includes(account.state),
-      ).length ? (
+      {shouldRenderCardsList ? (
         <>
           <CardsList prepaidCards={state.prepaidCards} accounts={state.accounts} />
           <Spacer y={16} />

diff --git a/packages/mobile/src/components/CardsWidget/components/CardsList.tsx b/packages/mobile/src/components/CardsWidget/components/CardsList.tsx
@@ -32,11 +32,12 @@ export const CardsList = memo<CardsListProps>((props) => {
   const unlockVault = useUnlockVault();
   const enroll = useHoldersEnroll(unlockVault);
   const openWebView = useCallback(
-    (accountId) => () => {
-      enroll(() =>
-        nav.push(MainStackRouteNames.HoldersWebView, { path: `/account/${accountId}` }),
-      );
-    },
+    (accountId, path: 'account' | 'card-prepaid' = 'account') =>
+      () => {
+        enroll(() =>
+          nav.push(MainStackRouteNames.HoldersWebView, { path: `/${path}/${accountId}` }),
+        );
+      },
     [enroll, nav],
   );
   const getTokenPrice = useGetTokenPrice();
@@ -74,7 +75,7 @@ export const CardsList = memo<CardsListProps>((props) => {
       ))}
       {props.prepaidCards.map((card) => (
         <List.Item
-          onPress={openWebView(props.accounts[0]?.id)}
+          onPress={openWebView(card.id, 'card-prepaid')}
           leftContent={
             <View key={card.lastFourDigits} style={[styles.cardIcon]}>
               <Image source={CARD_DESIGN_3} style={styles.cardCover.static} />

diff --git a/packages/mobile/src/screens/HoldersWebView/HoldersWebView.tsx b/packages/mobile/src/screens/HoldersWebView/HoldersWebView.tsx
@@ -105,7 +105,6 @@ export const HoldersWebView = memo<HoldersWebViewProps>((props) => {
       // Resolve parameters
       let data: any;
       let id: number;
-      let processed = false;
       try {
         let parsed = JSON.parse(nativeEvent.data);
 
@@ -245,11 +244,12 @@ export const HoldersWebView = memo<HoldersWebViewProps>((props) => {
       initialInjectState: initialState,
     });
   }, [
-    accountState?.kycStatus,
+    accountState.kycStatus,
     accountState?.state,
     accountState?.suspended,
     accountsPrivate,
     injectedJavaScriptBeforeContentLoaded,
+    prepaidCards,
     safeAreaInsets,
   ]);
 
@@ -290,15 +290,15 @@ export const HoldersWebView = memo<HoldersWebViewProps>((props) => {
         style={styles.webView.static}
         webviewDebuggingEnabled
       />
-      {mainButton && mainButton.isVisible && (
-        <KeyboardAvoidingView
-          style={[
-            styles.keyboardAvoidingView.static,
-            { bottom: Math.max(safeAreaInsets.bottom, 16) },
-          ]}
-          behavior={Platform.OS === 'ios' ? 'position' : undefined}
-          contentContainerStyle={styles.keyboardAvoidingViewContainer.static}
-        >
+      <KeyboardAvoidingView
+        style={[
+          styles.keyboardAvoidingView.static,
+          { bottom: Math.max(safeAreaInsets.bottom, 16) },
+        ]}
+        behavior={Platform.OS === 'ios' ? 'position' : undefined}
+        contentContainerStyle={styles.keyboardAvoidingViewContainer.static}
+      >
+        {mainButton && mainButton.isVisible && (
           <Animated.View
             style={Platform.select({
               android: { marginHorizontal: 16, marginBottom: 16 },
@@ -308,8 +308,8 @@ export const HoldersWebView = memo<HoldersWebViewProps>((props) => {
           >
             <DappMainButton {...mainButton} />
           </Animated.View>
-        </KeyboardAvoidingView>
-      )}
+        )}
+      </KeyboardAvoidingView>
     </Animated.View>
   );
 });

diff --git a/packages/mobile/src/wallet/managers/CardsManager.tsx b/packages/mobile/src/wallet/managers/CardsManager.tsx
@@ -14,7 +14,11 @@ export interface AccountCard {
   kind: string;
 }
 
-export type PrepaidCard = AccountCard & { type: 'PREPAID'; fiatBalance: string };
+export type PrepaidCard = AccountCard & {
+  id: string;
+  type: 'PREPAID';
+  fiatBalance: string;
+};
 
 export interface AccountState {
   id: string;