From 27e2f07cd94a3060944fc1aafa00eeacc77e92a1 Mon Sep 17 00:00:00 2001 From: Anil kumar M <106086523+Anil-kumar-Majji@users.noreply.github.com> Date: Fri, 13 Oct 2023 15:23:50 +0530 Subject: [PATCH] Fix(INJI-431): Resolved that UI would support all screen sizes(folded-devices) & fixed language translation issues. (#920) * fix(MOSIP-29275): make usesCleartextTraffic to false for more secure communication (#886) * fix(MOSIP-29275): make usesCleartextTraffic to false for more secure communications * fix(MOSIP-29275): override usesCleartextTraffic to false in main manifest --------- Signed-off-by: Swati Goel Co-authored-by: Swati Goel Signed-off-by: anil_majji * MOSIP-29698 (#891) Signed-off-by: anil_majji * Inji-409: debugging setup fix (#893) * feat(inji-400): update package-lock.json * feat(inji-400): move flipper config to separate file from app.ts Signed-off-by: anil_majji * feat(inji-398): enable cleartextTrafficPermitted in debug mode (#895) Signed-off-by: anil_majji * fix(INJI-397)error message for deleted vcfile (#875) * fix(INJI-397)error message for deleted vcfile * fix(INJI-397)refactor:log activity event * fix(INJI-397)refactor:log activity event * fix(INJI-397)refactor:comparing VCMetadata Signed-off-by: anil_majji * fix(MOSIP-29272): remove paste option for pin inputs (#894) Signed-off-by: anil_majji * Test runner support to run jar MOSIP-29698 (#898) * MOSIP-29698 * Test runner support to run jar MOSIP-29698 * Update TestData.json Signed-off-by: neeharikatech <76684248+neeharikatech@users.noreply.github.com> --------- Signed-off-by: neeharikatech <76684248+neeharikatech@users.noreply.github.com> Signed-off-by: anil_majji * feat(inji-406): add logs for debugging tampered vc issues (#900) Signed-off-by: anil_majji * Adjusted bottom tab for different screen sizes Signed-off-by: anil_majji * Added responsive bottom line for ID input Signed-off-by: anil_majji * Updated the missing texts with case sensitive Signed-off-by: anil_majji * Removed unused button text in Welcome screen Signed-off-by: anil_majji --------- Signed-off-by: Swati Goel Signed-off-by: anil_majji Signed-off-by: neeharikatech <76684248+neeharikatech@users.noreply.github.com> Co-authored-by: Sreenadh S <32409698+sree96@users.noreply.github.com> Co-authored-by: Swati Goel Co-authored-by: neeharikatech <76684248+neeharikatech@users.noreply.github.com> Co-authored-by: Tilak Puli <34330361+tilak-puli@users.noreply.github.com> Co-authored-by: srikanth716 <97477121+srikanth716@users.noreply.github.com> --- .../MosipVCItemActivationStatus.tsx | 5 +- .../VC/MosipVCItem/MosipVCItemDetails.tsx | 6 +-- components/ui/themes/DefaultTheme.ts | 25 +++++++-- components/ui/themes/PurpleTheme.ts | 25 +++++++-- locales/ara.json | 13 +++-- locales/en.json | 15 +++--- locales/fil.json | 11 ++-- locales/hin.json | 13 +++-- locales/kan.json | 9 ++-- locales/spa.json | 29 ++++------ locales/tam.json | 11 ++-- screens/Home/MyVcs/IdInputModal.tsx | 54 ++++++++----------- screens/QrLogin/MyBindedVcs.tsx | 2 +- screens/QrLogin/QrConsent.tsx | 28 +++++----- screens/QrLogin/QrLogin.tsx | 2 +- screens/QrLogin/QrLoginSuccessMessage.tsx | 28 +++++----- screens/QrLogin/QrLoginWarning.tsx | 24 ++++----- screens/WelcomeScreen.tsx | 4 +- 18 files changed, 154 insertions(+), 150 deletions(-) diff --git a/components/VC/MosipVCItem/MosipVCItemActivationStatus.tsx b/components/VC/MosipVCItem/MosipVCItemActivationStatus.tsx index 74dcba2b..4da98188 100644 --- a/components/VC/MosipVCItem/MosipVCItemActivationStatus.tsx +++ b/components/VC/MosipVCItem/MosipVCItemActivationStatus.tsx @@ -16,9 +16,10 @@ const WalletUnverifiedIcon: React.FC = () => { size={Theme.ICON_MID_SIZE} type="material-community" containerStyle={{ - marginStart: 10, + marginStart: 1, + marginEnd: 1, bottom: 1, - marginLeft: 10, + marginRight: -2, }} /> ); diff --git a/components/VC/MosipVCItem/MosipVCItemDetails.tsx b/components/VC/MosipVCItem/MosipVCItemDetails.tsx index 124f8e9e..52e057ab 100644 --- a/components/VC/MosipVCItem/MosipVCItemDetails.tsx +++ b/components/VC/MosipVCItem/MosipVCItemDetails.tsx @@ -68,14 +68,14 @@ export const MosipVCItemDetails: React.FC< } return ( - + - + - + = props => { style={Theme.TextStyles.retrieveIdLabel}> {t('guideLabel')} - - + + = props => { - - - + diff --git a/screens/QrLogin/MyBindedVcs.tsx b/screens/QrLogin/MyBindedVcs.tsx index 99927691..06207d35 100644 --- a/screens/QrLogin/MyBindedVcs.tsx +++ b/screens/QrLogin/MyBindedVcs.tsx @@ -10,7 +10,7 @@ import {VcItemContainer} from '../../components/VC/VcItemContainer'; export const MyBindedVcs: React.FC = props => { const controller = useQrLogin(props); - const {t} = useTranslation('QrScreen'); + const {t} = useTranslation('QrLogin'); return ( = (props) => { - const { t } = useTranslation('QrScreen'); +export const QrConsent: React.FC = props => { + const {t} = useTranslation('QrLogin'); const controller = useQrLogin(props); return ( @@ -24,14 +24,14 @@ export const QrConsent: React.FC = (props) => { fill align="space-between" padding="24 24 0 24" - style={{ display: props.isVisible ? 'flex' : 'none' }} + style={{display: props.isVisible ? 'flex' : 'none'}} backgroundColor={Theme.Colors.lightGreyBackgroundColor}> {controller.linkTransactionResponse && ( )} diff --git a/screens/QrLogin/QrLogin.tsx b/screens/QrLogin/QrLogin.tsx index fc2551cb..f2886e00 100644 --- a/screens/QrLogin/QrLogin.tsx +++ b/screens/QrLogin/QrLogin.tsx @@ -14,7 +14,7 @@ import {View} from 'react-native'; export const QrLogin: React.FC = props => { const controller = useQrLogin(props); - const {t} = useTranslation('QrScreen'); + const {t} = useTranslation('QrLogin'); return ( = (props) => { - const { t } = useTranslation('QrScreen'); +export const QrLoginSuccess: React.FC = props => { + const {t} = useTranslation('QrLogin'); const controller = useQrLogin(props); return ( @@ -22,11 +22,11 @@ export const QrLoginSuccess: React.FC = (props) => { + style={{display: props.isVisible ? 'flex' : 'none'}}> = (props) => { diff --git a/screens/QrLogin/QrLoginWarning.tsx b/screens/QrLogin/QrLoginWarning.tsx index 6314aa17..0c422fdf 100644 --- a/screens/QrLogin/QrLoginWarning.tsx +++ b/screens/QrLogin/QrLoginWarning.tsx @@ -1,16 +1,16 @@ import React from 'react'; -import { useTranslation } from 'react-i18next'; -import { Button, Column, Row } from '../../components/ui'; -import { Theme } from '../../components/ui/styleUtils'; -import { Text } from '../../components/ui'; -import { Icon } from 'react-native-elements'; -import { useQrLogin } from './QrLoginController'; -import { Modal } from '../../components/ui/Modal'; -import { Dimensions, Image } from 'react-native'; -import { QrLoginRef } from '../../machines/QrLoginMachine'; +import {useTranslation} from 'react-i18next'; +import {Button, Column, Row} from '../../components/ui'; +import {Theme} from '../../components/ui/styleUtils'; +import {Text} from '../../components/ui'; +import {Icon} from 'react-native-elements'; +import {useQrLogin} from './QrLoginController'; +import {Modal} from '../../components/ui/Modal'; +import {Dimensions, Image} from 'react-native'; +import {QrLoginRef} from '../../machines/QrLoginMachine'; -export const QrLoginWarning: React.FC = (props) => { - const { t } = useTranslation('QrScreen'); +export const QrLoginWarning: React.FC = props => { + const {t} = useTranslation('QrLogin'); const controller = useQrLogin(props); return ( @@ -24,7 +24,7 @@ export const QrLoginWarning: React.FC = (props) => { fill align="space-between" padding={'21 0 0 0'} - style={{ display: props.isVisible ? 'flex' : 'none' }} + style={{display: props.isVisible ? 'flex' : 'none'}} backgroundColor={Theme.Colors.lightGreyBackgroundColor}> diff --git a/screens/WelcomeScreen.tsx b/screens/WelcomeScreen.tsx index 3665c865..875ea97d 100644 --- a/screens/WelcomeScreen.tsx +++ b/screens/WelcomeScreen.tsx @@ -18,9 +18,9 @@ export const WelcomeScreen: React.FC = props => {