Inji 427 refactoring select vc screen while sharing (#970)

* fix(INJI-427):refactor selectVC screen while sharing Signed-off-by: Sri Kanth Kola <[email protected]> * fix(INJI-427):refactor selectVC checkbox icon and button height Signed-off-by: Sri Kanth Kola <[email protected]> * fix(INJI-427):remove bottom Tab from share flow Signed-off-by: Sri Kanth Kola <[email protected]> * fix(INJI-427):remove bottom Tab from share flow Signed-off-by: Sri Kanth Kola <[email protected]> * fix(INJI-427):remove bottom Tab from share flow Signed-off-by: Sri Kanth Kola <[email protected]> * fix(INJI-427):refactor bottomTabBar styles into theme files Signed-off-by: Sri Kanth Kola <[email protected]> --------- Signed-off-by: Sri Kanth Kola <[email protected]>
mosip · Oct 31, 2023 · ce232b2 · ce232b2
1 parent b76b182
commit ce232b2
Show file tree

Hide file tree

Showing 7 changed files with 103 additions and 71 deletions.
diff --git a/.talismanrc b/.talismanrc
@@ -1,28 +1,34 @@
 fileignoreconfig:
+- filename: ios/Podfile.lock
+  checksum: cc123c3e1f04d41b394ceb16843b15c08bac3ba619ae853ff322717739761a85    
 - filename: package.json
   checksum: fdd5905228a1afbfb004c710fd6c61adf073a12840200327c0592b76bea5e7e3
 - filename: package-lock.json
   checksum: 4515c3d663d9435eab0f56b75480c93c5209aa59befb2b71f2b3fe7c9051d80a
 - filename: components/PasscodeVerify.tsx
   checksum: 14654c0f038979fcd0d260170a45894a072f81e0767ca9a0e66935d33b5cc703
 - filename: i18n.ts
-  checksum: 75dd5536038ba198aa7b12eb6d2c2e7042c9ce292e5a0d5c90883ae5b2312b1e
-- filename: screens/BiometricScreenController.ts
-  checksum: b3d0184fb894f4a9ffa1a4d277d2975495dbc47771593895bf1999deabafeb94
-- filename: screens/Home/MyVcs/IdInputModal.tsx
-  checksum: ec48ebeaf46b8fbc756f19ef8ffe8901ce0528aef164f3c7ffdeec36fb53ffc6
+  checksum: 75dd5536038ba198aa7b12eb6d2c2e7042c9ce292e5a0d5c90883ae5b2312b1e    
 - filename: components/Passcode.tsx
-  checksum: db4a18001be8c63bf7ffb389359861401fa1d22261b10ad729a76fd431c019a7
-- filename: screens/PasscodeScreen.tsx
-  checksum: 0cc5b91350e491a058ee8a1878a496c16b65f14969e989bdb1c354f6e9b8c03c
-- filename: locales/spa.json
-  checksum: 981103ff872d6f54610468c7ead65873d9294a11092649b105c552f770f0214b
+  checksum: db4a18001be8c63bf7ffb389359861401fa1d22261b10ad729a76fd431c019a7    
+- filename: components/PasscodeVerify.tsx
+  checksum: 14654c0f038979fcd0d260170a45894a072f81e0767ca9a0e66935d33b5cc703    
+- filename: screens/Home/MyVcs/GetIdInputModal.tsx
+  checksum: 5c736ed79a372d0ffa7c02eb33d0dc06edbbb08d120978ff287f5f06cd6c7746    
 - filename: screens/AuthScreen.tsx
-  checksum: 2c1183b2ad8ec27adf8f389a2511805493f229fdda674064e2579d2032119d1c
+  checksum: 4a096c467bb9b3fa476c220993ef0a58d72a758c40cf741dc2e4ec4db0c692e8    
 - filename: screens/BiometricScreen.tsx
-  checksum: 7a730731aaa7540eec9d05d73de277a665dc06425666280842e0f9ba6e5b8514
+  checksum: 7a730731aaa7540eec9d05d73de277a665dc06425666280842e0f9ba6e5b8514    
 - filename: screens/AuthScreenController.ts
-  checksum: 18af825821bc95e1056050623b804a5a8e7435b9e3383916a5d63024eeba9553
+  checksum: 18af825821bc95e1056050623b804a5a8e7435b9e3383916a5d63024eeba9553    
+- filename: screens/BiometricScreenController.ts
+  checksum: 4a424adbd2d2404c9d968c54607885af643a07e09acc4a2d37c6e7a7952c4945    
+- filename: screens/Home/IntroSlidersScreen.tsx
+  checksum: 9ff212530850e9f921f91d406c01f67ea5dd2a44e9cdb5e63d977749c7a7c5bd    
+- filename: machines/store.ts
+  checksum: fda6511ab88566820cf6b7324178b4646f495fae5168af73a0fb1c3bb52e5b8d    
+- filename: screens/Home/MyVcs/IdInputModal.tsx
+  checksum: 6f21b2caf20ee1821b69e178a69e755e0b1094275e4a9f9cb4ae5ab515ce5d23    
 - filename: screens/WelcomeScreenController.ts
   checksum: 71917c8c543a4a5b7ab61df259b785d233a80718123b0c8edf6ec81e1b3a81e0
 - filename: shared/telemetry/TelemetryUtils.js
@@ -45,20 +51,27 @@ fileignoreconfig:
 - filename: screens/Home/MyVcs/GetIdInputModal.tsx
   checksum: 5c736ed79a372d0ffa7c02eb33d0dc06edbbb08d120978ff287f5f06cd6c7746
 - filename: shared/openId4VCI/Utils.ts
-  checksum: 2bd39d84099d700e5bddeebe87dfb3b0e3075edc0a4d06ce48b428b0a85e238f
-- filename: machines/issuersMachine.ts
-  checksum: b925df13236145867fc7a1a2a703faca854e8c937dac9451008399e3937592fb
-- filename: machines/issuersMachine.typegen.ts
-  checksum: f5e2c89f9029b1e590173e37b2cf6586d5229ecb7d4dfd4c5f050f9416d3c1cd
-- filename: machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.ts
-  checksum: eec77ca61540327ff7cab3489ebdfd47aa373fd20b3ff87a6c322cd48d35fe8f
-- filename: machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.typegen.ts
-  checksum: f1f504bd8c14496ee71f8eb7f40d54411cc05be03347d644dcc2cca187a20678
-- filename: machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.ts
-  checksum: 237a2640b7db70770d65da67c79f2929581e32f1162517e50b8d37e409f3387d
+  checksum: ba3041b2ce380f44f6f52dc2c3df337d857df4494bd3c8727df9bf6fb5734750    
 - filename: shared/cryptoutil/cryptoUtil.ts
   checksum: b785ff3f01ab9530119072c4d38195048bfeee6155c54ea7dd031559acb722f3
 - filename: machines/store.typegen.ts
   checksum: 6d22bc5c77398316b943c512c208ce0846a9fff674c1ccac79e07f21962acd5f
 - filename: machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.typegen.ts
   checksum: 10889302ca05646a283386be1bbe7a5fb510c02bb62a308ee45f3c2a872ae64e
+- filename: .github/workflows/internal-build.yml
+  checksum: 3a3b4dea51cb496729c4e568113fc19cf5b008481bb4a5d157f211a2128b951b
+- filename: .github/workflows/push-triggers.yml
+  checksum: c5de3d912e2cbd55f6898e2f4a24413abbee8f084c99ea11ce6265504a520ce0
+- filename: android/fastlane/Fastfile
+  checksum: 41d1409adf8df9c843fd2dba89142cd55c471f3060ced57d48ee96dc8793ffcd
+- filename: package.json
+  checksum: b982af1813bb72625c63eb31b3d0a6c0d970cd669d57649cc0ac9358252e3cd3
+- filename: machines/VCItemMachine/EsignetMosipVCItem/EsignetMosipVCItemMachine.typegen.ts
+  checksum: 15308987b1aab0c51c96bfc646ae55a3d7ae728a1f6e03ab31d5e1b786da03eb
+- filename: machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.typegen.ts
+  checksum: 533785a3c8096ea93afc59c65025679c24d379e824e784e745ab298a0978cd2a
+- filename: shared/telemetry/TelemetryUtils.js
+  checksum: a0686e9a5c006176fd720b84bc36ca947db1422caf65c90cd0c2d1102a9e96df
+- filename: ios/fastlane/Fastfile
+  checksum: feea5a7f044ef6961d53e7d1e1ffb92a3e0f72761496424f6e64288e3718d605
+  version: ""
diff --git a/components/ui/themes/DefaultTheme.ts b/components/ui/themes/DefaultTheme.ts
@@ -1267,6 +1267,23 @@ export const DefaultTheme = {
       maxHeight: Dimensions.get('window').height,
     },
   }),
