From 1d849419f4c27094165fe013d0a963fb635d7a5b Mon Sep 17 00:00:00 2001 From: Sri Kanth Kola Date: Fri, 24 Nov 2023 16:57:52 +0530 Subject: [PATCH] fix(INJI-550):rendering issues Signed-off-by: Sri Kanth Kola --- components/CopyButton.tsx | 2 +- components/ui/themes/DefaultTheme.ts | 4 +-- components/ui/themes/PurpleTheme.ts | 5 ++- routes/index.ts | 23 ++++++++------ screens/Home/MyVcs/IdInputModal.tsx | 5 +-- screens/Settings/AboutInji.tsx | 42 ++++++++++++++++++++------ shared/telemetry/TelemetryConstants.js | 2 ++ 7 files changed, 56 insertions(+), 27 deletions(-) diff --git a/components/CopyButton.tsx b/components/CopyButton.tsx index 5427aaa8ed..f48eb41c26 100644 --- a/components/CopyButton.tsx +++ b/components/CopyButton.tsx @@ -25,7 +25,7 @@ export const CopyButton: React.FC = ({content}) => { style={{marginRight: 2}} size={19} /> - + {buttonText} diff --git a/components/ui/themes/DefaultTheme.ts b/components/ui/themes/DefaultTheme.ts index a8fb0f1698..eb9ea90bb1 100644 --- a/components/ui/themes/DefaultTheme.ts +++ b/components/ui/themes/DefaultTheme.ts @@ -418,7 +418,7 @@ export const DefaultTheme = { backgroundColor: Colors.LightOrange, }, receiveCardsContainer: { - height: Dimensions.get('window').height * 0.12, + minHeight: Dimensions.get('window').height * 0.17, width: Dimensions.get('window').width * 0.47, alignItems: 'center', borderBottomRightRadius: 0, @@ -471,7 +471,7 @@ export const DefaultTheme = { }, iconContainer: { flexDirection: 'row', - alignItems: 'flex-end', + alignItems: 'center', }, scannerContainer: { borderRadius: 24, diff --git a/components/ui/themes/PurpleTheme.ts b/components/ui/themes/PurpleTheme.ts index 0975c478e9..14db5fccac 100644 --- a/components/ui/themes/PurpleTheme.ts +++ b/components/ui/themes/PurpleTheme.ts @@ -422,7 +422,7 @@ export const PurpleTheme = { backgroundColor: Colors.LightPurple, }, receiveCardsContainer: { - height: Dimensions.get('window').height * 0.12, + height: Dimensions.get('window').height * 0.17, width: Dimensions.get('window').width * 0.47, alignItems: 'center', borderBottomRightRadius: 0, @@ -475,7 +475,7 @@ export const PurpleTheme = { }, iconContainer: { flexDirection: 'row', - alignItems: 'flex-end', + alignItems: 'center', }, scannerContainer: { borderRadius: 24, @@ -806,7 +806,6 @@ export const PurpleTheme = { borderRadius: 9, width: Dimensions.get('window').width * 0.72, alignSelf: 'center', - margin: 3, height: 54, }, float: { diff --git a/routes/index.ts b/routes/index.ts index f14009a30c..abb38585be 100644 --- a/routes/index.ts +++ b/routes/index.ts @@ -3,21 +3,24 @@ import { NativeStackNavigationOptions, NativeStackScreenProps, } from '@react-navigation/native-stack'; -import { AuthScreen } from '../screens/AuthScreen'; -import { BiometricScreen } from '../screens/BiometricScreen'; -import { WelcomeScreen } from '../screens/WelcomeScreen'; -import { PasscodeScreen } from '../screens/PasscodeScreen'; -import { MainLayout } from '../screens/MainLayout'; -import { NotificationsScreen } from '../screens/NotificationsScreen'; -import { SetupLanguageScreen } from '../screens/SetupLanguageScreen'; -import { IntroSlidersScreen } from '../screens/Home/IntroSlidersScreen'; -import { RequestLayout } from '../screens/Request/RequestLayout'; -import { RequestStackParamList } from '../screens/Request/RequestLayoutController'; +import {AuthScreen} from '../screens/AuthScreen'; +import {BiometricScreen} from '../screens/BiometricScreen'; +import {WelcomeScreen} from '../screens/WelcomeScreen'; +import {PasscodeScreen} from '../screens/PasscodeScreen'; +import {MainLayout} from '../screens/MainLayout'; +import {NotificationsScreen} from '../screens/NotificationsScreen'; +import {SetupLanguageScreen} from '../screens/SetupLanguageScreen'; +import {IntroSlidersScreen} from '../screens/Home/IntroSlidersScreen'; +import {RequestLayout} from '../screens/Request/RequestLayout'; +import {RequestStackParamList} from './routesConstants'; export const baseRoutes: Screen[] = [ { name: 'Language', component: SetupLanguageScreen, + options: { + headerShown: false, + }, }, { name: 'IntroSliders', diff --git a/screens/Home/MyVcs/IdInputModal.tsx b/screens/Home/MyVcs/IdInputModal.tsx index 9e674292a9..49e8b9ae5a 100644 --- a/screens/Home/MyVcs/IdInputModal.tsx +++ b/screens/Home/MyVcs/IdInputModal.tsx @@ -92,7 +92,7 @@ export const IdInputModal: React.FC = props => { type="gradient" title={t('generateVc')} disabled={!controller.id} - margin="24 0 6 0" + margin="5 0" onPress={controller.VALIDATE_INPUT} loading={controller.isRequestingOtp} /> @@ -110,7 +110,8 @@ export const IdInputModal: React.FC = props => { color={Theme.Colors.AddIdBtnBg} weight="bold" size="small" - margin="0 0 0 5"> + margin="0 0 0 5" + style={{maxWidth: 250}}> {t('getItHere')} diff --git a/screens/Settings/AboutInji.tsx b/screens/Settings/AboutInji.tsx index e33b239525..cdd7b27fac 100644 --- a/screens/Settings/AboutInji.tsx +++ b/screens/Settings/AboutInji.tsx @@ -1,13 +1,12 @@ import React, {useEffect, useState} from 'react'; import {useTranslation} from 'react-i18next'; -import {Linking, Pressable, TouchableOpacity} from 'react-native'; +import {Dimensions, Linking, Pressable, TouchableOpacity} from 'react-native'; import {Modal} from '../../components/ui/Modal'; import {Column, Row, Text} from '../../components/ui'; import {Theme} from '../../components/ui/styleUtils'; import {Icon, ListItem} from 'react-native-elements'; import getAllConfigurations from '../../shared/commonprops/commonProps'; -import {getVersion} from 'react-native-device-info'; import {CopyButton} from '../../components/CopyButton'; import testIDProps from '../../shared/commonUtil'; import {__InjiVersion, __TuvaliVersion} from '../../shared/GlobalVariables'; @@ -57,20 +56,45 @@ export const AboutInji: React.FC = ({appId}) => { setShowAboutInji(!showAboutInji); }}> - - {t('appID')} : {appId} - + + + {t('appID')} + + + : {appId} + + - + {t('aboutDetailes')} - - + + {t('forMoreDetailes')} = ({appId}) => { }}> {t('clickHere')} diff --git a/shared/telemetry/TelemetryConstants.js b/shared/telemetry/TelemetryConstants.js index 59b52e481c..4bc8b38ca8 100644 --- a/shared/telemetry/TelemetryConstants.js +++ b/shared/telemetry/TelemetryConstants.js @@ -30,6 +30,7 @@ export const TelemetryConstants = { hardwareKeyStore: 'Some security features will be unavailable as hardware key store is not available', activationCancelled: 'Activation Cancelled', + appWasReset: 'App Was Reset', }), ErrorId: Object.freeze({ @@ -40,6 +41,7 @@ export const TelemetryConstants = { activationFailed: 'ACTIVATION_FAILED', tampered: 'TAMPERED', dataRetrieval: 'DATA_RETRIEVAL', + appWasReset: 'APP_WAS_RESET', }), Screens: Object.freeze({