Solve conflicts

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## Current Main Branch
 
+## 5.12.3 - Dec 16, 2022
+- Hotfix version bump for iOS only release, no code changes
+
 ## 5.12.1 - Dec 6, 2022
 - [#5366](https://github.com/MetaMask/metamask-mobile/pull/5366): [UPDATE] On-ramp Refactor wyre authentication url approach
 - [#5362](https://github.com/MetaMask/metamask-mobile/pull/5362): [UPDATE] copy for Opt in metrics screen and enable custom mainnet RPC

android/app/build.gradle

@@ -159,8 +159,8 @@ android {
 		applicationId "io.metamask"
 		minSdkVersion rootProject.ext.minSdkVersion
 		targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 1030
-		versionName "5.12.1"
+		versionCode 1033
+		versionName "5.12.3"
 		multiDexEnabled true
 		testBuildType System.getProperty('testBuildType', 'debug')
 		missingDimensionStrategy "minReactNative", "minReactNative46"

app/components/Base/Alert.tsx

@@ -10,10 +10,8 @@ import {
   TextStyle,
 } from 'react-native';
 import IonicIcon from 'react-native-vector-icons/Ionicons';
-import CustomText from './Text';
+import Text from './Text';
 import { useTheme } from '../../util/theme';
-// TODO: Convert into typescript and correctly type optionals
-const Text = CustomText as any;
 
 export enum AlertType {
   Info = 'Info',

app/components/UI/FiatOrders/components/ScreenView.js → app/components/Base/ScreenView.tsx

@@ -1,16 +1,17 @@
+import { ThemeColors } from '@metamask/design-tokens/dist/js/themes/types';
 import React from 'react';
 import { SafeAreaView, StyleSheet, ScrollView } from 'react-native';
-import { useTheme } from '../../../../util/theme';
+import { useTheme } from '../../util/theme';
 
-const createStyles = (colors) =>
+const createStyles = (colors: ThemeColors) =>
   StyleSheet.create({
     wrapper: {
       backgroundColor: colors.background.default,
       flex: 1,
     },
   });
 
-const ScreenView = (props) => {
+const ScreenView: React.FC = (props) => {
   const { colors } = useTheme();
   const styles = createStyles(colors);