+  BottomTabBarStyle: StyleSheet.create({
+    headerRightContainerStyle: {paddingEnd: 13},
+    headerLeftContainerStyle: {paddingEnd: 13},
+    tabBarLabelStyle: {
+      fontSize: 12,
+      fontFamily: 'Inter_600SemiBold',
+    },
+    tabBarStyle: {
+      display: 'flex',
+      height: 75,
+      paddingHorizontal: 10,
+    },
+    tabBarItemStyle: {
+      height: 83,
+      padding: 11,
+    },
+  }),
 
   ICON_SMALL_SIZE: 16,
   ICON_MID_SIZE: 22,

diff --git a/components/ui/themes/PurpleTheme.ts b/components/ui/themes/PurpleTheme.ts
@@ -1266,6 +1266,23 @@ export const PurpleTheme = {
       maxHeight: Dimensions.get('window').height,
     },
   }),
+  BottomTabBarStyle: StyleSheet.create({
+    headerRightContainerStyle: {paddingEnd: 13},
+    headerLeftContainerStyle: {paddingEnd: 13},
+    tabBarLabelStyle: {
+      fontSize: 12,
+      fontFamily: 'Inter_600SemiBold',
+    },
+    tabBarStyle: {
+      display: 'flex',
+      height: 75,
+      paddingHorizontal: 10,
+    },
+    tabBarItemStyle: {
+      height: 83,
+      padding: 11,
+    },
+  }),
 
   ICON_SMALL_SIZE: 16,
   ICON_MID_SIZE: 22,

