From 7b085e44418ccc45badf11b197cefba9d7f188c6 Mon Sep 17 00:00:00 2001 From: jorbuedo Date: Fri, 19 Jan 2024 13:43:32 +0100 Subject: [PATCH] fix: Paint header blue for txHistory screen (#3025) --- .../wallet-mobile/src/TxHistory/TxHistory.tsx | 2 +- .../src/TxHistory/TxHistoryNavigator.tsx | 5 + .../src/components/StatusBar.tsx | 5 +- .../StartMultiTokenTxScreen.tsx | 4 +- .../messages/src/TxHistory/TxHistory.json | 8 +- .../src/TxHistory/TxHistoryNavigator.json | 128 +++++++++--------- 6 files changed, 80 insertions(+), 72 deletions(-) diff --git a/apps/wallet-mobile/src/TxHistory/TxHistory.tsx b/apps/wallet-mobile/src/TxHistory/TxHistory.tsx index 143411b1e3..5d90e9f653 100644 --- a/apps/wallet-mobile/src/TxHistory/TxHistory.tsx +++ b/apps/wallet-mobile/src/TxHistory/TxHistory.tsx @@ -54,7 +54,7 @@ export const TxHistory = () => { return ( - + diff --git a/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx b/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx index c06fe55398..e57f099af5 100644 --- a/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx +++ b/apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx @@ -126,6 +126,11 @@ export const TxHistoryNavigator = () => { screenListeners={{}} screenOptions={{ ...defaultStackNavigationOptions, + headerStyle: { + elevation: 0, + shadowOpacity: 0, + backgroundColor: '#E1EAF6', + }, detachPreviousScreen: false /* https://github.com/react-navigation/react-navigation/issues/9883 */, gestureEnabled: true, }} diff --git a/apps/wallet-mobile/src/components/StatusBar.tsx b/apps/wallet-mobile/src/components/StatusBar.tsx index 11313ce4b4..9159250469 100644 --- a/apps/wallet-mobile/src/components/StatusBar.tsx +++ b/apps/wallet-mobile/src/components/StatusBar.tsx @@ -5,10 +5,11 @@ import {COLORS} from '../theme' type Props = { type: 'dark' | 'light' + overrideColor?: string } -export const StatusBar = ({type}: Props) => { +export const StatusBar = ({type, overrideColor}: Props) => { const backgroundColor = type === 'dark' ? COLORS.WHITE : COLORS.BACKGROUND_BLUE - return + return } diff --git a/apps/wallet-mobile/src/features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen.tsx b/apps/wallet-mobile/src/features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen.tsx index 5b479e6d8c..5cbad9b115 100644 --- a/apps/wallet-mobile/src/features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen.tsx +++ b/apps/wallet-mobile/src/features/Send/useCases/StartMultiTokenTx/StartMultiTokenTxScreen.tsx @@ -3,7 +3,7 @@ import _ from 'lodash' import React from 'react' import {ScrollView, StyleSheet, View, ViewProps} from 'react-native' -import {Button, KeyboardAvoidingView, Spacer} from '../../../../components' +import {Button, KeyboardAvoidingView, Spacer, StatusBar} from '../../../../components' import {useMetrics} from '../../../../metrics/metricsManager' import {useSelectedWallet} from '../../../../SelectedWallet' import {COLORS} from '../../../../theme' @@ -73,6 +73,8 @@ export const StartMultiTokenTxScreen = () => { return ( + + diff --git a/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json b/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json index a7b4da59b3..b247a26d31 100644 --- a/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json +++ b/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistory.json @@ -6,12 +6,12 @@ "start": { "line": 161, "column": 9, - "index": 5287 + "index": 5311 }, "end": { "line": 164, "column": 3, - "index": 5386 + "index": 5410 } }, { @@ -21,12 +21,12 @@ "start": { "line": 165, "column": 11, - "index": 5399 + "index": 5423 }, "end": { "line": 168, "column": 3, - "index": 5581 + "index": 5605 } } ] \ No newline at end of file diff --git a/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistoryNavigator.json b/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistoryNavigator.json index c9e6164f02..d2606e40b8 100644 --- a/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistoryNavigator.json +++ b/apps/wallet-mobile/translations/messages/src/TxHistory/TxHistoryNavigator.json @@ -4,14 +4,14 @@ "defaultMessage": "!!!Receive", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 350, + "line": 357, "column": 16, - "index": 13130 + "index": 13356 }, "end": { - "line": 353, + "line": 360, "column": 3, - "index": 13219 + "index": 13445 } }, { @@ -19,14 +19,14 @@ "defaultMessage": "!!!Swap", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 354, + "line": 361, "column": 13, - "index": 13234 + "index": 13460 }, "end": { - "line": 357, + "line": 364, "column": 3, - "index": 13307 + "index": 13533 } }, { @@ -34,14 +34,14 @@ "defaultMessage": "!!!Swap from", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 358, + "line": 365, "column": 17, - "index": 13326 + "index": 13552 }, "end": { - "line": 361, + "line": 368, "column": 3, - "index": 13403 + "index": 13629 } }, { @@ -49,14 +49,14 @@ "defaultMessage": "!!!Swap to", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 362, + "line": 369, "column": 15, - "index": 13420 + "index": 13646 }, "end": { - "line": 365, + "line": 372, "column": 3, - "index": 13493 + "index": 13719 } }, { @@ -64,14 +64,14 @@ "defaultMessage": "!!!Slippage Tolerance", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 366, + "line": 373, "column": 21, - "index": 13516 + "index": 13742 }, "end": { - "line": 369, + "line": 376, "column": 3, - "index": 13611 + "index": 13837 } }, { @@ -79,14 +79,14 @@ "defaultMessage": "!!!Select pool", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 370, + "line": 377, "column": 14, - "index": 13627 + "index": 13853 }, "end": { - "line": 373, + "line": 380, "column": 3, - "index": 13708 + "index": 13934 } }, { @@ -94,14 +94,14 @@ "defaultMessage": "!!!Send", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 374, + "line": 381, "column": 13, - "index": 13723 + "index": 13949 }, "end": { - "line": 377, + "line": 384, "column": 3, - "index": 13803 + "index": 14029 } }, { @@ -109,14 +109,14 @@ "defaultMessage": "!!!Scan QR code address", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 378, + "line": 385, "column": 18, - "index": 13823 + "index": 14049 }, "end": { - "line": 381, + "line": 388, "column": 3, - "index": 13924 + "index": 14150 } }, { @@ -124,14 +124,14 @@ "defaultMessage": "!!!Select asset", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 382, + "line": 389, "column": 20, - "index": 13946 + "index": 14172 }, "end": { - "line": 385, + "line": 392, "column": 3, - "index": 14035 + "index": 14261 } }, { @@ -139,14 +139,14 @@ "defaultMessage": "!!!Selected tokens", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 386, + "line": 393, "column": 26, - "index": 14063 + "index": 14289 }, "end": { - "line": 389, + "line": 396, "column": 3, - "index": 14167 + "index": 14393 } }, { @@ -154,14 +154,14 @@ "defaultMessage": "!!!Edit amount", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 390, + "line": 397, "column": 19, - "index": 14188 + "index": 14414 }, "end": { - "line": 393, + "line": 400, "column": 3, - "index": 14281 + "index": 14507 } }, { @@ -169,14 +169,14 @@ "defaultMessage": "!!!Confirm", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 394, + "line": 401, "column": 16, - "index": 14299 + "index": 14525 }, "end": { - "line": 397, + "line": 404, "column": 3, - "index": 14385 + "index": 14611 } }, { @@ -184,14 +184,14 @@ "defaultMessage": "!!!Share this address to receive payments. To protect your privacy, new addresses are generated automatically once you use them.", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 398, + "line": 405, "column": 19, - "index": 14406 + "index": 14632 }, "end": { - "line": 404, + "line": 411, "column": 3, - "index": 14644 + "index": 14870 } }, { @@ -199,14 +199,14 @@ "defaultMessage": "!!!Confirm transaction", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 405, + "line": 412, "column": 27, - "index": 14673 + "index": 14899 }, "end": { - "line": 408, + "line": 415, "column": 3, - "index": 14766 + "index": 14992 } }, { @@ -214,14 +214,14 @@ "defaultMessage": "!!!Please scan a QR code", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 409, + "line": 416, "column": 13, - "index": 14781 + "index": 15007 }, "end": { - "line": 412, + "line": 419, "column": 3, - "index": 14856 + "index": 15082 } }, { @@ -229,14 +229,14 @@ "defaultMessage": "!!!Success", "file": "src/TxHistory/TxHistoryNavigator.tsx", "start": { - "line": 413, + "line": 420, "column": 25, - "index": 14883 + "index": 15109 }, "end": { - "line": 416, + "line": 423, "column": 3, - "index": 14957 + "index": 15183 } } ] \ No newline at end of file