diff --git a/components/SingleVcItem.tsx b/components/SingleVcItem.tsx index fcc607c6b8..1b241a8a8b 100644 --- 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 ( - - - {arg1} - - - {!verifiableCredential ? '' : arg2} - - - ); - } if (arg1 === 'Status') { return ( @@ -79,7 +58,7 @@ const getDetails = (arg1, arg2, verifiableCredential) => { {arg1} = (props) => { ? '' : getLocalizedField(verifiableCredential.credentialSubject.fullName); - const selectableOrCheck = props.selectable ? ( - } - uncheckedIcon={} - onPress={() => props.onPress(service)} - /> - ) : null; - return ( props.onPress(service)}> = (props) => { - {verifiableCredential ? ( - selectableOrCheck - ) : ( + {!verifiableCredential && ( )} diff --git a/components/VcItem.tsx b/components/VcItem.tsx index 4f68cf9ada..0365839c34 100644 --- a/components/VcItem.tsx +++ b/components/VcItem.tsx @@ -139,15 +139,6 @@ export const VcItem: React.FC = (props) => { ? '' : getLocalizedField(verifiableCredential.credentialSubject.fullName); - const selectableOrCheck = props.selectable ? ( - } - uncheckedIcon={} - onPress={() => props.onPress(service)} - /> - ) : null; - const tag = useSelector(service, selectTag); return ( @@ -229,9 +220,7 @@ export const VcItem: React.FC = (props) => { - {verifiableCredential ? ( - selectableOrCheck - ) : ( + {!verifiableCredential && ( )} diff --git a/components/ui/themes/DefaultTheme.ts b/components/ui/themes/DefaultTheme.ts index c1390c2a17..495bf1c78f 100644 --- 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 index 94ef1f72f8..e8bc3ad691 100644 --- 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 index d7927e60fb..ee2fb534f0 100644 --- 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 index 9d5f1b5906..04b1e972e0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -54,7 +54,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", @@ -21180,8 +21180,8 @@ } }, "node_modules/react-native-openid4vp-ble": { - "version": "0.3.6", - "resolved": "git+ssh://git@github.com/mosip/tuvali.git#c01818c55c26b8589d301d0c66d8c4bc325bbd97", + "version": "0.3.7", + "resolved": "git+ssh://git@github.com/mosip/tuvali.git#e466de2e74efe902f01010183ad8c589882c0e57", "license": "MIT", "peerDependencies": { "react": "*", @@ -44132,8 +44132,8 @@ "requires": {} }, "react-native-openid4vp-ble": { - "version": "git+ssh://git@github.com/mosip/tuvali.git#c01818c55c26b8589d301d0c66d8c4bc325bbd97", - "from": "react-native-openid4vp-ble@github:mosip/tuvali#v0.3.6", + "version": "git+ssh://git@github.com/mosip/tuvali.git#e466de2e74efe902f01010183ad8c589882c0e57", + "from": "react-native-openid4vp-ble@github:mosip/tuvali#v0.3.7", "requires": {} }, "react-native-permissions": { diff --git a/package.json b/package.json index de1d6149c6..8ca68a7249 100644 --- 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 index c8800db3eb..c9543af34d 100644 --- a/screens/AppLayout.tsx +++ b/screens/AppLayout.tsx @@ -20,11 +20,6 @@ export const AppLayout: React.FC = () => { title: '', headerTitleAlign: 'center', headerShadowVisible: false, - headerRight: () => ( - } - /> - ), headerBackVisible: false, }; diff --git a/screens/MainLayout.tsx b/screens/MainLayout.tsx index 28ab8042e3..2a456c1472 100644 --- a/screens/MainLayout.tsx +++ b/screens/MainLayout.tsx @@ -18,11 +18,6 @@ export const MainLayout: React.FC = () => { const options: BottomTabNavigationOptions = { headerLeft: () => , headerLeftContainerStyle: { paddingStart: 16 }, - headerRight: () => ( - } - /> - ), headerRightContainerStyle: { paddingEnd: 16 }, headerTitleAlign: 'center', tabBarShowLabel: false, diff --git a/screens/Profile/ProfileScreen.tsx b/screens/Profile/ProfileScreen.tsx index 25e897cdb9..1d8d1bc3d0 100644 --- a/screens/Profile/ProfileScreen.tsx +++ b/screens/Profile/ProfileScreen.tsx @@ -22,6 +22,12 @@ const LanguageSetting: React.FC = () => { + {t('language')} diff --git a/screens/Request/ReceiveVcScreen.tsx b/screens/Request/ReceiveVcScreen.tsx index fcb2d3e241..a8e46029b4 100644 --- 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} /> ) : (