diff --git a/routes/main.ts b/routes/main.ts
@@ -3,13 +3,17 @@ import {
   BottomTabNavigationOptions,
   BottomTabScreenProps,
 } from '@react-navigation/bottom-tabs';
-import {Image} from 'react-native';
 import {RootStackParamList} from './index';
 import {ScanLayout} from '../screens/Scan/ScanLayout';
 import {HistoryScreen} from '../screens/History/HistoryScreen';
 import i18n from '../i18n';
 import {BOTTOM_TAB_ROUTES} from './routesConstants';
 import {HomeScreenLayout} from '../screens/HomeScreenLayout';
+import {Theme} from '../components/ui/styleUtils';
+
+export const changeTabBarVisible = (visible: string) => {
+  Theme.BottomTabBarStyle.tabBarStyle.display = visible;
+};
 
 const home: TabScreen = {
   name: BOTTOM_TAB_ROUTES.home,

diff --git a/screens/MainLayout.tsx b/screens/MainLayout.tsx
@@ -56,27 +56,9 @@ export const MainLayout: React.FC<
         />
       </Row>
     ),
-    headerTitleStyle: {
-      fontFamily: 'Inter_600SemiBold',
-      fontSize: 30,
-      margin: 4,
-    },
-    headerRightContainerStyle: {paddingEnd: 13},
-    headerLeftContainerStyle: {paddingEnd: 13},
     tabBarShowLabel: true,
     tabBarActiveTintColor: Theme.Colors.IconBg,
