Merge pull request mosip#615 from ravikp/develop-06-03-2023

UI changes and app stability fixes
tw-mosip · Mar 6, 2023 · 8867f3c · 8867f3c
2 parents 7ef1399 + 7ce81a8
commit 8867f3c
Show file tree

Hide file tree

Showing 15 changed files with 30 additions and 88 deletions.
diff --git a/components/SingleVcItem.tsx b/components/SingleVcItem.tsx
@@ -29,27 +29,6 @@ const VerifiedIcon: React.FC = () => {
 };
 
 const getDetails = (arg1, arg2, verifiableCredential) => {
-  if (arg1 === 'Full Name') {
-    return (
-      <Column>
-        <Text color={Theme.Colors.DetailsLabel} size="smaller">
-          {arg1}
-        </Text>
-        <Text
-          numLines={4}
-          color={Theme.Colors.Details}
-          weight="bold"
-          size="smaller"
-          style={
-            !verifiableCredential
-              ? Theme.Styles.loadingTitle
-              : Theme.Styles.subtitle
-          }>
-          {!verifiableCredential ? '' : arg2}
-        </Text>
-      </Column>
-    );
-  }
   if (arg1 === 'Status') {
     return (
       <Column>
@@ -79,7 +58,7 @@ const getDetails = (arg1, arg2, verifiableCredential) => {
         {arg1}
       </Text>
       <Text
-        numLines={1}
+        numLines={4}
         color={Theme.Colors.Details}
         weight="bold"
         size="smaller"
@@ -114,18 +93,9 @@ export const SingleVcItem: React.FC<VcItemProps> = (props) => {
     ? ''
     : getLocalizedField(verifiableCredential.credentialSubject.fullName);
 
-  const selectableOrCheck = props.selectable ? (
-    <CheckBox
-      checked={props.selected}
-      checkedIcon={<Icon name="radio-button-checked" />}
-      uncheckedIcon={<Icon name="radio-button-unchecked" />}
-      onPress={() => props.onPress(service)}
-    />
-  ) : null;
-
   return (
     <Pressable
-      style={Theme.Styles.closeCardBgContainer}
+      style={Theme.Styles.selectedBindedVc}
       onPress={() => props.onPress(service)}>
       <ImageBackground
         source={!verifiableCredential ? null : Theme.CloseCard}
@@ -170,9 +140,7 @@ export const SingleVcItem: React.FC<VcItemProps> = (props) => {
             </Column>
           </Column>
 
-          {verifiableCredential ? (
-            selectableOrCheck
-          ) : (
+          {!verifiableCredential && (
             <RotatingIcon name="sync" color={Theme.Colors.rotatingIcon} />
           )}
         </Row>

diff --git a/components/VcItem.tsx b/components/VcItem.tsx
@@ -139,15 +139,6 @@ export const VcItem: React.FC<VcItemProps> = (props) => {
     ? ''
     : getLocalizedField(verifiableCredential.credentialSubject.fullName);
 
-  const selectableOrCheck = props.selectable ? (
-    <CheckBox
-      checked={props.selected}
-      checkedIcon={<Icon name="radio-button-checked" />}
-      uncheckedIcon={<Icon name="radio-button-unchecked" />}
-      onPress={() => props.onPress(service)}
-    />
-  ) : null;
-
   const tag = useSelector(service, selectTag);
 
   return (
@@ -229,9 +220,7 @@ export const VcItem: React.FC<VcItemProps> = (props) => {
             </Column>
           </Column>
 
-          {verifiableCredential ? (
-            selectableOrCheck
-          ) : (
+          {!verifiableCredential && (
             <RotatingIcon name="sync" color={Theme.Colors.rotatingIcon} />
           )}
         </Row>

diff --git a/components/ui/themes/DefaultTheme.ts b/components/ui/themes/DefaultTheme.ts
@@ -119,7 +119,7 @@ export const DefaultTheme = {
       borderRadius: 10,
       margin: 5,
       borderWidth: 2,
-      borderColor: Colors.Orange,
+      borderColor: Colors.Green,
     },
     labelPartContainer: {
       marginLeft: 16,

diff --git a/i18n.ts b/i18n.ts
@@ -16,9 +16,9 @@ export const SUPPORTED_LANGUAGES = {
   en: 'English',
   fil: 'Filipino',
   ar: 'عربى',
-  hi: 'Hindi',
-  kn: 'Kannada',
-  ta: 'Tamil',
+  hi: 'हिंदी',
+  kn: 'ಕನ್ನಡ',
+  ta: 'தமிழ்',
 };
 
 i18next

diff --git a/machines/request.ts b/machines/request.ts
@@ -938,6 +938,10 @@ export function selectIsReviewing(state: State) {
   return state.matches('reviewing');
 }
 
+export function selectIsReviewingInIdle(state: State) {
+  return state.matches('reviewing.idle');
+}
+
 export function selectIsAccepted(state: State) {
   return state.matches('reviewing.accepted');
 }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -59,7 +59,7 @@
     "react-native-gesture-handler": "~2.1.0",
     "react-native-keychain": "^8.0.0",
     "react-native-location-enabler": "^4.1.0",
-    "react-native-openid4vp-ble": "github:mosip/tuvali#v0.3.6",
+    "react-native-openid4vp-ble": "github:mosip/tuvali#v0.3.7",
     "react-native-permissions": "^3.6.0",
     "react-native-popable": "^0.4.3",
     "react-native-qrcode-svg": "^6.1.1",

diff --git a/screens/AppLayout.tsx b/screens/AppLayout.tsx
@@ -20,11 +20,6 @@ export const AppLayout: React.FC = () => {
     title: '',
     headerTitleAlign: 'center',
     headerShadowVisible: false,
-    headerRight: () => (
-      <LanguageSelector
-        triggerComponent={<Icon name="language" color={Theme.Colors.Icon} />}
-      />
-    ),
     headerBackVisible: false,
   };
 

diff --git a/screens/MainLayout.tsx b/screens/MainLayout.tsx
@@ -18,11 +18,6 @@ export const MainLayout: React.FC<RootRouteProps> = () => {
   const options: BottomTabNavigationOptions = {
     headerLeft: () => <Icon name="notifications" color={Theme.Colors.Icon} />,
     headerLeftContainerStyle: { paddingStart: 16 },
-    headerRight: () => (
-      <LanguageSelector
-        triggerComponent={<Icon name="language" color={Theme.Colors.Icon} />}
-      />
-    ),
     headerRightContainerStyle: { paddingEnd: 16 },
     headerTitleAlign: 'center',
     tabBarShowLabel: false,

diff --git a/screens/Profile/ProfileScreen.tsx b/screens/Profile/ProfileScreen.tsx
@@ -22,6 +22,12 @@ const LanguageSetting: React.FC = () => {
     <LanguageSelector
       triggerComponent={
         <ListItem bottomDivider>
+          <Icon
+            name="language"
+            size={20}
+            color={Theme.Colors.Icon}
+            style={Theme.Styles.profileIconBg}
+          />
           <ListItem.Content>
             <ListItem.Title>
               <Text>{t('language')}</Text>

diff --git a/screens/Request/ReceiveVcScreen.tsx b/screens/Request/ReceiveVcScreen.tsx
@@ -37,6 +37,7 @@ export const ReceiveVcScreen: React.FC = () => {
               title={t('verifyAndSave')}
               margin="12 0 12 0"
               onPress={controller.ACCEPT_AND_VERIFY}
+              disabled={!controller.isReviewingInIdle}
             />
           ) : (
             <Button
@@ -45,13 +46,15 @@ export const ReceiveVcScreen: React.FC = () => {
               })}
               margin="12 0 12 0"
               onPress={controller.ACCEPT}
+              disabled={!controller.isReviewingInIdle}
             />
           )}
           <Button
             type="clear"
             title={t('discard')}
             margin="0 0 12 0"
             onPress={controller.REJECT}
+            disabled={!controller.isReviewingInIdle}
           />
         </Column>
       </Column>

diff --git a/screens/Request/ReceiveVcScreenController.ts b/screens/Request/ReceiveVcScreenController.ts
@@ -5,6 +5,7 @@ import {
   selectIncomingVc,
   selectIsIncomingVp,
   selectIsInvalidIdentity,
+  selectIsReviewingInIdle,
   selectIsVerifyingIdentity,
   selectSenderInfo,
 } from '../../machines/request';
@@ -22,6 +23,7 @@ export function useReceiveVcScreen() {
     vcLabel: useSelector(settingsService, selectVcLabel),
 
     isIncomingVp: useSelector(requestService, selectIsIncomingVp),
+    isReviewingInIdle: useSelector(requestService, selectIsReviewingInIdle),
     isVerifyingIdentity: useSelector(requestService, selectIsVerifyingIdentity),
     isInvalidIdentity: useSelector(requestService, selectIsInvalidIdentity),
 

diff --git a/screens/Request/RequestLayout.tsx b/screens/Request/RequestLayout.tsx
@@ -24,14 +24,6 @@ export const RequestLayout: React.FC = () => {
         screenOptions={{
           headerTitleAlign: 'center',
           headerShadowVisible: false,
-          headerRight: () =>
-            I18nManager.isRTL && Platform.OS !== 'ios' ? null : (
-              <LanguageSelector
-                triggerComponent={
-                  <Icon name="language" color={Theme.Colors.Icon} />
-                }
-              />
-            ),
           headerLeft: () =>
             I18nManager.isRTL && Platform.OS !== 'ios' ? (
               <LanguageSelector

diff --git a/screens/Scan/ScanLayout.tsx b/screens/Scan/ScanLayout.tsx
@@ -24,14 +24,6 @@ export const ScanLayout: React.FC = () => {
         initialRouteName="ScanScreen"
         screenOptions={{
           headerTitleAlign: 'center',
-          headerRight: () =>
-            I18nManager.isRTL && Platform.OS !== 'ios' ? null : (
-              <LanguageSelector
-                triggerComponent={
-                  <Icon name="language" color={Theme.Colors.Icon} />
-                }
-              />
-            ),
           headerLeft: () =>
             I18nManager.isRTL && Platform.OS !== 'ios' ? (
               <LanguageSelector

diff --git a/screens/Scan/SendVcScreen.tsx b/screens/Scan/SendVcScreen.tsx
@@ -45,11 +45,7 @@ export const SendVcScreen: React.FC = () => {
       <Column fill backgroundColor={Theme.Colors.lightGreyBackgroundColor}>
         <Column padding="16 0" scroll>
           <DeviceInfoList of="receiver" deviceInfo={controller.receiverInfo} />
-          <CheckBox
-            title={t('consentToPhotoVerification')}
-            checked={controller.selectedVc.shouldVerifyPresence}
-            onPress={controller.TOGGLE_USER_CONSENT}
-          />
+
           <Column padding="24">
             <Input
               value={controller.reason ? controller.reason : ''}