Skip to content

Commit

Permalink
fix: Paint header blue for txHistory screen (#3025)
Browse files Browse the repository at this point in the history
  • Loading branch information
jorbuedo authored Jan 19, 2024
1 parent 4fb57f2 commit 7b085e4
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 72 deletions.
2 changes: 1 addition & 1 deletion apps/wallet-mobile/src/TxHistory/TxHistory.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const TxHistory = () => {

return (
<View style={styles.scrollView}>
<StatusBar type="dark" />
<StatusBar type="dark" overrideColor="#E1EAF6" />

<Animated.View style={[styles.container, translateStyles]}>
<CollapsibleHeader expanded={expanded}>
Expand Down
5 changes: 5 additions & 0 deletions apps/wallet-mobile/src/TxHistory/TxHistoryNavigator.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}}
Expand Down
5 changes: 3 additions & 2 deletions apps/wallet-mobile/src/components/StatusBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 <NativeStatusBar style={type} backgroundColor={backgroundColor} />
return <NativeStatusBar style={type} backgroundColor={overrideColor ?? backgroundColor} />
}
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -73,6 +73,8 @@ export const StartMultiTokenTxScreen = () => {

return (
<View style={styles.container}>
<StatusBar type="dark" />

<KeyboardAvoidingView style={styles.flex}>
<ScrollView style={styles.flex} bounces={false}>
<ShowErrors />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
"start": {
"line": 161,
"column": 9,
"index": 5287
"index": 5311
},
"end": {
"line": 164,
"column": 3,
"index": 5386
"index": 5410
}
},
{
Expand All @@ -21,12 +21,12 @@
"start": {
"line": 165,
"column": 11,
"index": 5399
"index": 5423
},
"end": {
"line": 168,
"column": 3,
"index": 5581
"index": 5605
}
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -4,239 +4,239 @@
"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
}
},
{
"id": "swap.swapScreen.swapTitle",
"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
}
},
{
"id": "swap.swapScreen.swapFrom",
"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
}
},
{
"id": "swap.swapScreen.swapTo",
"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
}
},
{
"id": "swap.swapScreen.slippageTolerance",
"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
}
},
{
"id": "swap.swapScreen.selectPool",
"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
}
},
{
"id": "components.send.sendscreen.title",
"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
}
},
{
"id": "components.send.addressreaderqr.title",
"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
}
},
{
"id": "components.send.selectasset.title",
"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
}
},
{
"id": "components.send.listamountstosendscreen.title",
"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
}
},
{
"id": "components.send.editamountscreen.title",
"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
}
},
{
"id": "components.send.confirmscreen.title",
"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
}
},
{
"id": "components.receive.receivescreen.infoText",
"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
}
},
{
"id": "global.confirmationTransaction",
"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
}
},
{
"id": "scan.title",
"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
}
},
{
"id": "claim.showSuccess.title",
"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
}
}
]

0 comments on commit 7b085e4

Please sign in to comment.