-    tabBarLabelStyle: {
-      fontSize: 12,
-      fontFamily: 'Inter_600SemiBold',
-    },
-    tabBarStyle: {
-      height: 75,
-      paddingHorizontal: 10,
-    },
-    tabBarItemStyle: {
-      height: 83,
-      padding: 11,
-    },
+    ...Theme.BottomTabBarStyle,
   };
 
   return (

diff --git a/screens/Scan/ScanLayoutController.ts b/screens/Scan/ScanLayoutController.ts
@@ -3,7 +3,7 @@ import {useSelector} from '@xstate/react';
 import {useContext, useEffect} from 'react';
 import {useTranslation} from 'react-i18next';
 import {MessageOverlayProps} from '../../components/MessageOverlay';
-import {MainBottomTabParamList} from '../../routes/main';
+import {MainBottomTabParamList, changeTabBarVisible} from '../../routes/main';
 import {GlobalContext} from '../../shared/GlobalContext';
 import {
   selectIsConnecting,
@@ -208,12 +208,16 @@ export function useScanLayout() {
 
   useEffect(() => {
     if (isDone) {
+      changeTabBarVisible('flex');
       navigation.navigate(BOTTOM_TAB_ROUTES.home);
     } else if (isReviewing) {
+      changeTabBarVisible('none');
       navigation.navigate(SCAN_ROUTES.SendVcScreen);
     } else if (isScanning) {
+      changeTabBarVisible('flex');
       navigation.navigate(SCAN_ROUTES.ScanScreen);
     } else if (isQrLoginDone) {
+      changeTabBarVisible('flex');
       navigation.navigate(BOTTOM_TAB_ROUTES.history);
     }
   }, [isDone, isReviewing, isScanning, isQrLoginDone, isBleError]);

diff --git a/screens/Scan/SendVcScreen.tsx b/screens/Scan/SendVcScreen.tsx
@@ -1,12 +1,11 @@
 import React, {useContext, useEffect, useRef} from 'react';
-import {Input} from 'react-native-elements';
 import {useTranslation} from 'react-i18next';
 import {Button, Column, Row, Text} from '../../components/ui';
 import {Theme} from '../../components/ui/styleUtils';
 import {MessageOverlay} from '../../components/MessageOverlay';
 import {useSendVcScreen} from './SendVcScreenController';
 import {VerifyIdentityOverlay} from '../VerifyIdentityOverlay';
-import {BackHandler, I18nManager} from 'react-native';
+import {BackHandler} from 'react-native';
 import {useInterpret} from '@xstate/react';
 import {createExistingMosipVCItemMachine} from '../../machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine';
 import {GlobalContext} from '../../shared/GlobalContext';
@@ -70,16 +69,10 @@ export const SendVcScreen: React.FC = () => {
     }, []),
   );
 
-  const reasonLabel = t('reasonForSharing');
-
   return (
     <React.Fragment>
       <Column fill backgroundColor={Theme.Colors.lightGreyBackgroundColor}>
         <Column>
-          <Column
-            padding="24 19 14 19"
-            backgroundColor={Theme.Colors.whiteBackgroundColor}
-            style={{position: 'relative'}}></Column>
           <Text
             margin="15 0 13 24"
             weight="bold"
@@ -101,29 +94,31 @@ export const SendVcScreen: React.FC = () => {
             />
           ))}
         </Column>
-        {!controller.selectedVc.shouldVerifyPresence && (
+        <Column backgroundColor={Theme.Colors.whiteBackgroundColor}>
+          {!controller.selectedVc.shouldVerifyPresence && (
+            <Button
+              type="gradient"
+              title={t('acceptRequestAndVerify')}
+              styles={{marginTop: 12}}
+              disabled={controller.selectedIndex == null}
+              onPress={controller.VERIFY_AND_ACCEPT_REQUEST}
+            />
+          )}
+
           <Button
             type="gradient"
-            title={t('acceptRequestAndVerify')}
-            styles={{marginTop: 12}}
+            title={t('acceptRequest')}
             disabled={controller.selectedIndex == null}
-            onPress={controller.VERIFY_AND_ACCEPT_REQUEST}
+            onPress={controller.ACCEPT_REQUEST}
           />
-        )}
-
-        <Button
-          type="gradient"
-          title={t('acceptRequest')}
-          disabled={controller.selectedIndex == null}
-          onPress={controller.ACCEPT_REQUEST}
-        />
 
-        <Button
-          type="clear"
-          loading={controller.isCancelling}
-          title={t('reject')}
-          onPress={controller.CANCEL}
-        />
+          <Button
+            type="clear"
+            loading={controller.isCancelling}
+            title={t('reject')}
+            onPress={controller.CANCEL}
+          />
+        </Column>
       </Column>
 
       <VerifyIdentityOverlay