diff --git a/.talismanrc b/.talismanrc index 2f241682..98ed0390 100644 --- a/.talismanrc +++ b/.talismanrc @@ -1,8 +1,6 @@ fileignoreconfig: - filename: package.json checksum: 5b4fcb5ddc7cc96cc2d1733b544d56ea66e88cdab995a1052fbf9ac0e9c2dc21 - - filename: package-lock.json - checksum: 0c4eec7fc90a92da92234caa4fa4828caf579d015a11daf38d9fa515c1f1f9bf - filename: lib/jsonld-signatures/suites/ed255192018/ed25519.ts checksum: 493b6e31144116cb612c24d98b97d8adcad5609c0a52c865a6847ced0a0ddc3a - filename: components/PasscodeVerify.tsx @@ -34,7 +32,7 @@ fileignoreconfig: - filename: shared/fileStorage.ts checksum: 2ba2721d9722cd9420ae26762316230f7dab1a0be45820cbda4d0ecae0edf957 - filename: screens/Issuers/IssuersScreen.tsx - checksum: 33c6c04320f822bb00343bcf4d5fa010177366ae44d8f64a280484d00616c8c6 + checksum: a323497d3276f0ef20ddd6b94d2238a895651d853c3d8f055acc3351dc72da0b - filename: screens/Home/MyVcs/GetIdInputModal.tsx checksum: 5c736ed79a372d0ffa7c02eb33d0dc06edbbb08d120978ff287f5f06cd6c7746 - filename: shared/openId4VCI/Utils.ts @@ -70,7 +68,7 @@ fileignoreconfig: - filename: android/app/build.gradle checksum: 8d5715e179a398518e6acff82c75b27077c9f893dc90b2972c77f9a09f10be95 - filename: .github/workflows/push-triggers.yml - checksum: 1461e21496ff0771b8ec8d6f25e77871191e91a2bca1934d1636df129ef2afbb + checksum: abc19ea38c8d7b79f15695d015709cc88a34a995181aaf12bc8344f940f3cbc4 - filename: android/fastlane/Fastfile checksum: a5e816489a80b0a7498f35b7a2919f2287d4307b660687c2a9c51412aa8eceb7 - filename: .github/workflows/internal-build.yml @@ -95,6 +93,8 @@ fileignoreconfig: checksum: e85d18cd3349e0127f1cc7173fcdfd31824e609508512a613997a73756cd4dec - filename: .github/workflows/android-custom-build.yml checksum: 4d155c6e5468effb0b82e62f6878f2bd7ff7e7c9540e16bdd28cb81b80672ac3 + - filename: .github/workflows/push-triggers.yml + checksum: 4a031b46646aa982c8f40e4c7fe0bd3e05a76a6af1ff1c2de7350ba6ebf9a839 - filename: components/VC/Views/VCCardViewContent.tsx checksum: 02655ff3d7f8a8ea4f3664485f98c961802c598242ec44408594a2ddb721fa5e - filename: screens/Settings/BackupController.tsx @@ -247,8 +247,6 @@ fileignoreconfig: checksum: 948efb4d61551e4f3cd9eb9913b927158daa5c3d16f49ad297e7cb63190bc023 - filename: machines/IssuersMachine.typegen.ts checksum: 959fef1e51f0f3d5b12933f7b362e96401fb776ab12f0d13c6e542918b2ff255 - - filename: screens/Home/MyVcsTab.tsx - checksum: f59c867c8f029ede26bdf3c2fe5feae92a79f9cb0c6ddd23627437765fdc4b3f - filename: machines/store.typegen.ts checksum: 077a1906c908daf79544f604632df36f3359075a7bc912e51ab5707cb178bf48 - filename: machines/VerifiableCredential/VCMetaMachine/VCMetaMachine.ts @@ -272,7 +270,7 @@ fileignoreconfig: - filename: machines/Issuers/IssuersService.ts checksum: e3832dff27687abc28609d2b281e570b4b0017995b7cfb56627a6b96949c469a - filename: screens/Home/ViewVcModal.tsx - checksum: 870fd6d53a3118cc120d3bb9d18698125a260e8f5673eddbb444e589bb3aacbd + checksum: cfb25d562185488432b76287c4ef93359c1c64d8e29f5755d4c0a726c1485442 - filename: injitest/src/main/resources/TestData.json checksum: 1b5af14c96b456898259b4cb7a5607b006404cf0360274bdc204d7d065698e3c - filename: injitest/src/test/java/androidTestCases/ActivateVcTest.java @@ -364,6 +362,8 @@ fileignoreconfig: checksum: 8f4bd61770b8bb0a28859ca0f3b4b095aed4e3fb5adef435cb74b9389ff13e09 - filename: ios/Inji.xcodeproj/project.pbxproj checksum: 5bb246fa39bc7a9994b50bc5b1505d5389d0e254a4e30cfb2a57e6a1025e9087 + - filename: screens/Settings/ReceivedCardsModal.tsx + checksum: 6dee9153a61009b0252d294154c88d5e1b241a517c76e930b391a39d7bc52392 - filename: components/FaceScanner/FaceCompare.tsx checksum: 947b6d75543e2bf959ca2d95dd7224051e0b4ec2c28f7515f923701e22a932f0 - filename: components/FaceScanner/LivenessDetection.tsx @@ -408,19 +408,12 @@ fileignoreconfig: checksum: 02f7d58fb149ecd3f10dd0bdfb6e85c4b3ae41d29a40d192056ffec0367b53c6 - filename: components/VC/Views/VCDetailView.tsx checksum: 890c216a5632ac77b938f2f58f2123a669ea45b933a41931b8e7324e315f2d50 - version: "1.0" - - filename: screens/Settings/SettingScreen.tsx - checksum: ce9c50ec1af107161c2a25e1481794aaa9898ff1998dff26bc7986c43a51c2fa - - filename: screens/IntroSliders/trustedDigitalWalletIntro.tsx - checksum: 4d46111af02fc8b6731f624d3e4f6ce71d6369649f4549564627a8962b136192 + - filename: package-lock.json + checksum: bb9c44dfa47bc6e1ff62c2e2f2293cf2fb5ff3eb1bfba27d3727992c2ae0dca7 + - filename: components/ui/SetupPicker.tsx + checksum: 669e85d1c8ff526b97fa4ed4b8ed33a100eaba9f2f41bceccd75dc7a85a12103 - filename: components/ui/Picker.tsx - checksum: ad814e904cb990f55068281fcb566cca349872de2c4fd66432ed6372fb540ec3 - - filename: components/VC/common/VcStatustooTip.tsx - checksum: 08097d6f18acf897c1b6f0479861399e5da630b95d2f5a0133e03edd9d28daa0 - - filename: sample-application/sample-application/app/src/main/java/com/example/samplecredentialwallet/utils/SecureKeyStoreManager.kt - checksum: d9c999da50bf114d2bdb73550f94ad77003f252d97dd5c2cd2f0f14c2f4004a0 - - filename: sample-application/sample-application/app/src/main/java/com/example/samplecredentialwallet/utils/CredentialParser.kt - checksum: bb910d0b02d8623c9f259a4e2a335dd8f9289c1949955538e65bab9179b09359 - - filename: screens/Settings/ReceivedCardsModal.tsx - checksum: 3d949ca267ab605562d3a99e14232fa292600c3c280b1cbec3bb5e7eba5adca8 -version: "1.0" + checksum: 5be293ee41d3e3bd5924320d63074d2c196d3163c99c39991632477ed9fcd871 + - filename: screens/Home/MyVcsTab.tsx + checksum: 68ff83c5d9062fbc077d008956fa654540253c52ce68d7105c175c51562b3dc9 + version: "1.0" diff --git a/App.tsx b/App.tsx index 942a3306..97228adf 100644 --- a/App.tsx +++ b/App.tsx @@ -31,7 +31,6 @@ import {CopilotProvider} from 'react-native-copilot'; import {CopilotTooltip} from './components/CopilotTooltip'; import {Theme} from './components/ui/styleUtils'; import {selectAppSetupComplete} from './machines/auth'; -import {SafeAreaProvider} from 'react-native-safe-area-context'; const {RNSecureKeystoreModule} = NativeModules; // kludge: this is a bad practice but has been done temporarily to surface @@ -60,8 +59,7 @@ const AppLayoutWrapper: React.FC = () => { const authService = appService.children.get('auth'); const isAppSetupComplete = useSelector(authService, selectAppSetupComplete); - const [isDeepLinkOverlayVisible, setDeepLinkOverlayVisible] = - useState(isDeepLinkFlow); + const [isDeepLinkOverlayVisible, setDeepLinkOverlayVisible] = useState(isDeepLinkFlow); useEffect(() => { if (AppState.currentState === 'active') { @@ -166,18 +164,16 @@ const AppInitialization: React.FC = () => { export default function App() { return ( - - - null} - animated> - - - - + + null} + animated> + + + ); } diff --git a/assets/Detailed_view_kebab_icon.svg b/assets/Detailed_view_kebab_icon.svg index 87ddc6b2..549b2cde 100644 --- a/assets/Detailed_view_kebab_icon.svg +++ b/assets/Detailed_view_kebab_icon.svg @@ -11,7 +11,7 @@ - + diff --git a/assets/Error_Toast_Icon.svg b/assets/Error_Toast_Icon.svg deleted file mode 100644 index d63b87a9..00000000 --- a/assets/Error_Toast_Icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/Expired_Status.svg b/assets/Expired_Status.svg deleted file mode 100644 index d7e66e54..00000000 --- a/assets/Expired_Status.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/Icon.svg b/assets/Icon.svg deleted file mode 100644 index 0ba0b8eb..00000000 --- a/assets/Icon.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/assets/Info_Toast_Icon.svg b/assets/Info_Toast_Icon.svg deleted file mode 100644 index a13e8497..00000000 --- a/assets/Info_Toast_Icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/Pending_Status.svg b/assets/Pending_Status.svg deleted file mode 100644 index fce240ff..00000000 --- a/assets/Pending_Status.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/Pin_Icon.svg b/assets/Pin_Icon.svg index b7f0f44c..49ef65d2 100644 --- a/assets/Pin_Icon.svg +++ b/assets/Pin_Icon.svg @@ -14,7 +14,7 @@ - + diff --git a/assets/Receive_Card.svg b/assets/Receive_Card.svg index af3bb506..446e1fad 100644 --- a/assets/Receive_Card.svg +++ b/assets/Receive_Card.svg @@ -8,6 +8,6 @@ - + diff --git a/assets/Revoked_Status.svg b/assets/Revoked_Status.svg deleted file mode 100644 index a4513b7a..00000000 --- a/assets/Revoked_Status.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/Selected_Check_Box.svg b/assets/Selected_Check_Box.svg index 8e3b99c6..d6d11c13 100644 --- a/assets/Selected_Check_Box.svg +++ b/assets/Selected_Check_Box.svg @@ -1,7 +1,7 @@ - + diff --git a/assets/Success_Toast_Icon.svg b/assets/Success_Toast_Icon.svg deleted file mode 100644 index 6afd47c5..00000000 --- a/assets/Success_Toast_Icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/assets/Valid_Status.svg b/assets/Valid_Status.svg deleted file mode 100644 index 12a0739f..00000000 --- a/assets/Valid_Status.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/assets/Warning_Toast_Icon.svg b/assets/Warning_Toast_Icon.svg deleted file mode 100644 index e8795c46..00000000 --- a/assets/Warning_Toast_Icon.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/components/BannerNotification.tsx b/components/BannerNotification.tsx index 167facf9..d9293cb0 100644 --- a/components/BannerNotification.tsx +++ b/components/BannerNotification.tsx @@ -1,36 +1,30 @@ import React from 'react'; -import {Pressable, StatusBar, View} from 'react-native'; +import {Pressable, View} from 'react-native'; import {Column, Row, Text} from './ui'; import {Theme} from './ui/styleUtils'; import {Icon} from 'react-native-elements'; import testIDProps from '../shared/commonUtil'; -import ErrorToastIcon from '../assets/Error_Toast_Icon.svg'; -import InfoToastIcon from '../assets/Info_Toast_Icon.svg'; -import SuccessToastIcon from '../assets/Success_Toast_Icon.svg'; export const BannerNotification: React.FC = props => { return ( - + - - {props.type === BannerStatusType.SUCCESS && } - {props.type === BannerStatusType.ERROR && } - {props.type === BannerStatusType.IN_PROGRESS && } + {props.message} - + - + diff --git a/components/BannerNotificationContainer.tsx b/components/BannerNotificationContainer.tsx index 22ed2475..5c058170 100644 --- a/components/BannerNotificationContainer.tsx +++ b/components/BannerNotificationContainer.tsx @@ -33,11 +33,11 @@ export const BannerNotificationContainer: React.FC< bannerNotificationController.verificationStatus || null; return ( - + <> {settingsScreenController.isKeyOrderSet === true && ( - + + + + + )} - + ); }; diff --git a/components/BiometricIcon.tsx b/components/BiometricIcon.tsx deleted file mode 100644 index 98275045..00000000 --- a/components/BiometricIcon.tsx +++ /dev/null @@ -1,18 +0,0 @@ -import React from 'react'; -import {isIOS} from '../shared/constants'; -import {SvgImage} from './ui/svg'; -import {View} from 'react-native'; - -interface BiometricIconProps { - size?: number; -} - -const BiometricIcon: React.FC = ({size = 66}) => { - const Icon = isIOS() - ? SvgImage.faceBiometicIcon(size) - : SvgImage.fingerprintIcon(size); - - return {Icon}; -}; - -export default BiometricIcon; diff --git a/components/HelpScreen.tsx b/components/HelpScreen.tsx index d85f7471..eca6c9cd 100644 --- a/components/HelpScreen.tsx +++ b/components/HelpScreen.tsx @@ -1,12 +1,11 @@ import React, {useEffect, useRef, useState} from 'react'; import {useTranslation} from 'react-i18next'; -import {FlatList, Linking, Pressable, View} from 'react-native'; +import {FlatList, Linking, Pressable, SafeAreaView, View} from 'react-native'; import {Modal} from './ui/Modal'; import {Column, Text} from './ui'; import {Theme} from './ui/styleUtils'; import {BannerNotificationContainer} from './BannerNotificationContainer'; import getAllConfigurations from '../shared/api'; -import {SafeAreaView} from "react-native-safe-area-context"; export const HelpScreen: React.FC = props => { const {t} = useTranslation('HelpScreen'); @@ -363,8 +362,8 @@ export const HelpScreen: React.FC = props => { onDismiss={() => { setShowHelpPage(!showHelpPage); }}> - - + + = props => { const controller = useKebabPopUp(props); - const { t } = useTranslation('HomeScreenKebabPopUp'); + const {t} = useTranslation('HomeScreenKebabPopUp'); return ( @@ -52,14 +52,14 @@ export const KebabPopUp: React.FC = props => { ( + renderItem={({item}) => ( - - + + {item.icon} = props => { margin="0 0 0 10"> {item.label} - {item.label === t('reverify') && ({t('new')})} + {item.label === t('reverify') && ( + + + {t('new')} + + + )} )} diff --git a/components/Toggle.tsx b/components/Toggle.tsx deleted file mode 100644 index d1bb1992..00000000 --- a/components/Toggle.tsx +++ /dev/null @@ -1,40 +0,0 @@ -import React from 'react'; -import {View} from 'react-native'; -import SwitchToggle from 'react-native-switch-toggle'; -import {Theme} from './ui/styleUtils'; -import testIDProps from '../shared/commonUtil'; - -interface ShareToggleProps { - value: boolean; - onToggle: (value: boolean) => void; - testID?: string; -} - -const Toggle: React.FC = ({value, onToggle, testID}) => { - return ( - - onToggle(value)} - circleColorOff={Theme.Colors.switchHead} - circleColorOn={Theme.Colors.switchCircleOff} - backgroundColorOn={Theme.Colors.switchHead} - backgroundColorOff={Theme.Colors.whiteBackgroundColor} - containerStyle={Theme.Styles.container} - circleStyle={Theme.Styles.circle} - /> - - ); -}; - -export default Toggle; diff --git a/components/VC/Views/VCDetailView.tsx b/components/VC/Views/VCDetailView.tsx index 589edc67..1843d1c4 100644 --- a/components/VC/Views/VCDetailView.tsx +++ b/components/VC/Views/VCDetailView.tsx @@ -302,7 +302,7 @@ export const VCDetailView: React.FC = ( = ( = ( testID="profileAuthenticated" color={Theme.Colors.statusLabel} style={{ - fontFamily: 'Montserrat_600SemiBold', + fontFamily: 'Inter_600SemiBold', fontSize: 14, }} margin={'0 18 0 0'}> @@ -379,7 +379,7 @@ export const VCDetailView: React.FC = ( style={{ color: '#007AFF', fontSize: 16, - fontFamily: 'Montserrat_500Medium', + fontFamily: 'Inter_500Medium', }}> {t('View Shareable Information')} diff --git a/components/VC/common/VCItemField.tsx b/components/VC/common/VCItemField.tsx index 6aa231e0..a485d9ff 100644 --- a/components/VC/common/VCItemField.tsx +++ b/components/VC/common/VCItemField.tsx @@ -35,6 +35,8 @@ export const VCItemFieldName = ({ {fieldName == STATUS_FIELD_NAME && ( } diff --git a/components/VC/common/VcStatustooTip.tsx b/components/VC/common/VcStatustooTip.tsx index 503b2658..de43c3fe 100644 --- a/components/VC/common/VcStatustooTip.tsx +++ b/components/VC/common/VcStatustooTip.tsx @@ -1,56 +1,30 @@ -import React from 'react'; -import {useTranslation} from 'react-i18next'; -import {View} from 'react-native'; -import {Column, Row} from '../../ui'; -import {Theme} from '../../ui/styleUtils'; -import {Text} from '../../ui'; -import {VC_STATUS_KEYS} from './VCUtils'; -import ExpiredStatus from '../../../assets/Expired_Status.svg'; -import RevokedStatus from '../../../assets/Revoked_Status.svg'; -import ValidStatus from '../../../assets/Valid_Status.svg'; -import PendingStatus from '../../../assets/Pending_Status.svg'; - -const statusIcons: Record> = { - valid: ValidStatus, - pending: PendingStatus, - expired: ExpiredStatus, - revoked: RevokedStatus, -}; +import React from "react"; +import { useTranslation } from "react-i18next"; +import { View } from "react-native"; +import { Column } from "../../ui"; +import { Theme } from "../../ui/styleUtils"; +import { Text } from "../../ui"; +import { VC_STATUS_KEYS } from "./VCUtils"; export const StatusTooltipContent = () => { - const {t} = useTranslation('ViewVcModal'); - - return ( - - {VC_STATUS_KEYS.map((key, index) => { - const IconComponent = statusIcons[key]; - const isLast = index === VC_STATUS_KEYS.length - 1; - return ( - - - - - - - {t(`statusToolTipContent.${key}.title`)} - - - {t(`statusToolTipContent.${key}.description`)} - - - - ); - })} - - ); -}; + const { t } = useTranslation('ViewVcModal'); + + return ( + + {VC_STATUS_KEYS.map(key => ( + + {t(`statusToolTipContent.${key}.title`)} + + {t(`statusToolTipContent.${key}.description`)} + + + ))} + + ); + }; + \ No newline at end of file diff --git a/components/VCVerification.tsx b/components/VCVerification.tsx index 8ee4d765..e59a4585 100644 --- a/components/VCVerification.tsx +++ b/components/VCVerification.tsx @@ -1,21 +1,20 @@ import React from 'react'; -import { View } from 'react-native'; +import {View} from 'react-native'; import testIDProps from '../shared/commonUtil'; -import { Display } from './VC/common/VCUtils'; +import {Display} from './VC/common/VCUtils'; import VerifiedIcon from './VerifiedIcon'; import PendingIcon from './PendingIcon'; -import { Row, Text } from './ui'; -import { Theme } from './ui/styleUtils'; -import { useTranslation } from 'react-i18next'; -import { VCMetadata } from '../shared/VCMetadata'; -import { formattedDate } from '../shared/openId4VCI/Utils'; +import {Row, Text} from './ui'; +import {Theme} from './ui/styleUtils'; +import {useTranslation} from 'react-i18next'; +import {VCMetadata} from '../shared/VCMetadata'; export const VCVerification: React.FC = ({ vcMetadata, display, showLastChecked = true, }) => { - const { t } = useTranslation('VcDetails'); + const {t} = useTranslation('VcDetails'); let statusText: string; let statusIcon: JSX.Element; @@ -45,7 +44,7 @@ export const VCVerification: React.FC = ({ paddingVertical: 6, }}> {/* First Row: Status Icon + Text */} - + {statusIcon} = ({ {showLastChecked && vcMetadata.lastKnownStatusTimestamp && ( - + {t('lastChecked')} @@ -71,9 +70,9 @@ export const VCVerification: React.FC = ({ color={display.getTextColor(Theme.Colors.Details)} style={[ Theme.Styles.verificationStatus, - {fontFamily: 'Montserrat_400Regular'}, + {fontFamily: 'Inter_400'}, ]}> - {formattedDate(vcMetadata.lastKnownStatusTimestamp)} + {new Date(vcMetadata.lastKnownStatusTimestamp).toLocaleString()} )} diff --git a/components/__snapshots__/AccountInformation.test.tsx.snap b/components/__snapshots__/AccountInformation.test.tsx.snap index 9b9244cd..35ba47fe 100644 --- a/components/__snapshots__/AccountInformation.test.tsx.snap +++ b/components/__snapshots__/AccountInformation.test.tsx.snap @@ -129,7 +129,7 @@ exports[`AccountInformation Component should match snapshot with different email "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -182,7 +182,7 @@ exports[`AccountInformation Component should match snapshot with different email "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -334,7 +334,7 @@ exports[`AccountInformation Component should match snapshot with different pictu "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -387,7 +387,7 @@ exports[`AccountInformation Component should match snapshot with different pictu "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -539,7 +539,7 @@ exports[`AccountInformation Component should match snapshot with email and pictu "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -592,7 +592,7 @@ exports[`AccountInformation Component should match snapshot with email and pictu "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -744,7 +744,7 @@ exports[`AccountInformation Component should match snapshot with long email 1`] "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -797,7 +797,7 @@ exports[`AccountInformation Component should match snapshot with long email 1`] "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, diff --git a/components/__snapshots__/BannerNotification.test.tsx.snap b/components/__snapshots__/BannerNotification.test.tsx.snap index b09b0021..9f49314c 100644 --- a/components/__snapshots__/BannerNotification.test.tsx.snap +++ b/components/__snapshots__/BannerNotification.test.tsx.snap @@ -4,12 +4,6 @@ exports[`BannerNotification Component should match snapshot with different testI - - - - - -`; +exports[`BannerNotificationContainer Component should match snapshot with no banners visible 1`] = `null`; -exports[`BannerNotificationContainer Component should match snapshot with verification banner disabled 1`] = ` - -`; +exports[`BannerNotificationContainer Component should match snapshot with verification banner disabled 1`] = `null`; -exports[`BannerNotificationContainer Component should match snapshot with verification banner enabled 1`] = ` - -`; +exports[`BannerNotificationContainer Component should match snapshot with verification banner enabled 1`] = `null`; diff --git a/components/__snapshots__/CopyButton.test.tsx.snap b/components/__snapshots__/CopyButton.test.tsx.snap index f24ed1d6..7f320b76 100644 --- a/components/__snapshots__/CopyButton.test.tsx.snap +++ b/components/__snapshots__/CopyButton.test.tsx.snap @@ -67,7 +67,7 @@ exports[`CopyButton Component should match snapshot with default props 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 15, }, null, @@ -156,7 +156,7 @@ exports[`CopyButton Component should match snapshot with long content 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 15, }, null, @@ -245,7 +245,7 @@ exports[`CopyButton Component should match snapshot with special characters 1`] "lineHeight": 18, }, { - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 15, }, null, diff --git a/components/__snapshots__/DualMessageOverlay.test.tsx.snap b/components/__snapshots__/DualMessageOverlay.test.tsx.snap index d60cf44a..5a0b98fe 100644 --- a/components/__snapshots__/DualMessageOverlay.test.tsx.snap +++ b/components/__snapshots__/DualMessageOverlay.test.tsx.snap @@ -13,7 +13,7 @@ exports[`DualMessageOverlay Component should match snapshot with both buttons 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 15, "justifyContent": "center", }, @@ -42,7 +42,7 @@ exports[`DualMessageOverlay Component should match snapshot with both buttons 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 15, "justifyContent": "center", }, @@ -103,7 +103,7 @@ exports[`DualMessageOverlay Component should match snapshot with only ignore but "lineHeight": 18, }, { - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 15, "justifyContent": "center", }, @@ -139,7 +139,7 @@ exports[`DualMessageOverlay Component should match snapshot with only try again "lineHeight": 18, }, { - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 15, "justifyContent": "center", }, diff --git a/components/__snapshots__/HelpScreen.test.tsx.snap b/components/__snapshots__/HelpScreen.test.tsx.snap index 340519ef..cbe83729 100644 --- a/components/__snapshots__/HelpScreen.test.tsx.snap +++ b/components/__snapshots__/HelpScreen.test.tsx.snap @@ -37,19 +37,10 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` Help , - @@ -95,7 +86,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -112,7 +103,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -123,8 +114,8 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -140,7 +131,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -152,7 +143,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -164,7 +155,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -181,7 +172,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -198,7 +189,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -215,7 +206,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -232,7 +223,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -243,8 +234,8 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -260,7 +251,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -277,7 +268,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -288,8 +279,8 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -305,7 +296,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -316,8 +307,8 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -328,7 +319,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -345,7 +336,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -362,7 +353,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -379,7 +370,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -396,7 +387,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -413,7 +404,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -424,8 +415,8 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -436,7 +427,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -453,7 +444,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -470,7 +461,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -487,7 +478,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -504,7 +495,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -521,7 +512,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -538,7 +529,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -555,7 +546,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -572,7 +563,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -589,7 +580,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -606,7 +597,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -623,7 +614,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -640,7 +631,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -657,7 +648,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -674,7 +665,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -691,7 +682,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -708,7 +699,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -725,7 +716,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -771,7 +762,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -782,7 +773,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -802,7 +793,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -813,7 +804,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -839,7 +830,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -850,7 +841,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -870,7 +861,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -881,7 +872,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -899,7 +890,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -909,8 +900,8 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -935,7 +926,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -946,7 +937,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -966,7 +957,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -977,7 +968,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -995,7 +986,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1006,7 +997,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -1024,7 +1015,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1035,7 +1026,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -1061,7 +1052,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1072,7 +1063,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -1092,7 +1083,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1103,7 +1094,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -1129,7 +1120,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1140,7 +1131,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -1160,7 +1151,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1171,7 +1162,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -1197,7 +1188,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1208,7 +1199,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -1228,7 +1219,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1239,7 +1230,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -1265,7 +1256,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1276,7 +1267,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -1296,7 +1287,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1307,7 +1298,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -1325,7 +1316,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1335,8 +1326,8 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -1361,7 +1352,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1372,7 +1363,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -1392,7 +1383,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1403,7 +1394,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -1429,7 +1420,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1440,7 +1431,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -1460,7 +1451,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1471,7 +1462,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -1489,7 +1480,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1499,8 +1490,8 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -1525,7 +1516,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1536,7 +1527,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -1556,7 +1547,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1567,7 +1558,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -1585,7 +1576,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1595,8 +1586,8 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -1613,7 +1604,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1624,7 +1615,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -1645,7 +1636,7 @@ exports[`HelpScreen Component should match snapshot when disabled 1`] = ` - , + , ] `; @@ -1686,19 +1677,10 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` Help , - @@ -1744,7 +1726,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -1761,7 +1743,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -1772,8 +1754,8 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -1789,7 +1771,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -1801,7 +1783,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -1813,7 +1795,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -1830,7 +1812,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -1847,7 +1829,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -1864,7 +1846,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -1881,7 +1863,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -1892,8 +1874,8 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -1909,7 +1891,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -1926,7 +1908,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -1937,8 +1919,8 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -1954,7 +1936,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -1965,8 +1947,8 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -1977,7 +1959,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -1994,7 +1976,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2011,7 +1993,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2028,7 +2010,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2045,7 +2027,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2062,7 +2044,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2073,8 +2055,8 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -2085,7 +2067,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2102,7 +2084,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2119,7 +2101,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2136,7 +2118,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2153,7 +2135,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2170,7 +2152,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2187,7 +2169,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2204,7 +2186,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2221,7 +2203,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2238,7 +2220,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2255,7 +2237,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2272,7 +2254,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2289,7 +2271,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2306,7 +2288,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2323,7 +2305,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2340,7 +2322,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2357,7 +2339,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2374,7 +2356,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -2420,7 +2402,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2431,7 +2413,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -2451,7 +2433,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2462,7 +2444,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -2488,7 +2470,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2499,7 +2481,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -2519,7 +2501,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2530,7 +2512,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -2548,7 +2530,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2558,8 +2540,8 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -2584,7 +2566,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2595,7 +2577,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -2615,7 +2597,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2626,7 +2608,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -2644,7 +2626,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2655,7 +2637,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -2673,7 +2655,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2684,7 +2666,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -2710,7 +2692,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2721,7 +2703,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -2741,7 +2723,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2752,7 +2734,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -2778,7 +2760,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2789,7 +2771,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -2809,7 +2791,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2820,7 +2802,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -2846,7 +2828,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2857,7 +2839,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -2877,7 +2859,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2888,7 +2870,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -2914,7 +2896,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2925,7 +2907,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -2945,7 +2927,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2956,7 +2938,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -2974,7 +2956,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -2984,8 +2966,8 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -3010,7 +2992,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -3021,7 +3003,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -3041,7 +3023,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -3052,7 +3034,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -3078,7 +3060,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -3089,7 +3071,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -3109,7 +3091,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -3120,7 +3102,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -3138,7 +3120,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -3148,8 +3130,8 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -3174,7 +3156,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -3185,7 +3167,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -3205,7 +3187,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -3216,7 +3198,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -3234,7 +3216,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -3244,8 +3226,8 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -3262,7 +3244,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -3273,7 +3255,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -3294,7 +3276,7 @@ exports[`HelpScreen Component should match snapshot with BackUp source 1`] = ` - , + , ] `; @@ -3335,19 +3317,10 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` Help , - @@ -3393,7 +3366,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3410,7 +3383,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3421,8 +3394,8 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -3438,7 +3411,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3450,7 +3423,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3462,7 +3435,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3479,7 +3452,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3496,7 +3469,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3513,7 +3486,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3530,7 +3503,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3541,8 +3514,8 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -3558,7 +3531,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3575,7 +3548,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3586,8 +3559,8 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -3603,7 +3576,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3614,8 +3587,8 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -3626,7 +3599,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3643,7 +3616,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3660,7 +3633,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3677,7 +3650,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3694,7 +3667,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3711,7 +3684,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3722,8 +3695,8 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -3734,7 +3707,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3751,7 +3724,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3768,7 +3741,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3785,7 +3758,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3802,7 +3775,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3819,7 +3792,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3836,7 +3809,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3853,7 +3826,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3870,7 +3843,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3887,7 +3860,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3904,7 +3877,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3921,7 +3894,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3938,7 +3911,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3955,7 +3928,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3972,7 +3945,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -3989,7 +3962,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -4006,7 +3979,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -4023,7 +3996,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -4069,7 +4042,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4080,7 +4053,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -4100,7 +4073,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4111,7 +4084,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -4137,7 +4110,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4148,7 +4121,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -4168,7 +4141,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4179,7 +4152,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -4197,7 +4170,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4207,8 +4180,8 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -4233,7 +4206,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4244,7 +4217,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -4264,7 +4237,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4275,7 +4248,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -4293,7 +4266,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4304,7 +4277,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -4322,7 +4295,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4333,7 +4306,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -4359,7 +4332,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4370,7 +4343,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -4390,7 +4363,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4401,7 +4374,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -4427,7 +4400,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4438,7 +4411,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -4458,7 +4431,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4469,7 +4442,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -4495,7 +4468,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4506,7 +4479,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -4526,7 +4499,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4537,7 +4510,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -4563,7 +4536,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4574,7 +4547,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -4594,7 +4567,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4605,7 +4578,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -4623,7 +4596,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4633,8 +4606,8 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -4659,7 +4632,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4670,7 +4643,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -4690,7 +4663,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4701,7 +4674,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -4727,7 +4700,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4738,7 +4711,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -4758,7 +4731,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4769,7 +4742,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -4787,7 +4760,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4797,8 +4770,8 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -4823,7 +4796,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4834,7 +4807,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -4854,7 +4827,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4865,7 +4838,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -4883,7 +4856,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4893,8 +4866,8 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -4911,7 +4884,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -4922,7 +4895,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -4943,7 +4916,7 @@ exports[`HelpScreen Component should match snapshot with Inji source 1`] = ` - , + , ] `; @@ -4984,19 +4957,10 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` Help , - @@ -5042,7 +5006,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5059,7 +5023,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5070,8 +5034,8 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -5087,7 +5051,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5099,7 +5063,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5111,7 +5075,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5128,7 +5092,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5145,7 +5109,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5162,7 +5126,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5179,7 +5143,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5190,8 +5154,8 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -5207,7 +5171,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5224,7 +5188,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5235,8 +5199,8 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -5252,7 +5216,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5263,8 +5227,8 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -5275,7 +5239,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5292,7 +5256,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5309,7 +5273,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5326,7 +5290,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5343,7 +5307,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5360,7 +5324,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5371,8 +5335,8 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` onPress={[Function]} style={ { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", } } > @@ -5383,7 +5347,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5400,7 +5364,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5417,7 +5381,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5434,7 +5398,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5451,7 +5415,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5468,7 +5432,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5485,7 +5449,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5502,7 +5466,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5519,7 +5483,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5536,7 +5500,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5553,7 +5517,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5570,7 +5534,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5587,7 +5551,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5604,7 +5568,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5621,7 +5585,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5638,7 +5602,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5655,7 +5619,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5672,7 +5636,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` style={ { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, } } @@ -5718,7 +5682,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -5729,7 +5693,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -5749,7 +5713,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -5760,7 +5724,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -5786,7 +5750,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -5797,7 +5761,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -5817,7 +5781,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -5828,7 +5792,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -5846,7 +5810,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -5856,8 +5820,8 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -5882,7 +5846,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -5893,7 +5857,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -5913,7 +5877,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -5924,7 +5888,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -5942,7 +5906,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -5953,7 +5917,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -5971,7 +5935,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -5982,7 +5946,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -6008,7 +5972,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6019,7 +5983,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -6039,7 +6003,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6050,7 +6014,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -6076,7 +6040,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6087,7 +6051,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -6107,7 +6071,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6118,7 +6082,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -6144,7 +6108,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6155,7 +6119,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -6175,7 +6139,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6186,7 +6150,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -6212,7 +6176,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6223,7 +6187,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -6243,7 +6207,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6254,7 +6218,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -6272,7 +6236,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6282,8 +6246,8 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -6308,7 +6272,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6319,7 +6283,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -6339,7 +6303,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6350,7 +6314,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -6376,7 +6340,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6387,7 +6351,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -6407,7 +6371,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6418,7 +6382,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -6436,7 +6400,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6446,8 +6410,8 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -6472,7 +6436,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6483,7 +6447,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#000000", - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 18, "lineHeight": 19, "margin": 7, @@ -6503,7 +6467,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6514,7 +6478,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -6532,7 +6496,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6542,8 +6506,8 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, null, { - "color": "#F37321", - "fontFamily": "Montserrat_600SemiBold", + "color": "#951F6F", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -6560,7 +6524,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -6571,7 +6535,7 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` null, { "color": "#707070", - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "margin": 5, }, ] @@ -6592,6 +6556,6 @@ exports[`HelpScreen Component should match snapshot with keyManagement source 1` - , + , ] `; diff --git a/components/__snapshots__/KebabPopUp.test.tsx.snap b/components/__snapshots__/KebabPopUp.test.tsx.snap index 3b1a0cb6..73c26f2d 100644 --- a/components/__snapshots__/KebabPopUp.test.tsx.snap +++ b/components/__snapshots__/KebabPopUp.test.tsx.snap @@ -51,7 +51,7 @@ exports[`KebabPopUp Component should match snapshot when not visible 1`] = ` }, null, { - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "justifyContent": "space-between", }, null, @@ -69,7 +69,7 @@ exports[`KebabPopUp Component should match snapshot when not visible 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 15, "justifyContent": "center", }, @@ -132,7 +132,7 @@ exports[`KebabPopUp Component should match snapshot when not visible 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -147,7 +147,7 @@ exports[`KebabPopUp Component should match snapshot when not visible 1`] = ` }, null, { - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -201,7 +201,7 @@ exports[`KebabPopUp Component should match snapshot when not visible 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, { @@ -218,7 +218,7 @@ exports[`KebabPopUp Component should match snapshot when not visible 1`] = ` }, null, { - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -280,7 +280,7 @@ exports[`KebabPopUp Component should match snapshot with VC that has image 1`] = }, null, { - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "justifyContent": "space-between", }, null, @@ -298,7 +298,7 @@ exports[`KebabPopUp Component should match snapshot with VC that has image 1`] = "lineHeight": 18, }, { - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 15, "justifyContent": "center", }, @@ -361,7 +361,7 @@ exports[`KebabPopUp Component should match snapshot with VC that has image 1`] = "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -376,7 +376,7 @@ exports[`KebabPopUp Component should match snapshot with VC that has image 1`] = }, null, { - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -430,7 +430,7 @@ exports[`KebabPopUp Component should match snapshot with VC that has image 1`] = "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, { @@ -447,7 +447,7 @@ exports[`KebabPopUp Component should match snapshot with VC that has image 1`] = }, null, { - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -509,7 +509,7 @@ exports[`KebabPopUp Component should match snapshot with custom icon color 1`] = }, null, { - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "justifyContent": "space-between", }, null, @@ -527,7 +527,7 @@ exports[`KebabPopUp Component should match snapshot with custom icon color 1`] = "lineHeight": 18, }, { - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 15, "justifyContent": "center", }, @@ -590,7 +590,7 @@ exports[`KebabPopUp Component should match snapshot with custom icon color 1`] = "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -605,7 +605,7 @@ exports[`KebabPopUp Component should match snapshot with custom icon color 1`] = }, null, { - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -659,7 +659,7 @@ exports[`KebabPopUp Component should match snapshot with custom icon color 1`] = "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, { @@ -676,7 +676,7 @@ exports[`KebabPopUp Component should match snapshot with custom icon color 1`] = }, null, { - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -741,7 +741,7 @@ exports[`KebabPopUp Component should match snapshot with custom icon component 1 }, null, { - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "justifyContent": "space-between", }, null, @@ -759,7 +759,7 @@ exports[`KebabPopUp Component should match snapshot with custom icon component 1 "lineHeight": 18, }, { - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 15, "justifyContent": "center", }, @@ -822,7 +822,7 @@ exports[`KebabPopUp Component should match snapshot with custom icon component 1 "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -837,7 +837,7 @@ exports[`KebabPopUp Component should match snapshot with custom icon component 1 }, null, { - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -891,7 +891,7 @@ exports[`KebabPopUp Component should match snapshot with custom icon component 1 "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, { @@ -908,7 +908,7 @@ exports[`KebabPopUp Component should match snapshot with custom icon component 1 }, null, { - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -970,7 +970,7 @@ exports[`KebabPopUp Component should match snapshot with default icon 1`] = ` }, null, { - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "justifyContent": "space-between", }, null, @@ -988,7 +988,7 @@ exports[`KebabPopUp Component should match snapshot with default icon 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 15, "justifyContent": "center", }, @@ -1051,7 +1051,7 @@ exports[`KebabPopUp Component should match snapshot with default icon 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -1066,7 +1066,7 @@ exports[`KebabPopUp Component should match snapshot with default icon 1`] = ` }, null, { - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", }, ] } @@ -1120,7 +1120,7 @@ exports[`KebabPopUp Component should match snapshot with default icon 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, { @@ -1137,7 +1137,7 @@ exports[`KebabPopUp Component should match snapshot with default icon 1`] = ` }, null, { - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", }, ] } diff --git a/components/__snapshots__/Passcode.test.tsx.snap b/components/__snapshots__/Passcode.test.tsx.snap index 7b861649..c77482f6 100644 --- a/components/__snapshots__/Passcode.test.tsx.snap +++ b/components/__snapshots__/Passcode.test.tsx.snap @@ -85,7 +85,7 @@ exports[`Passcode Component should match snapshot with both message and error 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -136,7 +136,7 @@ exports[`Passcode Component should match snapshot with both message and error 1` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, { @@ -243,7 +243,7 @@ exports[`Passcode Component should match snapshot with custom message 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -294,7 +294,7 @@ exports[`Passcode Component should match snapshot with custom message 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, { @@ -399,7 +399,7 @@ exports[`Passcode Component should match snapshot with default props 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -450,7 +450,7 @@ exports[`Passcode Component should match snapshot with default props 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, { @@ -555,7 +555,7 @@ exports[`Passcode Component should match snapshot with error message 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, @@ -606,7 +606,7 @@ exports[`Passcode Component should match snapshot with error message 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, { diff --git a/components/__snapshots__/PinInput.test.tsx.snap b/components/__snapshots__/PinInput.test.tsx.snap index 0da0978a..55b071f9 100644 --- a/components/__snapshots__/PinInput.test.tsx.snap +++ b/components/__snapshots__/PinInput.test.tsx.snap @@ -36,14 +36,14 @@ exports[`PinInput Component should match snapshot with 4 digit PIN 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, - "borderColor": "#F37321", + "borderColor": "#951F6F", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 29, "height": 50, "margin": 8, @@ -61,14 +61,14 @@ exports[`PinInput Component should match snapshot with 4 digit PIN 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -87,14 +87,14 @@ exports[`PinInput Component should match snapshot with 4 digit PIN 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -113,14 +113,14 @@ exports[`PinInput Component should match snapshot with 4 digit PIN 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -169,14 +169,14 @@ exports[`PinInput Component should match snapshot with 6 digit PIN 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, - "borderColor": "#F37321", + "borderColor": "#951F6F", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 29, "height": 50, "margin": 8, @@ -194,14 +194,14 @@ exports[`PinInput Component should match snapshot with 6 digit PIN 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -220,14 +220,14 @@ exports[`PinInput Component should match snapshot with 6 digit PIN 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -246,14 +246,14 @@ exports[`PinInput Component should match snapshot with 6 digit PIN 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -272,14 +272,14 @@ exports[`PinInput Component should match snapshot with 6 digit PIN 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -298,14 +298,14 @@ exports[`PinInput Component should match snapshot with 6 digit PIN 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -355,14 +355,14 @@ exports[`PinInput Component should match snapshot with custom testID 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, - "borderColor": "#F37321", + "borderColor": "#951F6F", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 29, "height": 50, "margin": 8, @@ -380,14 +380,14 @@ exports[`PinInput Component should match snapshot with custom testID 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -406,14 +406,14 @@ exports[`PinInput Component should match snapshot with custom testID 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -432,14 +432,14 @@ exports[`PinInput Component should match snapshot with custom testID 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -488,14 +488,14 @@ exports[`PinInput Component should match snapshot with onChange handler 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, - "borderColor": "#F37321", + "borderColor": "#951F6F", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 29, "height": 50, "margin": 8, @@ -513,14 +513,14 @@ exports[`PinInput Component should match snapshot with onChange handler 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -539,14 +539,14 @@ exports[`PinInput Component should match snapshot with onChange handler 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -565,14 +565,14 @@ exports[`PinInput Component should match snapshot with onChange handler 1`] = ` onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -621,14 +621,14 @@ exports[`PinInput Component should match snapshot with onDone and autosubmit 1`] onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, - "borderColor": "#F37321", + "borderColor": "#951F6F", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_700Bold", + "fontFamily": "Inter_700Bold", "fontSize": 29, "height": 50, "margin": 8, @@ -646,14 +646,14 @@ exports[`PinInput Component should match snapshot with onDone and autosubmit 1`] onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -672,14 +672,14 @@ exports[`PinInput Component should match snapshot with onDone and autosubmit 1`] onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, @@ -698,14 +698,14 @@ exports[`PinInput Component should match snapshot with onDone and autosubmit 1`] onKeyPress={[Function]} secureTextEntry={true} selectTextOnFocus={true} - selectionColor="#F37321" + selectionColor="#951F6F" style={ { "borderBottomWidth": 3, "borderColor": "#C7C7C7", "color": "#000000", "flex": 1, - "fontFamily": "Montserrat_600SemiBold", + "fontFamily": "Inter_600SemiBold", "fontSize": 33, "height": 50, "lineHeight": 28, diff --git a/components/__snapshots__/ProgressingModal.test.tsx.snap b/components/__snapshots__/ProgressingModal.test.tsx.snap index 60c5ad4f..3b38f533 100644 --- a/components/__snapshots__/ProgressingModal.test.tsx.snap +++ b/components/__snapshots__/ProgressingModal.test.tsx.snap @@ -10,7 +10,7 @@ exports[`ProgressingModal Component should match snapshot with hint visible 1`] exports[`ProgressingModal Component should match snapshot with progress spinner 1`] = ` > { (props: PickerProps): ReturnType; @@ -34,41 +33,23 @@ export const Picker: Picker = (props: PickerProps) => { + overlayStyle={{padding: 1}}> - {props.items.map((item, index) => { - const isSelected = selectedIndex === index; - return ( - selectItem(index)} - containerStyle={ - isSelected - ? Theme.Styles.listItemSelectedContainer - : Theme.Styles.listItemUnselectedContainer - }> - - - - {item.label} - - - - - {isSelected && ( - - )} - - ); - })} + {props.items.map((item, index) => ( + selectItem(index)} + key={index}> + + + {item.label} + + + {selectedIndex === index && } + + ))} diff --git a/components/ui/SearchBar.tsx b/components/ui/SearchBar.tsx index 37c16911..5e5a6faf 100644 --- a/components/ui/SearchBar.tsx +++ b/components/ui/SearchBar.tsx @@ -1,10 +1,12 @@ import React from 'react'; -import { TextInput, TouchableOpacity } from 'react-native'; -import { Icon } from 'react-native-elements'; -import { Row } from './Layout'; -import { Theme } from './styleUtils'; +import {TextInput, View} from 'react-native'; +import {Icon} from 'react-native-elements'; +import {Row} from './Layout'; +import {Theme} from './styleUtils'; +import {SvgImage} from './svg'; export const SearchBar = ({ + isVcSearch = false, searchIconTestID, searchBarTestID, placeholder, @@ -15,45 +17,38 @@ export const SearchBar = ({ editable = true, }: SearchBarProps) => { return ( - + + {isVcSearch ? ( + + {SvgImage.SearchIcon()} + + ) : ( + + )} onChangeText(searchText)} onLayout={onLayout} editable={editable ?? true} /> - - {search?.length > 0 && ( - onChangeText('')} - style={Theme.SearchBarStyles.clearIcon}> - - - )} - ); }; interface SearchBarProps { + isVcSearch: Boolean; searchIconTestID: string; searchBarTestID: string; search: string; diff --git a/components/ui/SetupPicker.tsx b/components/ui/SetupPicker.tsx index 30c0cd64..17f95237 100644 --- a/components/ui/SetupPicker.tsx +++ b/components/ui/SetupPicker.tsx @@ -1,5 +1,5 @@ import React, {useEffect, useState} from 'react'; -import {Dimensions, View} from 'react-native'; +import {Dimensions} from 'react-native'; import {Icon, ListItem} from 'react-native-elements'; import {Column} from './Layout'; import {Text} from './Text'; @@ -33,35 +33,30 @@ export const SetupPicker: Picker = (props: PickerProps) => { testID={props.testID} width={Dimensions.get('window').width * 0.8} backgroundColor={Theme.Colors.whiteBackgroundColor}> - {props.items.map((item, index) => { - const isSelected = selectedIndex === index; - return ( - selectItem(index)}> - - - - {item.label} - - - - {isSelected ? ( - - ) : ( - - )} - - ); - })} + {props.items.map((item, index) => ( + selectItem(index)} + key={index}> + + + + {item.label} + + + + {selectedIndex === index ? ( + + ) : ( + + )} + + ))} ); }; diff --git a/components/ui/Timestamp.tsx b/components/ui/Timestamp.tsx index 68e97279..4d79b636 100644 --- a/components/ui/Timestamp.tsx +++ b/components/ui/Timestamp.tsx @@ -1,7 +1,7 @@ import React from 'react'; import {View} from 'react-native'; import {Text} from '../ui/Text'; -import { formattedDate } from '../../shared/openId4VCI/Utils'; +import {formattedDate} from '../../shared/openId4VCI/Utils'; export const Timestamp: React.FC = props => { return ( @@ -10,7 +10,7 @@ export const Timestamp: React.FC = props => { testID={`${props.testId}Time`} size="regular" style={{ - fontFamily: 'Montserrat_500Medium', + fontFamily: 'Inter_500Medium', fontWeight: '600', fontSize: 14, letterSpacing: 0, diff --git a/components/ui/ToolTip.tsx b/components/ui/ToolTip.tsx index 2e2f430f..6917afd1 100644 --- a/components/ui/ToolTip.tsx +++ b/components/ui/ToolTip.tsx @@ -1,132 +1,35 @@ -import React, {useRef, useState} from 'react'; -import { - Modal, - View, - ScrollView, - TouchableOpacity, - Pressable, - Dimensions, - findNodeHandle, - UIManager, -} from 'react-native'; +import {Tooltip} from 'react-native-elements'; +import {Centered} from './Layout'; +import React from 'react'; import {Theme} from './styleUtils'; +import testIDProps from '../../shared/commonUtil'; +import {StyleProp} from 'react-native'; +import {ViewStyle} from 'react-native'; -interface CustomTooltipProps { - triggerComponent: React.ReactNode; - toolTipContent: React.ReactNode; - width?: number; - maxHeight?: number; -} - -export const TOOLTIP_MARGIN = 6; -export const SCREEN_PADDING = 10; -export const POINTER_SIZE = 12; - -export const CustomTooltip = ({ - triggerComponent, - toolTipContent, - width = 275, - maxHeight = 300, -}: CustomTooltipProps) => { - const [visible, setVisible] = useState(false); - const [position, setPosition] = useState({x: 0, y: 0}); - const [pointerLeft, setPointerLeft] = useState(20); - const [showAbove, setShowAbove] = useState(false); - - const iconRef = useRef(null); - const screen = Dimensions.get('window'); - - const showTooltip = () => { - if (!iconRef.current) return; - const handle = findNodeHandle(iconRef.current); - if (!handle) return; - - try { - UIManager.measureInWindow(handle, (x, y, w, h) => { - if (w === 0 && h === 0) return; - - let tooltipX = x; - let tooltipY = y + h + TOOLTIP_MARGIN; - let showAboveTooltip = false; - const iconCenterX = x + w / 2; - - if (tooltipX + width > screen.width) { - tooltipX = screen.width - width - SCREEN_PADDING; - } - if (tooltipX < SCREEN_PADDING) { - tooltipX = SCREEN_PADDING; - } - - if (tooltipY + maxHeight > screen.height) { - tooltipY = y - maxHeight - TOOLTIP_MARGIN * 2; - showAboveTooltip = true; - } - if (tooltipY < SCREEN_PADDING) { - tooltipY = SCREEN_PADDING; - showAboveTooltip = false; - } - - const calculatedPointerLeft = iconCenterX - tooltipX - POINTER_SIZE / 2; - setPointerLeft( - Math.min( - Math.max(calculatedPointerLeft, SCREEN_PADDING), - width - SCREEN_PADDING, - ), - ); - setShowAbove(showAboveTooltip); - setPosition({x: tooltipX, y: tooltipY}); - setVisible(true); - }); - } catch (e) { - console.warn('Tooltip positioning failed:', e); - } - }; - +export const CustomTooltip: React.FC = props => { return ( - <> - - - {triggerComponent} - - - - {visible && ( - setVisible(false)}> - setVisible(false)} - /> - - - - {toolTipContent} - - - - )} - + + + {props.triggerComponent} + + ); }; + +interface CustomTooltipProps { + width: number; + height: number; + triggerComponent: React.ReactElement; + triggerComponentStyles: StyleProp; + testID: string; + toolTipContent?: React.ReactElement; +} diff --git a/components/ui/__snapshots__/Text.generated.test.tsx.snap b/components/ui/__snapshots__/Text.generated.test.tsx.snap index 8cbfeb36..fde92ff7 100644 --- a/components/ui/__snapshots__/Text.generated.test.tsx.snap +++ b/components/ui/__snapshots__/Text.generated.test.tsx.snap @@ -10,7 +10,7 @@ exports[` Testing the Text component 1`] = ` "lineHeight": 18, }, { - "fontFamily": "Montserrat_400Regular", + "fontFamily": "Inter_400Regular", "fontSize": 14, }, null, diff --git a/components/ui/svg.tsx b/components/ui/svg.tsx index 512d61ec..cea8c6ec 100644 --- a/components/ui/svg.tsx +++ b/components/ui/svg.tsx @@ -60,7 +60,6 @@ import QuestionIcon from '../../assets/questionIcon.svg'; import CopyIcon from '../../assets/file_copy.svg'; import StarIcon from '../../assets/credentialRegestryStar.svg'; import SelectedCheckBox from '../../assets/Selected_Check_Box.svg'; -import FaceBiometric from '../../assets/Icon.svg'; import ReverifyIcon from '../../assets/Reverify.svg'; export class SvgImage { static selectedCheckBox() { @@ -251,9 +250,7 @@ export class SvgImage { } static ReverifyIcon() { - return ( - - ) + return ; } static OutlinedPinIcon() { @@ -558,6 +555,10 @@ export class SvgImage { ); } + static SearchIcon() { + return ; + } + static settingsLanguageIcon(size) { return ( - ); - } - static abotInjiIcon() { return ( NSCameraUsageDescription Allow $(PRODUCT_NAME) to access your camera NSFaceIDUsageDescription - $(PRODUCT_NAME) can be unlocked using Face ID + Resident app can be unlocked using Face ID NSLocationAlwaysAndWhenInUseUsageDescription Allow $(PRODUCT_NAME) to access your location NSLocationWhenInUseUsageDescription diff --git a/locales/ara.json b/locales/ara.json index 531d395b..3649eed2 100644 --- a/locales/ara.json +++ b/locales/ara.json @@ -444,7 +444,7 @@ } }, "MyVcsTab": { - "searchByName": "...يبحث", + "searchByName": "يبحث", "bringYourDigitalID": "أحضر هويتك الرقمية", "generateVcDescription": "اضغط على \"إضافة بطاقة \" أدناه لتنزيل بطاقتك", "generateVcFABDescription": "اضغط على \"+\" أدناه لتنزيل بطاقتك", @@ -538,10 +538,6 @@ "title": "وضع انتظار:", "description": "التحقق معلق حاليًا بسبب مشكلات فنية." }, - "expired": { - "title": "الحالة منتهية الصلاحية:", - "description": "انتهت صلاحية بيانات الاعتماد." - }, "revoked": { "title": "الحالة الملغاة:", "description": "تم إلغاء بيانات الاعتماد." @@ -1146,9 +1142,7 @@ "verify": "تحقق", "emptyCodeError": "لا يمكن أن يكون الرمز فارغًا", "invalidCharacters": "يسمح فقط بالأحرف والأرقام", - "TransactionCode": "رمز المعاملة", - "showMore": "عرض المزيد ↓", - "showLess": "عرض أقل ↑" + "TransactionCode": "رمز المعاملة" }, "trustScreen": { "description": "تأكد من أنك تعرف أو تثق بهذا المصدر. بمجرد أن تثق بهذا المصدر:", diff --git a/locales/en.json b/locales/en.json index c15d792b..9b942ada 100644 --- a/locales/en.json +++ b/locales/en.json @@ -445,7 +445,7 @@ } }, "MyVcsTab": { - "searchByName": "search...", + "searchByName": "Search", "bringYourDigitalID": "Bring your digital identity", "generateVcDescription": "Tap on \"Download card\" below to download your card", "generateVcFABDescription": "Tap on \"+\" below to download your card", @@ -1162,9 +1162,7 @@ "verify": "Verify", "emptyCodeError": "Code cannot be empty", "invalidCharacters": "Only letters and numbers are allowed", - "TransactionCode": "Transasction Code", - "showMore": "Show more ↓", - "showLess": "Show less ↑" + "TransactionCode": "Transasction Code" }, "trustScreen": { "description": "Make sure you recognize or trust this issuer. Once you trust this issuer:", diff --git a/locales/fil.json b/locales/fil.json index c3196af2..ff8c0313 100644 --- a/locales/fil.json +++ b/locales/fil.json @@ -443,7 +443,7 @@ } }, "MyVcsTab": { - "searchByName": "maghanap...", + "searchByName": "Maghanap", "bringYourDigitalID": "Dalhin ang Iyong Digital ID", "generateVcDescription": "Upang i-download ang iyong card i-tap ang I-download card sa ibaba", "generateVcFABDescription": "Upang i-download ang iyong card i-tap ang + sa ibaba", @@ -1144,9 +1144,7 @@ "verify": "I-verify", "emptyCodeError": "Hindi puwedeng walang laman ang code", "invalidCharacters": "Mga letra at numero lamang ang pinapayagan", - "TransactionCode": "Transaction Code", - "showMore": "Ipakita pa ↓", - "showLess": "Ipakita nang kaunti ↑" + "TransactionCode": "Transaction Code" }, "trustScreen": { "description": "Siguraduhin mong kilala mo o pinagkakatiwalaan mo ang issuer na ito. Kapag pinagkatiwalaan mo sila:", diff --git a/locales/hin.json b/locales/hin.json index 6a146138..58801a4e 100644 --- a/locales/hin.json +++ b/locales/hin.json @@ -445,7 +445,7 @@ } }, "MyVcsTab": { - "searchByName": "खोजें...", + "searchByName": "खोजें", "downloadCard": "डाउनलोड कार्ड", "bringYourDigitalID": "अपनी डिजिटल आईडी लाओ", "generateVcDescription": "अपना कार्ड डाउनलोड करने के लिए नीचे डाउनलोड कार्ड टैप करें", @@ -1146,9 +1146,7 @@ "verify": "सत्यापित करें", "emptyCodeError": "कोड खाली नहीं हो सकता", "invalidCharacters": "केवल अक्षर और संख्याएँ मान्य हैं", - "TransactionCode": "लेन-देन कोड", - "showMore": "अधिक दिखाएं ↓", - "showLess": "कम दिखाएं ↑" + "TransactionCode": "लेन-देन कोड" }, "trustScreen": { "description": "सुनिश्चित करें कि आप इस जारीकर्ता को पहचानते हैं या उस पर भरोसा करते हैं। एक बार जब आप भरोसा कर लेते हैं:", diff --git a/locales/kan.json b/locales/kan.json index 4cd38e85..401d48d3 100644 --- a/locales/kan.json +++ b/locales/kan.json @@ -444,7 +444,7 @@ } }, "MyVcsTab": { - "searchByName": "ಹುಡುಕು...", + "searchByName": "ಹುಡುಕು", "downloadCard": "ಕಾರ್ಡ್ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ", "bringYourDigitalID": "ನಿಮ್ಮ ಡಿಜಿಟಲ್ ಐಡಿ ತನ್ನಿ", "generateVcDescription": "ನಿಮ್ಮ ಕಾರ್ಡ್ ಅನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ಕೆಳಗಿನ ಡೌನ್‌ಲೋಡ್ ಕಾರ್ಡ್ ಅನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ", @@ -1146,9 +1146,7 @@ "verify": "ಸರಿಪಡಿಸಿ", "emptyCodeError": "ಕೋಡ್ ಖಾಲಿ ಇರಬಾರದು", "invalidCharacters": "ಅಕ್ಷರಗಳು ಮತ್ತು ಸಂಖ್ಯೆಗಳು ಮಾತ್ರ ಅನುಮತಿಸಲಾಗಿದೆ", - "TransactionCode": "ವಹಿವಾಟು ಕೋಡ್", - "showMore": "ಹೆಚ್ಚು ತೋರಿಸಿ ↓", - "showLess": "ಕಡಿಮೆ ತೋರಿಸಿ ↑" + "TransactionCode": "ವಹಿವಾಟು ಕೋಡ್" }, "trustScreen": { "description": "ಈ ಹೊರಹೊಮ್ಮಿಸುವವರನ್ನು ನೀವು ಗುರುತಿಸುತ್ತೀರಾ ಅಥವಾ ನಂಬಿದೀರಾ ಎಂಬುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ. ನೀವು ನಂಬಿದ ನಂತರ:", diff --git a/locales/tam.json b/locales/tam.json index 2625f801..9d53392c 100644 --- a/locales/tam.json +++ b/locales/tam.json @@ -444,7 +444,7 @@ } }, "MyVcsTab": { - "searchByName": "தேடு...", + "searchByName": "தேடு", "bringYourDigitalID": "உங்கள் டிஜிட்டல் ஐடியைக் கொண்டு வாருங்கள்", "generateVcDescription": "உங்கள் அட்டை ஐப் பதிவிறக்க, கீழே உள்ள பதிவிறக்கு அட்டை என்பதைத் தட்டவும்", "generateVcFABDescription": "உங்கள் அட்டை ஐப் பதிவிறக்க, கீழே உள்ள + என்பதைத் தட்டவும்", @@ -1146,9 +1146,7 @@ "verify": "சரிபார்க்கவும்", "emptyCodeError": "குறியீடு காலியாக இருக்க முடியாது", "invalidCharacters": "எழுத்துகள் மற்றும் எண்கள் மட்டும் அனுமதிக்கப்படும்", - "TransactionCode": "பரிவரத்து குறியீடு", - "showMore": "மேலும் காண்பிக்கவும் ↓", - "showLess": "குறைவாக காண்பிக்கவும் ↑" + "TransactionCode": "பரிவரத்து குறியீடு" }, "trustScreen": { "description": "இந்த வெளியீட்டாளரை நீங்கள் அறிந்தவரா அல்லது நம்புகிறீர்களா என்பதை உறுதி செய்யவும். நீங்கள் வெளியீட்டாளரை நம்பினால்:", diff --git a/package-lock.json b/package-lock.json index f6a22938..7ea631c6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@digitalbazaar/rsa-signature-2018": "digitalbazaar/rsa-signature-2018#initial", "@digitalbazaar/rsa-verification-key-2018": "digitalbazaar/rsa-verification-key-2018#initial", "@digitalcredentials/vc": "^1.1.2", - "@expo-google-fonts/montserrat": "^0.4.2", + "@expo-google-fonts/inter": "^0.2.3", "@expo/metro-config": "~0.18.11", "@invertase/react-native-apple-authentication": "^2.3.0", "@iriscan/biometric-sdk-react-native": "0.2.6", @@ -95,7 +95,6 @@ "react-native-shimmer-placeholder": "^2.0.9", "react-native-spinkit": "^1.5.1", "react-native-svg": "15.2.0", - "react-native-switch-toggle": "^2.2.1", "react-native-vector-icons": "^10.0.0", "react-native-webview": "^13.13.5", "react-native-zip-archive": "^6.1.0", @@ -3319,10 +3318,10 @@ "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, - "node_modules/@expo-google-fonts/montserrat": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@expo-google-fonts/montserrat/-/montserrat-0.4.2.tgz", - "integrity": "sha512-Xyq7rKJhhZOE1Xk4wKSSVoUeOkFmQEMhtZ3pdFrgYckGZMs115Apmld1AI8Ju+yrl5GzDdfRCCqRr33dvEDYUA==" + "node_modules/@expo-google-fonts/inter": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@expo-google-fonts/inter/-/inter-0.2.3.tgz", + "integrity": "sha512-iHK9FI+dnE45X5c2Z5hSFwNH4zUWethizpbv3XUn0FIGw5jwvzriENz0a6wCdkI4/d+1QkurnHo5XHti7TbNJA==" }, "node_modules/@expo/bunyan": { "version": "4.0.1", @@ -13640,15 +13639,6 @@ "url": "https://github.com/fb55/domutils?sponsor=1" } }, - "node_modules/dooboolab-welcome": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/dooboolab-welcome/-/dooboolab-welcome-1.3.2.tgz", - "integrity": "sha512-2NbMaIIURElxEf/UAoVUFlXrO+7n/FRhLCiQlk4fkbGRh9cJ3/f8VEMPveR9m4Ug2l2Zey+UCXjd6EcBqHJ5bw==", - "hasInstallScript": true, - "bin": { - "dooboolab-welcome": "bin/hello.js" - } - }, "node_modules/dot-case": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", @@ -25801,18 +25791,6 @@ "react-native-svg": ">=12.0.0" } }, - "node_modules/react-native-switch-toggle": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/react-native-switch-toggle/-/react-native-switch-toggle-2.2.1.tgz", - "integrity": "sha512-Y/RQ1Pb/KDVZhBSNjc16LKtUi7MGZb0MYxouZLj/THpiSQLsy5pUyTwbIKRjNuZDNSxmMDXyRX1QfLt+oup4Uw==", - "dependencies": { - "dooboolab-welcome": "^1.3.0" - }, - "peerDependencies": { - "react": ">=16.9", - "react-native": ">=0.58" - } - }, "node_modules/react-native-url-polyfill": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/react-native-url-polyfill/-/react-native-url-polyfill-2.0.0.tgz", @@ -33154,10 +33132,10 @@ "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", "dev": true }, - "@expo-google-fonts/montserrat": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@expo-google-fonts/montserrat/-/montserrat-0.4.2.tgz", - "integrity": "sha512-Xyq7rKJhhZOE1Xk4wKSSVoUeOkFmQEMhtZ3pdFrgYckGZMs115Apmld1AI8Ju+yrl5GzDdfRCCqRr33dvEDYUA==" + "@expo-google-fonts/inter": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@expo-google-fonts/inter/-/inter-0.2.3.tgz", + "integrity": "sha512-iHK9FI+dnE45X5c2Z5hSFwNH4zUWethizpbv3XUn0FIGw5jwvzriENz0a6wCdkI4/d+1QkurnHo5XHti7TbNJA==" }, "@expo/bunyan": { "version": "4.0.1", @@ -40858,11 +40836,6 @@ "domhandler": "^5.0.3" } }, - "dooboolab-welcome": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/dooboolab-welcome/-/dooboolab-welcome-1.3.2.tgz", - "integrity": "sha512-2NbMaIIURElxEf/UAoVUFlXrO+7n/FRhLCiQlk4fkbGRh9cJ3/f8VEMPveR9m4Ug2l2Zey+UCXjd6EcBqHJ5bw==" - }, "dot-case": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", @@ -49768,14 +49741,6 @@ "path-dirname": "^1.0.2" } }, - "react-native-switch-toggle": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/react-native-switch-toggle/-/react-native-switch-toggle-2.2.1.tgz", - "integrity": "sha512-Y/RQ1Pb/KDVZhBSNjc16LKtUi7MGZb0MYxouZLj/THpiSQLsy5pUyTwbIKRjNuZDNSxmMDXyRX1QfLt+oup4Uw==", - "requires": { - "dooboolab-welcome": "^1.3.0" - } - }, "react-native-url-polyfill": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/react-native-url-polyfill/-/react-native-url-polyfill-2.0.0.tgz", diff --git a/package.json b/package.json index c6cd1288..1f8937ca 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@digitalbazaar/rsa-signature-2018": "digitalbazaar/rsa-signature-2018#initial", "@digitalbazaar/rsa-verification-key-2018": "digitalbazaar/rsa-verification-key-2018#initial", "@digitalcredentials/vc": "^1.1.2", - "@expo-google-fonts/montserrat": "^0.4.2", + "@expo-google-fonts/inter": "^0.2.3", "@expo/metro-config": "~0.18.11", "@invertase/react-native-apple-authentication": "^2.3.0", "@iriscan/biometric-sdk-react-native": "0.2.6", @@ -100,7 +100,6 @@ "react-native-shimmer-placeholder": "^2.0.9", "react-native-spinkit": "^1.5.1", "react-native-svg": "15.2.0", - "react-native-switch-toggle": "^2.2.1", "react-native-vector-icons": "^10.0.0", "react-native-webview": "^13.13.5", "react-native-zip-archive": "^6.1.0", diff --git a/routes/index.ts b/routes/index.ts index c44fe93d..7f06aef0 100644 --- a/routes/index.ts +++ b/routes/index.ts @@ -28,16 +28,10 @@ export const baseRoutes: Screen[] = [ { name: 'KeyManagement', component: KeyManagementScreen, - options: { - headerShown: false, - }, }, { name:'AuthView', - component:AuthWebViewScreen, - options:{ - headerShown:false, - }, + component:AuthWebViewScreen }, { name: 'Language', diff --git a/routes/main.ts b/routes/main.ts index 141ca5cd..8ce3ac7b 100644 --- a/routes/main.ts +++ b/routes/main.ts @@ -44,7 +44,7 @@ const settings: TabScreen = { options: { headerTitleStyle: { fontSize: 26, - fontFamily: 'Montserrat_600SemiBold', + fontFamily: 'Inter_600SemiBold', marginTop: 15, }, title: i18n.t('MainLayout:settings'), diff --git a/screens/AppLayout.tsx b/screens/AppLayout.tsx index f84d67e4..7ece45c5 100644 --- a/screens/AppLayout.tsx +++ b/screens/AppLayout.tsx @@ -10,7 +10,7 @@ import { import {authRoutes, baseRoutes} from '../routes'; import {useAppLayout} from './AppLayoutController'; import {StatusBar} from 'react-native'; -import {GestureHandlerRootView} from 'react-native-gesture-handler'; +import {GestureHandlerRootView} from "react-native-gesture-handler"; const {Navigator, Screen} = createNativeStackNavigator(); export const AppLayout: React.FC = () => { @@ -25,19 +25,17 @@ export const AppLayout: React.FC = () => { }; return ( - - - - - {baseRoutes.map(route => ( - - ))} - {controller.isAuthorized && - authRoutes.map(route => )} - - - + + + + + {baseRoutes.map(route => ( + + ))} + {controller.isAuthorized && + authRoutes.map(route => )} + + + ); }; diff --git a/screens/AuthScreen.tsx b/screens/AuthScreen.tsx index e015773d..63c86c8c 100644 --- a/screens/AuthScreen.tsx +++ b/screens/AuthScreen.tsx @@ -12,7 +12,7 @@ import { sendStartEvent, } from '../shared/telemetry/TelemetryUtils'; import {TelemetryConstants} from '../shared/telemetry/TelemetryConstants'; -import BiometricIcon from '../components/BiometricIcon'; +import {SvgImage} from '../components/ui/svg'; export const AuthScreen: React.FC = props => { const {t} = useTranslation('AuthScreen'); @@ -43,7 +43,7 @@ export const AuthScreen: React.FC = props => { title={controller.alertMsg} /> - + {SvgImage.fingerprintIcon(66)} = ({route, navigation}) => { ); return ( - +
{shouldRenderWebView && !showWebView && ( @@ -158,7 +157,7 @@ const AuthWebViewScreen: React.FC = ({route, navigation}) => { thirdPartyCookiesEnabled={false} /> )} - + ); }; diff --git a/screens/BiometricScreen.tsx b/screens/BiometricScreen.tsx index e15f075e..2afb53d7 100644 --- a/screens/BiometricScreen.tsx +++ b/screens/BiometricScreen.tsx @@ -12,7 +12,7 @@ import { resetRetryCount, } from '../shared/telemetry/TelemetryUtils'; import {TelemetryConstants} from '../shared/telemetry/TelemetryConstants'; -import BiometricIcon from '../components/BiometricIcon'; +import {SvgImage} from '../components/ui/svg'; export const BiometricScreen: React.FC = props => { const {t} = useTranslation('BiometricScreen'); @@ -39,7 +39,7 @@ export const BiometricScreen: React.FC = props => { backgroundColor={Theme.Colors.whiteBackgroundColor}> - + {SvgImage.fingerprintIcon(180)} diff --git a/screens/History/HistoryScreen.tsx b/screens/History/HistoryScreen.tsx index aa7eff6d..11e53943 100644 --- a/screens/History/HistoryScreen.tsx +++ b/screens/History/HistoryScreen.tsx @@ -2,7 +2,7 @@ import React from 'react'; import {RefreshControl} from 'react-native'; import {Icon} from 'react-native-elements'; import {useTranslation} from 'react-i18next'; -import {Column, HorizontallyCentered, Text} from '../../components/ui'; +import {Centered, Column, Text} from '../../components/ui'; import {useHistoryTab} from './HistoryScreenController'; import {ActivityLogText} from '../../components/ActivityLogText'; import {MainRouteProps} from '../../routes/main'; @@ -15,7 +15,6 @@ export const HistoryScreen: React.FC = () => { return ( - = () => { onRefresh={controller.REFRESH} /> }> + {controller.activities.map(activity => ( = () => { /> ))} {controller.activities.length === 0 && ( - + = () => { margin="0 0 4 0"> {t('noHistory')} - + )} diff --git a/screens/Home/MyVcs/BindingVcWarningOverlay.tsx b/screens/Home/MyVcs/BindingVcWarningOverlay.tsx index 93dde639..2a8ce34b 100644 --- a/screens/Home/MyVcs/BindingVcWarningOverlay.tsx +++ b/screens/Home/MyVcs/BindingVcWarningOverlay.tsx @@ -21,7 +21,15 @@ export const BindingVcWarningOverlay: React.FC< padding={'10'} width={Dimensions.get('screen').width * 0.8} height={Dimensions.get('screen').height * 0}> - {SvgImage.WarningLogo()} + + {SvgImage.WarningLogo()} + + ! + + diff --git a/screens/Home/MyVcs/RemoveVcWarningOverlay.tsx b/screens/Home/MyVcs/RemoveVcWarningOverlay.tsx index 924ce562..401a33d8 100644 --- a/screens/Home/MyVcs/RemoveVcWarningOverlay.tsx +++ b/screens/Home/MyVcs/RemoveVcWarningOverlay.tsx @@ -26,8 +26,14 @@ export const RemoveVcWarningOverlay: React.FC< padding={'10'} width={Dimensions.get('screen').width * 0.8} height={Dimensions.get('screen').height * 0}> - + {SvgImage.WarningLogo()} + + ! + = props => { Array> >([]); const [showPinVc, setShowPinVc] = useState(true); -const [highlightCardLayout, setHighlightCardLayout] = useState(null); + const [highlightCardLayout, setHighlightCardLayout] = useState(null); const getId = () => { controller.DISMISS(); @@ -259,6 +259,7 @@ const [highlightCardLayout, setHighlightCardLayout] = useState filterVcs('')} /> + {clearSearchIcon && ( + + + + )} {numberOfCardsAvailable > 0 && ( - + {cardsAvailableText} )} {showPinVc && - vcMetadataOrderedByPinStatus.map((vcMetadata, index) => { - const vcKey = vcMetadata.getVcKey(); + vcMetadataOrderedByPinStatus.map((vcMetadata, index) => { + const vcKey = vcMetadata.getVcKey(); - const isSuccessHighlighted = - controller.reverificationSuccess.status && - controller.reverificationSuccess.vcKey === vcKey; + const isSuccessHighlighted = + controller.reverificationSuccess.status && + controller.reverificationSuccess.vcKey === vcKey; - const isFailureHighlighted = - controller.reverificationfailure.status && - controller.reverificationfailure.vcKey === vcKey; - const highlightType = isSuccessHighlighted - ? 'success' - : isFailureHighlighted - ? 'failure' - : null; + const isFailureHighlighted = + controller.reverificationfailure.status && + controller.reverificationfailure.vcKey === vcKey; + const highlightType = isSuccessHighlighted + ? 'success' + : isFailureHighlighted + ? 'failure' + : null; - return ( - { - if (highlightType && !highlightCardLayout) { - setHighlightCardLayout({ ...rect, type: highlightType }); - } - }} - /> - ); - })} + return ( + { + if (highlightType && !highlightCardLayout) { + setHighlightCardLayout({ + ...rect, + type: highlightType, + }); + } + }} + /> + ); + })} {filteredSearchData.length > 0 && !showPinVc ? filteredSearchData.map(vcMetadataObj => { const [vcKey, vcMetadata] = @@ -341,7 +360,7 @@ const [highlightCardLayout, setHighlightCardLayout] = useState {t('noCardsTitle')} @@ -351,7 +370,7 @@ const [highlightCardLayout, setHighlightCardLayout] = useState {t('noCardsDescription')} @@ -488,12 +507,13 @@ const [highlightCardLayout, setHighlightCardLayout] = useState )} { - controller.RESET_HIGHLIGHT() - setHighlightCardLayout(null)}} + controller.RESET_HIGHLIGHT(); + setHighlightCardLayout(null); + }} /> ); diff --git a/screens/Home/OnboardingOverlay.tsx b/screens/Home/OnboardingOverlay.tsx index 8f746fe1..735ac68c 100644 --- a/screens/Home/OnboardingOverlay.tsx +++ b/screens/Home/OnboardingOverlay.tsx @@ -1,11 +1,10 @@ import React, {useRef} from 'react'; import AppIntroSlider from 'react-native-app-intro-slider'; -import { ScrollView, View} from 'react-native'; +import {SafeAreaView, ScrollView, View} from 'react-native'; import {Icon, Overlay} from 'react-native-elements'; import {Button, Column, Text} from '../../components/ui'; import {Theme} from '../../components/ui/styleUtils'; import {useTranslation} from 'react-i18next'; -import {SafeAreaView} from "react-native-safe-area-context"; export const OnboardingOverlay: React.FC = props => { const slider = useRef(); diff --git a/screens/Home/ViewVcModal.tsx b/screens/Home/ViewVcModal.tsx index 8d3a5790..4ccc91fa 100644 --- a/screens/Home/ViewVcModal.tsx +++ b/screens/Home/ViewVcModal.tsx @@ -40,11 +40,7 @@ export const ViewVcModal: React.FC = props => { const controller = useViewVcModal(props); const profileImage = controller.verifiableCredentialData.face; const verificationStatus = controller.verificationStatus; - const verificationStatusMessage = controller.verificationStatus?.isRevoked - ? 'revoked' - : controller.verificationStatus?.isExpired - ? 'expired' - : controller.verificationStatus?.statusType; + const verificationStatusMessage = controller.verificationStatus?.isRevoked ? "revoked" : controller.verificationStatus?.isExpired ? "expired" : controller.verificationStatus?.statusType; const [verifiableCredential, setVerifiableCredential] = useState(null); const [svgTemplate, setSvgTemplate] = useState(null); const [svgRendererError, setSvgRendererError] = useState( @@ -73,7 +69,7 @@ export const ViewVcModal: React.FC = props => { !controller.verifiableCredentialData.vcMetadata.isVerified && !controller.isVerificationInProgress ) { - props.vcItemActor.send({type: 'VERIFY'}); + props.vcItemActor.send({ type: 'VERIFY' }); } }, [controller.verifiableCredentialData.vcMetadata.isVerified]); @@ -90,12 +86,11 @@ export const ViewVcModal: React.FC = props => { setLoadingSvg(true); const vcJsonString = JSON.stringify(controller.credential.credential); - const result = - await VcRenderer.getInstance().generateCredentialDisplayContent( - controller.verifiableCredentialData.format, - wellknown ?? null, - vcJsonString, - ); + const result = await VcRenderer.getInstance().generateCredentialDisplayContent( + controller.verifiableCredentialData.format, + wellknown ?? null, + vcJsonString, + ); setSvgTemplate(result); setSvgRendererError(null); @@ -180,100 +175,94 @@ export const ViewVcModal: React.FC = props => { headerTitle={t('title')} onDismiss={handleModalDismiss} headerElevation={2}> - - + - {controller.showVerificationStatusBanner && ( - - )} - - {!isVCLoaded(verifiableCredential) ? ( - - ) : ( - - )} - - {controller.isAcceptingBindingOtp && ( - - )} - - + )} - { - controller.CANCEL(); - }} + {!isVCLoaded(verifiableCredential) ? ( + + ) : ( + + )} - - - {controller.toastVisible && } - - + )} - + - - + { + controller.CANCEL(); + }} + /> + + + + {controller.toastVisible && } + + + + + + ); }; diff --git a/screens/HomeScreenLayout.tsx b/screens/HomeScreenLayout.tsx index 3fdf7a6b..7b663dcf 100644 --- a/screens/HomeScreenLayout.tsx +++ b/screens/HomeScreenLayout.tsx @@ -14,19 +14,32 @@ import {I18nManager, View} from 'react-native'; import {isIOS} from '../shared/constants'; import {Copilot} from '../components/ui/Copilot'; import LinearGradient from 'react-native-linear-gradient'; -import { useTabBarVisibility } from '../shared/hooks/useTabBarVisibility'; export const HomeScreenLayout: React.FC = props => { const {t} = useTranslation('IssuersScreen'); const {Navigator, Screen} = createNativeStackNavigator(); - const { hideTabBar, showTabBar } = useTabBarVisibility(); React.useLayoutEffect(() => { const routeName = getFocusedRouteNameFromRoute(props.route); if (routeName === 'IssuersScreen') { - hideTabBar(); + props.navigation.setOptions({tabBarStyle: {display: 'none'}}); } else { - showTabBar(); + props.navigation.setOptions({ + tabBarShowLabel: true, + tabBarActiveTintColor: Theme.Colors.IconBg, + tabBarLabelStyle: { + fontSize: 12, + fontFamily: 'Inter_600SemiBold', + }, + tabBarStyle: { + height: 75, + paddingHorizontal: 10, + }, + tabBarItemStyle: { + height: 83, + padding: 11, + }, + }); } }, [props.navigation, props.route]); diff --git a/screens/IntroSliders/biometricIntro.tsx b/screens/IntroSliders/biometricIntro.tsx index 0b556ef0..8bd4cfe7 100644 --- a/screens/IntroSliders/biometricIntro.tsx +++ b/screens/IntroSliders/biometricIntro.tsx @@ -2,8 +2,8 @@ import React from 'react'; import {useTranslation} from 'react-i18next'; import {Column, Text, Button} from '../../components/ui'; import {Theme} from '../../components/ui/styleUtils'; +import {SvgImage} from '../../components/ui/svg'; import {View, ScrollView} from 'react-native'; -import BiometricIcon from '../../components/BiometricIcon'; export const StaticAuthScreen: React.FC = () => { const {t} = useTranslation('AuthScreen'); @@ -30,7 +30,7 @@ export const StaticAuthScreen: React.FC = () => { overflow: 'hidden', }}> - + {SvgImage.fingerprintIcon(66)} { diff --git a/screens/Issuers/IssuersScreen.tsx b/screens/Issuers/IssuersScreen.tsx index 01e8527e..87539916 100644 --- a/screens/Issuers/IssuersScreen.tsx +++ b/screens/Issuers/IssuersScreen.tsx @@ -1,17 +1,20 @@ -import React, {useEffect, useLayoutEffect, useState} from 'react'; -import {useTranslation} from 'react-i18next'; -import {FlatList, View} from 'react-native'; -import {Issuer} from '../../components/openId4VCI/Issuer'; -import {Error} from '../../components/ui/Error'; -import {Header} from '../../components/ui/Header'; -import {Button, Column, Row, Text} from '../../components/ui'; -import {Theme} from '../../components/ui/styleUtils'; -import {RootRouteProps} from '../../routes'; -import {HomeRouteProps} from '../../routes/routeTypes'; -import {useIssuerScreenController} from './IssuerScreenController'; -import {Loader} from '../../components/ui/Loader'; +import React, { useEffect, useLayoutEffect, useState } from 'react'; +import { useTranslation } from 'react-i18next'; +import { FlatList, Pressable, View } from 'react-native'; +import { Issuer } from '../../components/openId4VCI/Issuer'; +import { Error } from '../../components/ui/Error'; +import { Header } from '../../components/ui/Header'; +import { Button, Column, Row, Text } from '../../components/ui'; +import { Theme } from '../../components/ui/styleUtils'; +import { RootRouteProps } from '../../routes'; +import { HomeRouteProps } from '../../routes/routeTypes'; +import { useIssuerScreenController } from './IssuerScreenController'; +import { Loader } from '../../components/ui/Loader'; import ScanIcon from '../../assets/scanIcon.svg'; -import {isTranslationKeyFound, removeWhiteSpace} from '../../shared/commonUtil'; +import { + isTranslationKeyFound, + removeWhiteSpace, +} from '../../shared/commonUtil'; import { ErrorMessage, getDisplayObjectForCurrentLanguage, @@ -23,27 +26,31 @@ import { sendInteractEvent, sendStartEvent, } from '../../shared/telemetry/TelemetryUtils'; -import {TelemetryConstants} from '../../shared/telemetry/TelemetryConstants'; -import {MessageOverlay} from '../../components/MessageOverlay'; -import {SearchBar} from '../../components/ui/SearchBar'; -import {SvgImage} from '../../components/ui/svg'; -import {BannerNotificationContainer} from '../../components/BannerNotificationContainer'; -import {CredentialTypeSelectionScreen} from './CredentialTypeSelectionScreen'; -import {QrScanner} from '../../components/QrScanner'; -import {AUTH_ROUTES} from '../../routes/routesConstants'; -import {TransactionCodeModal} from './TransactionCodeScreen'; -import {TrustModal} from '../../components/TrustModal'; - +import { TelemetryConstants } from '../../shared/telemetry/TelemetryConstants'; +import { MessageOverlay } from '../../components/MessageOverlay'; +import { SearchBar } from '../../components/ui/SearchBar'; +import { SvgImage } from '../../components/ui/svg'; +import { Icon } from 'react-native-elements'; +import { BannerNotificationContainer } from '../../components/BannerNotificationContainer'; +import { CredentialTypeSelectionScreen } from './CredentialTypeSelectionScreen'; +import { QrScanner } from '../../components/QrScanner'; +import { IssuersModel } from '../../machines/Issuers/IssuersModel'; +import { AUTH_ROUTES } from '../../routes/routesConstants'; +import { TransactionCodeModal } from './TransactionCodeScreen'; +import { TrustModal } from '../../components/TrustModal'; +import i18next from 'i18next'; export const IssuersScreen: React.FC< HomeRouteProps | RootRouteProps > = props => { + const model = IssuersModel; const controller = useIssuerScreenController(props); - const {i18n, t} = useTranslation('IssuersScreen'); + const { i18n, t } = useTranslation('IssuersScreen'); const issuers = controller.issuers; let [filteredSearchData, setFilteredSearchData] = useState(issuers); const [search, setSearch] = useState(''); const [tapToSearch, setTapToSearch] = useState(false); - const showFullScreenError = controller.isError; + const [clearSearchIcon, setClearSearchIcon] = useState(false); + const showFullScreenError = controller.isError const isVerificationFailed = controller.verificationErrorMessage !== ''; @@ -51,7 +58,8 @@ export const IssuersScreen: React.FC< const verificationErrorMessage = isTranslationKeyFound(translationKey, t) ? t(translationKey) - : t('errors.verificationFailed.ERR_GENERIC'); + : t('errors.verificationFailed.ERR_GENERIC'); + useLayoutEffect(() => { if (controller.loadingReason || showFullScreenError) { @@ -64,12 +72,13 @@ export const IssuersScreen: React.FC< header: props => (
), }); } + }, [ controller.loadingReason, controller.errorMessageType, @@ -84,10 +93,8 @@ export const IssuersScreen: React.FC< if (controller.isAuthEndpointToOpen) { (props.navigation as any).navigate(AUTH_ROUTES.AuthView, { authorizationURL: controller.authEndpount, - clientId: controller.selectedIssuer.client_id ?? 'wallet', - redirectUri: - controller.selectedIssuer.redirect_uri ?? - 'io.mosip.residentapp.inji://oauthredirect', + clientId: controller.selectedIssuer.client_id ?? "wallet", + redirectUri: controller.selectedIssuer.redirect_uri ?? "io.mosip.residentapp.inji://oauthredirect", controller: controller, }); } @@ -95,7 +102,7 @@ export const IssuersScreen: React.FC< const onPressHandler = (id: string, protocol: string) => { sendStartEvent( - getStartEventData(TelemetryConstants.FlowType.vcDownload, {id: id}), + getStartEventData(TelemetryConstants.FlowType.vcDownload, { id: id }), ); sendInteractEvent( getInteractEventData( @@ -117,9 +124,9 @@ export const IssuersScreen: React.FC< return ( controller.errorMessageType === ErrorMessage.TECHNICAL_DIFFICULTIES || controller.errorMessageType === - ErrorMessage.CREDENTIAL_TYPE_DOWNLOAD_FAILURE || + ErrorMessage.CREDENTIAL_TYPE_DOWNLOAD_FAILURE || controller.errorMessageType === - ErrorMessage.AUTHORIZATION_GRANT_TYPE_NOT_SUPPORTED || + ErrorMessage.AUTHORIZATION_GRANT_TYPE_NOT_SUPPORTED || controller.errorMessageType === ErrorMessage.NETWORK_REQUEST_FAILED ); } @@ -128,6 +135,11 @@ export const IssuersScreen: React.FC< setTapToSearch(true); }; + const clearSearchText = () => { + filterIssuers(''); + setClearSearchIcon(false); + }; + const goBack = () => { if ( controller.errorMessageType && @@ -159,6 +171,11 @@ export const IssuersScreen: React.FC< }); setFilteredSearchData(filteredData); setSearch(searchText); + if (searchText !== '') { + setClearSearchIcon(true); + } else { + setClearSearchIcon(false); + } }; if (controller.isSelectingCredentialType) { return ; @@ -178,7 +195,7 @@ export const IssuersScreen: React.FC< primaryButtonText="goBack" primaryButtonEvent={controller.RESET_VERIFY_ERROR} primaryButtonTestID="goBack" - customStyles={{marginTop: '30%'}} + customStyles={{ marginTop: '30%' }} /> ); } @@ -186,16 +203,14 @@ export const IssuersScreen: React.FC< return issuerTrustConsentComponent(); } if (controller.isTxCodeRequested) { - return ( - - ); + return } if (controller.isBiometricsCancelled) { @@ -238,7 +253,7 @@ export const IssuersScreen: React.FC< primaryButtonTestID="tryAgain" primaryButtonText={ controller.errorMessageType != ErrorMessage.TECHNICAL_DIFFICULTIES && - controller.errorMessageType != + controller.errorMessageType != ErrorMessage.AUTHORIZATION_GRANT_TYPE_NOT_SUPPORTED ? 'tryAgain' : undefined @@ -257,6 +272,7 @@ export const IssuersScreen: React.FC< /> ); } + if (controller.isQrScanning) { return qrScannerComponent(); @@ -264,21 +280,15 @@ export const IssuersScreen: React.FC< function qrScannerComponent() { return ( - + ); } - + function issuerTrustConsentComponent() { - return ( - - ); + return } return ( @@ -301,6 +311,19 @@ export const IssuersScreen: React.FC< onChangeText={filterIssuers} onLayout={() => filterIssuers('')} /> + {clearSearchIcon && ( + + + + )} {t('description')} - {search === '' && ( - - - - )} + {search === '' && } {controller.issuers.length > 0 && ( ( + renderItem={({ item }) => ( ); }; + + diff --git a/screens/Issuers/TransactionCodeScreen.tsx b/screens/Issuers/TransactionCodeScreen.tsx index 5329af15..53344d18 100644 --- a/screens/Issuers/TransactionCodeScreen.tsx +++ b/screens/Issuers/TransactionCodeScreen.tsx @@ -17,7 +17,6 @@ import {PinInput} from '../../components/PinInput'; import {Modal} from '../../components/ui/Modal'; import {CancelDownloadModal} from './ConfirmationModal'; import {Icon, Input} from 'react-native-elements'; -import LinearGradient from 'react-native-linear-gradient'; export const TransactionCodeModal: React.FC = props => { const {t} = useTranslation('transactionCodeScreen'); @@ -113,9 +112,7 @@ export const TransactionCodeModal: React.FC = props => { setTextLineCount(e.nativeEvent.lines.length); } }}> - {props.description - ? t(props.description) - : t('description')} + {t(`${props.description || t('description')}`)} {textLineCount > maxLines && ( = props => { style={ Theme.TransactionCodeScreenStyle.showMoreButton }> - {showFullDescription ? t('showLess') : t('showMore')} + {showFullDescription + ? t('Show less ↑') + : t('Show more ↓')} )} @@ -172,72 +171,44 @@ export const TransactionCodeModal: React.FC = props => { ) : ( <> - 0 - ? Theme.Colors.GradientColors - : [ - Theme.Colors.TransactionCodeBorderColor, - Theme.Colors.TransactionCodeBorderColor, - ] + + } + /> diff --git a/screens/MainLayout.tsx b/screens/MainLayout.tsx index 6c39a845..ab33bc60 100644 --- a/screens/MainLayout.tsx +++ b/screens/MainLayout.tsx @@ -27,19 +27,19 @@ const {Navigator, Screen} = createBottomTabNavigator(); export const MainLayout: React.FC = () => { const {t} = useTranslation('MainLayout'); + const {appService} = useContext(GlobalContext); const scanService = appService.children.get('scan'); + const options: BottomTabNavigationOptions = { + tabBarShowLabel: true, + tabBarActiveTintColor: Theme.Colors.IconBg, + ...Theme.BottomTabBarStyle, + }; const navigation = useNavigation(); const linkCode = useSelector(appService, selectIsLinkCode); - const options: BottomTabNavigationOptions = { - tabBarShowLabel: true, - tabBarActiveTintColor: Theme.Colors.IconBg, - ...Theme.BottomTabBarStyle, - }; - const authorizationRequest = useSelector( appService, selectAuthorizationRequest, @@ -51,96 +51,96 @@ export const MainLayout: React.FC = () => { } }, [linkCode, authorizationRequest]); - return ( - null} - animated> - ({ - tabBarAccessibilityLabel: route.name, - ...options, - })}> - {mainRoutes.map((route, index) => ( - { - if (route.name == share.name) { - scanService?.send(ScanEvents.RESET()); - } - }, - }} - options={{ - ...route.options, - title: t(route.name), - tabBarIcon: ({focused}) => ( - - {route.name === 'home' ? ( - focused ? ( - - {SvgImage[`${route.name}`](focused)} - - ) : ( - {SvgImage[`${route.name}`](focused)} - ) - ) : ( - - {focused ? ( - - {SvgImage[`${route.name}`](focused)} - - ) : ( - {SvgImage[`${route.name}`](focused)} - )} - - } - /> - )} - - ), - tabBarAccessibilityLabel: isIOS() ? t(route.name) : route.name, - tabBarTestID: route.name, - }} - /> - ))} - - + return ( + null} + animated> + ({ + tabBarAccessibilityLabel: route.name, + ...options, + })}> + {mainRoutes.map((route, index) => ( + { + if (route.name == share.name) { + scanService?.send(ScanEvents.RESET()); + } + }, + }} + options={{ + ...route.options, + title: t(route.name), + tabBarIcon: ({focused}) => ( + + {route.name === 'home' ? ( + focused ? ( + + {SvgImage[`${route.name}`](focused)} + + ) : ( + {SvgImage[`${route.name}`](focused)} + ) + ) : ( + + {focused ? ( + + {SvgImage[`${route.name}`](focused)} + + ) : ( + {SvgImage[`${route.name}`](focused)} + )} + + } + /> + )} + + ), + tabBarAccessibilityLabel: isIOS() ? t(route.name) : route.name, + tabBarTestID: route.name, + }} + /> + ))} + + ); }; diff --git a/screens/QrLogin/QrConsent.tsx b/screens/QrLogin/QrConsent.tsx index 054c0d74..4c9e56c4 100644 --- a/screens/QrLogin/QrConsent.tsx +++ b/screens/QrLogin/QrConsent.tsx @@ -3,13 +3,12 @@ import {useTranslation} from 'react-i18next'; import {Button, Column, Row, Text} from '../../components/ui'; import {Theme} from '../../components/ui/styleUtils'; import {useQrLogin} from './QrLoginController'; -import {Image, View} from 'react-native'; -import {ListItem} from 'react-native-elements'; +import {Image} from 'react-native'; +import {ListItem, Switch} from 'react-native-elements'; import {Modal} from '../../components/ui/Modal'; import {QrLoginRef} from '../../machines/QrLogin/QrLoginMachine'; import {ScrollView} from 'react-native'; import {getClientNameForCurrentLanguage} from '../../i18n'; -import Toggle from '../../components/Toggle'; export const QrConsent: React.FC = props => { const {t} = useTranslation('QrLogin'); @@ -101,10 +100,12 @@ export const QrConsent: React.FC = props => { - controller.SELECT_CONSENT(value, claim)} - testID="voluntaryClaimToggle" + onValueChange={() => + controller.SELECT_CONSENT(controller.isShare[claim], claim) + } + color={Theme.Colors.Icon} /> ))} diff --git a/screens/Request/ReceiveVcScreen.tsx b/screens/Request/ReceiveVcScreen.tsx index 6ed1162e..16c111dc 100644 --- a/screens/Request/ReceiveVcScreen.tsx +++ b/screens/Request/ReceiveVcScreen.tsx @@ -13,7 +13,6 @@ import {DETAIL_VIEW_DEFAULT_FIELDS} from '../../components/VC/common/VCUtils'; import {getDetailedViewFields} from '../../shared/openId4VCI/Utils'; import {VCProcessor} from '../../components/VC/common/VCProcessor'; import VcRenderer from '../../shared/vcRenderer/VcRenderer'; -import {BannerNotificationContainer} from '../../components/BannerNotificationContainer'; export const ReceiveVcScreen: React.FC = () => { const {t} = useTranslation('ReceiveVcScreen'); @@ -54,12 +53,11 @@ export const ReceiveVcScreen: React.FC = () => { setLoadingSvg(true); const vcJsonString = JSON.stringify(controller.credential.credential); - const result = - await VcRenderer.getInstance().generateCredentialDisplayContent( - verifiableCredentialData.vcMetadata.format, - wellknown ?? null, - vcJsonString, - ); + const result = await VcRenderer.getInstance().generateCredentialDisplayContent( + verifiableCredentialData.vcMetadata.format, + wellknown ?? null, + vcJsonString, + ); setSvgTemplate(result); setSvgRendererError(null); @@ -97,7 +95,6 @@ export const ReceiveVcScreen: React.FC = () => { return ( - {controller.isDisplayingIncomingVC && ( { return ( + { title: t('incomingVc'), headerLeft: () => !I18nManager.isRTL && ( - - { - controller.RESET(); - }} - style={Theme.Styles.IconContainer} - tintColor={Theme.Colors.Icon} - /> - + { + controller.RESET(); + }} + style={Theme.Styles.IconContainer} + tintColor={Theme.Colors.Icon} + /> ), headerRight: () => I18nManager.isRTL && ( - - { - controller.RESET(); - }} - style={Theme.Styles.IconContainer} - tintColor={Theme.Colors.Icon} - /> - + { + controller.RESET(); + }} + style={Theme.Styles.IconContainer} + tintColor={Theme.Colors.Icon} + /> ), }} /> @@ -88,35 +77,23 @@ export const RequestLayout: React.FC = () => { title: t('receiveCard'), headerLeft: () => !I18nManager.isRTL && ( - - { - controller.GOTO_HOME(); - }} - style={Theme.Styles.IconContainer} - tintColor={Theme.Colors.Icon} - /> - + { + controller.GOTO_HOME(); + }} + style={Theme.Styles.IconContainer} + tintColor={Theme.Colors.Icon} + /> ), headerRight: () => I18nManager.isRTL && ( - - { - controller.GOTO_HOME(); - }} - style={Theme.Styles.IconContainer} - tintColor={Theme.Colors.Icon} - /> - + { + controller.GOTO_HOME(); + }} + style={Theme.Styles.IconContainer} + tintColor={Theme.Colors.Icon} + /> ), }} /> diff --git a/screens/Request/RequestScreen.tsx b/screens/Request/RequestScreen.tsx index c48d1ba1..0ccdb0a7 100644 --- a/screens/Request/RequestScreen.tsx +++ b/screens/Request/RequestScreen.tsx @@ -13,7 +13,6 @@ import {BOTTOM_TAB_ROUTES} from '../../routes/routesConstants'; import {ProgressingModal} from '../../components/ProgressingModal'; import {isIOS} from '../../shared/constants'; import testIDProps from '../../shared/commonUtil'; -import {BannerNotificationContainer} from '../../components/BannerNotificationContainer'; type RequestStackParamList = { RequestScreen: undefined; @@ -46,9 +45,9 @@ export const RequestScreen: React.FC = () => { return ( - {loadQRCode()} {controller.isMinimumStorageLimitReached && ( { ) { return ( - + {controller.isWaitingForConnection && } diff --git a/screens/Scan/ScanLayoutController.ts b/screens/Scan/ScanLayoutController.ts index cc0143c1..319057e1 100644 --- a/screens/Scan/ScanLayoutController.ts +++ b/screens/Scan/ScanLayoutController.ts @@ -60,12 +60,15 @@ import { } from '../../machines/openID4VP/openID4VPSelectors'; import {OpenID4VPEvents} from '../../machines/openID4VP/openID4VPMachine'; import {selectShareableVcsMetadata} from '../../machines/VerifiableCredential/VCMetaMachine/VCMetaSelectors'; -import { useTabBarVisibility } from '../../shared/hooks/useTabBarVisibility'; type ScanLayoutNavigation = NavigationProp< ScanStackParamList & MainBottomTabParamList >; +const changeTabBarVisible = (visible: string) => { + Theme.BottomTabBarStyle.tabBarStyle.display = visible; +}; + // TODO: refactor // eslint-disable-next-line sonarjs/cognitive-complexity export function useScanLayout() { @@ -74,7 +77,6 @@ export function useScanLayout() { const scanService = appService.children.get('scan')!!; const openID4VPService = scanService.getSnapshot().context.OpenId4VPRef; const navigation = useNavigation(); - const {showTabBar, hideTabBar} = useTabBarVisibility(); const isLocationDisabled = useSelector(scanService, selectIsLocationDisabled); const isLocationDenied = useSelector(scanService, selectIsLocationDenied); @@ -114,14 +116,14 @@ export function useScanLayout() { const onRetry = () => scanService.send(ScanEvents.RETRY()); const GOTO_HOME = () => { scanService.send(ScanEvents.DISMISS()); - showTabBar(); + changeTabBarVisible('flex'); setTimeout(() => { navigation.navigate(BOTTOM_TAB_ROUTES.home); }, 1); }; const GOTO_HISTORY = () => { scanService.send(ScanEvents.GOTO_HISTORY()); - showTabBar(); + changeTabBarVisible('flex'); navigation.navigate(BOTTOM_TAB_ROUTES.history); }; const RETRY_VERIFICATION = () => { @@ -316,26 +318,26 @@ export function useScanLayout() { appService.send(APP_EVENTS.RESET_AUTHORIZATION_REQUEST()); } } else if (isQrLoginDoneViaDeeplink) { - showTabBar(); + changeTabBarVisible('flex'); navigation.navigate(BOTTOM_TAB_ROUTES.home); } else if (isDone) { - showTabBar(); + changeTabBarVisible('flex'); navigation.navigate(BOTTOM_TAB_ROUTES.home); } else if ( isReviewing && flowType === VCShareFlowType.SIMPLE_SHARE && !isAccepted ) { - hideTabBar(); + changeTabBarVisible('none'); navigation.navigate(SCAN_ROUTES.SendVcScreen); } else if (openID4VPFlowType === VCShareFlowType.OPENID4VP) { - hideTabBar(); + changeTabBarVisible('none'); navigation.navigate(SCAN_ROUTES.SendVPScreen); } else if (isScanning) { - showTabBar(); + changeTabBarVisible('flex'); navigation.navigate(SCAN_ROUTES.ScanScreen); } else if (isQrLoginDone) { - showTabBar(); + changeTabBarVisible('flex'); navigation.navigate(BOTTOM_TAB_ROUTES.history); } }, [ diff --git a/screens/Scan/SendVPScreen.tsx b/screens/Scan/SendVPScreen.tsx index db2db47f..e5773d1a 100644 --- a/screens/Scan/SendVPScreen.tsx +++ b/screens/Scan/SendVPScreen.tsx @@ -340,7 +340,7 @@ export const SendVPScreen: React.FC = props => { ; +const changeTabBarVisible = (visible: string) => { + Theme.BottomTabBarStyle.tabBarStyle.display = visible; +}; + export function useSendVPScreen() { const {t} = useTranslation('SendVPScreen'); const {appService} = useContext(GlobalContext); @@ -61,7 +64,6 @@ export function useSendVPScreen() { const activityLogService = appService.children.get('activityLog')!!; const navigation = useNavigation(); const openID4VPService = scanService.getSnapshot().context.OpenId4VPRef; - const {showTabBar} = useTabBarVisibility(); // input descriptor id to VCs mapping const [inputDescriptorIdToSelectedVcKeys, setInputDescriptorIdToSelectedVcKeys] = useState>( {}, @@ -272,7 +274,7 @@ export function useSendVPScreen() { scanService.send(ScanEvents.RESET()); setTimeout(() => { navigation.navigate(BOTTOM_TAB_ROUTES.home, {screen: 'HomeScreen'}); - showTabBar(); + changeTabBarVisible('flex'); }, 0); }, SELECT_VC_ITEM: diff --git a/screens/Scan/SendVcScreenController.ts b/screens/Scan/SendVcScreenController.ts index 7e22ebd3..4343be9a 100644 --- a/screens/Scan/SendVcScreenController.ts +++ b/screens/Scan/SendVcScreenController.ts @@ -23,16 +23,18 @@ import {RootRouteProps} from '../../routes'; import {BOTTOM_TAB_ROUTES} from '../../routes/routesConstants'; import {VCItemMachine} from '../../machines/VerifiableCredential/VCItemMachine/VCItemMachine'; import {Theme} from '../../components/ui/styleUtils'; -import { useTabBarVisibility } from '../../shared/hooks/useTabBarVisibility'; type MyVcsTabNavigation = NavigationProp; +const changeTabBarVisible = (visible: string) => { + Theme.BottomTabBarStyle.tabBarStyle.display = visible; +}; + export function useSendVcScreen() { const {appService} = useContext(GlobalContext); const scanService = appService.children.get('scan')!!; const vcMetaService = appService.children.get('vcMeta')!!; const navigation = useNavigation(); - const {showTabBar} = useTabBarVisibility(); const [selectedIndex, setSelectedIndex] = useState(null); @@ -73,7 +75,7 @@ export function useSendVcScreen() { RETRY_VERIFICATION: () => scanService.send(ScanEvents.RETRY_VERIFICATION()), GO_TO_HOME: () => { navigation.navigate(BOTTOM_TAB_ROUTES.home, {screen: 'HomeScreen'}); - showTabBar(); + changeTabBarVisible('flex'); }, SELECT_VC_ITEM: (index: number) => (vcRef: ActorRefFrom) => { diff --git a/screens/Settings/AboutInji.tsx b/screens/Settings/AboutInji.tsx index ce048e7f..c521a4b8 100644 --- a/screens/Settings/AboutInji.tsx +++ b/screens/Settings/AboutInji.tsx @@ -60,93 +60,91 @@ export const AboutInji: React.FC = ({appId}) => { onDismiss={() => { setShowAboutInji(!showAboutInji); }}> - - - - - - - {t('appID')} - - - {I18nManager.isRTL ? appId : ' : ' + appId} - - - - - - - - - {t('aboutDetails')} - - - - {t('forMoreDetails')} - - { - aboutInjiUrl && Linking.openURL(aboutInjiUrl); - }}> - - {t('clickHere')} - - - - - - - - - {t('version') + ' : '} - - - {__InjiVersion.getValue()} - - - + + + + - {t('poweredBy')} + style={Theme.AboutInjiScreenStyle.appIdTitleStyle}> + {t('appID')} - + + {I18nManager.isRTL ? appId : ' : ' + appId} + + + + + + + + + {t('aboutDetails')} + + + + {t('forMoreDetails')} + + { + aboutInjiUrl && Linking.openURL(aboutInjiUrl); + }}> + + {t('clickHere')} + + + - + + + + + {t('version') + ' : '} + + + {__InjiVersion.getValue()} + + + + + {t('poweredBy')} + + + ); diff --git a/screens/Settings/KeyManagementScreen.tsx b/screens/Settings/KeyManagementScreen.tsx index 1a15cbdc..893fa91d 100644 --- a/screens/Settings/KeyManagementScreen.tsx +++ b/screens/Settings/KeyManagementScreen.tsx @@ -11,11 +11,17 @@ import {BackButton} from '../../components/ui/backButton/BackButton'; import {Copilot} from '../../components/ui/Copilot'; import {useCopilot} from 'react-native-copilot'; import {useNavigation, useRoute, RouteProp} from '@react-navigation/native'; -import { getImpressionEventData, sendImpressionEvent} from '../../shared/telemetry/TelemetryUtils'; +import { + getEndEventData, + getImpressionEventData, + sendEndEvent, + sendImpressionEvent, +} from '../../shared/telemetry/TelemetryUtils'; import {TelemetryConstants} from '../../shared/telemetry/TelemetryConstants'; import {SUPPORTED_KEY_TYPES} from '../../shared/constants'; +import {SvgImage} from '../../components/ui/svg'; +import LinearGradient from 'react-native-linear-gradient'; import { HelpIcon } from '../../components/ui/HelpIcon'; -import { SafeAreaView } from 'react-native-safe-area-context'; const {RNSecureKeystoreModule} = NativeModules; @@ -102,7 +108,6 @@ export const KeyManagementScreen: React.FC = () => { }; return ( - = () => { triggerComponent={ HelpIcon() } /> - - - - item.value} - onReordered={handleReorder} - /> - } - /> - - - ); }; diff --git a/screens/Settings/ReceivedCardsModal.tsx b/screens/Settings/ReceivedCardsModal.tsx index 81fea576..704aae71 100644 --- a/screens/Settings/ReceivedCardsModal.tsx +++ b/screens/Settings/ReceivedCardsModal.tsx @@ -1,6 +1,6 @@ import React from 'react'; import {useTranslation} from 'react-i18next'; -import {RefreshControl, View} from 'react-native'; +import {RefreshControl} from 'react-native'; import {Centered, Column, Text} from '../../components/ui'; import {Icon} from 'react-native-elements'; import {Theme} from '../../components/ui/styleUtils'; @@ -9,7 +9,6 @@ import {ViewVcModal} from '../Home/ViewVcModal'; import {VcItemContainer} from '../../components/VC/VcItemContainer'; import {VCItemContainerFlowType} from '../../shared/Utils'; import {CopilotProvider} from 'react-native-copilot'; -import {BannerNotificationContainer} from '../../components/BannerNotificationContainer'; export const ReceivedCardsModal: React.FC = ({ isVisible, @@ -25,66 +24,63 @@ export const ReceivedCardsModal: React.FC = ({ headerTitle={t('header')} headerElevation={2} onDismiss={onDismiss}> - - - - }> - - {controller.receivedVcsMetadata.map(vcMetadata => ( - - ))} - - - {controller.receivedVcsMetadata.length === 0 && ( - - - - - {t('noReceivedVcsTitle')} - - - {t('noReceivedVcsText')} - - - - )} - - {controller.selectedVc && ( - + }> + + {controller.receivedVcsMetadata.map(vcMetadata => ( + + ))} + + + {controller.receivedVcsMetadata.length === 0 && ( + + + + + {t('noReceivedVcsTitle')} + + + {t('noReceivedVcsText')} + + + )} - + + {controller.selectedVc && ( + + )} ); }; diff --git a/screens/Settings/SettingScreen.tsx b/screens/Settings/SettingScreen.tsx index 93314bda..8368d5cb 100644 --- a/screens/Settings/SettingScreen.tsx +++ b/screens/Settings/SettingScreen.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import {Platform, Pressable, View} from 'react-native'; +import {Platform, Pressable} from 'react-native'; import {Icon, ListItem, Switch} from 'react-native-elements'; import {Column, Row, Text} from '../../components/ui'; import {Theme} from '../../components/ui/styleUtils'; @@ -18,9 +18,6 @@ import {SvgImage} from '../../components/ui/svg'; import {DataBackupAndRestore} from './DataBackupAndRestore'; import {BannerNotificationContainer} from '../../components/BannerNotificationContainer'; import {SettingsKeyManagementScreen} from './SettingsKeyManagement'; -import SwitchToggle from 'react-native-switch-toggle'; -import BiometricIcon from '../../components/BiometricIcon'; -import Toggle from '../../components/Toggle'; const LanguageSetting: React.FC = () => { const {t} = useTranslation('SettingScreen'); @@ -132,7 +129,7 @@ export const SettingScreen: React.FC< - + {SvgImage.fingerprintIcon(24)} - { - handleBiometricToggle(!value); + onValueChange={handleBiometricToggle} + trackColor={{ + false: Theme.Colors.switchTrackFalse, + true: + Platform.OS == 'ios' + ? Theme.Colors.switchHead + : Theme.Colors.switchTrackTrue, }} - testID="biometricToggle" + color={Theme.Colors.switchHead} /> diff --git a/screens/backupAndRestore/BackupAndRestoreScreen.tsx b/screens/backupAndRestore/BackupAndRestoreScreen.tsx index f3581305..0544f560 100644 --- a/screens/backupAndRestore/BackupAndRestoreScreen.tsx +++ b/screens/backupAndRestore/BackupAndRestoreScreen.tsx @@ -13,7 +13,10 @@ import {ProfileInfo} from '../../shared/CloudBackupAndRestoreUtils'; import {useBackupScreen} from './BackupController'; import {BannerNotificationContainer} from '../../components/BannerNotificationContainer'; import {useBackupRestoreScreen} from '../Settings/BackupRestoreController'; -import {getAccountType, getDriveName} from '../../shared/commonUtil'; +import { + getAccountType, + getDriveName, +} from '../../shared/commonUtil'; import {HelpScreen} from '../../components/HelpScreen'; import {isIOS} from '../../shared/constants'; import {HelpIcon} from '../../components/ui/HelpIcon'; @@ -208,23 +211,22 @@ const BackupAndRestoreScreen: React.FC = props => { } onDismiss={props.onBackPress}> + - {props.isSigningIn || backupController.isLoadingBackupDetails ? ( ) : ( - - {LastBackupSection} - {AccountSection} - {RestoreSection} - + + {LastBackupSection} + {AccountSection} + {RestoreSection} + )} diff --git a/shared/hooks/useFont.ts b/shared/hooks/useFont.ts index af842935..f6c3cf03 100644 --- a/shared/hooks/useFont.ts +++ b/shared/hooks/useFont.ts @@ -1,17 +1,17 @@ import { - Montserrat_400Regular, - Montserrat_500Medium, - Montserrat_600SemiBold, - Montserrat_700Bold, + Inter_400Regular, + Inter_500Medium, + Inter_600SemiBold, + Inter_700Bold, useFonts, -} from '@expo-google-fonts/montserrat'; +} from '@expo-google-fonts/inter'; export function useFont() { const [hasFontsLoaded] = useFonts({ - Montserrat_400Regular, - Montserrat_500Medium, - Montserrat_600SemiBold, - Montserrat_700Bold, + Inter_400Regular, + Inter_500Medium, + Inter_600SemiBold, + Inter_700Bold, }); return hasFontsLoaded; diff --git a/shared/hooks/useTabBarVisibility.ts b/shared/hooks/useTabBarVisibility.ts deleted file mode 100644 index 6a8c1cb2..00000000 --- a/shared/hooks/useTabBarVisibility.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { useNavigation } from '@react-navigation/native'; -import { useCallback } from 'react'; -import { Theme } from '../../components/ui/styleUtils'; - -export function useTabBarVisibility() { - const navigation = useNavigation(); - - const hideTabBar = useCallback(() => { - navigation.setOptions({ - tabBarStyle: { display: 'none' } - }); - }, [navigation]); - - const showTabBar = useCallback(() => { - navigation.setOptions({ - tabBarShowLabel: true, - tabBarActiveTintColor: Theme.Colors.IconBg, - tabBarLabelStyle: { - fontSize: 12, - fontFamily: 'Montserrat_600SemiBold', - }, - tabBarStyle: { - height: 75, - paddingHorizontal: 10, - }, - tabBarItemStyle: { - height: 83, - padding: 11, - }, - }); - - }, [navigation]); - - return { hideTabBar, showTabBar }; -}