Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(wallet-mobile): tx review uat utxos tab #3790

Merged
merged 1 commit into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {

import {Button} from '../../../../../components/Button/Button'
import {SafeArea} from '../../../../../components/SafeArea'
import {ScrollView} from '../../../../../components/ScrollView/ScrollView'
import {ScrollView, useScrollView} from '../../../../../components/ScrollView/ScrollView'
import {isEmptyString} from '../../../../../kernel/utils'
import {useStrings} from '../../../common/hooks/useStrings'
import {FormattedMetadata, FormattedTx} from '../../../common/types'
Expand All @@ -25,6 +25,7 @@ import {MintTab} from './Mint/MintTab'
import {ReferenceInputsTab} from './ReferenceInputs/ReferenceInputs'

const MaterialTab = createMaterialTopTabNavigator()
type Tabs = 'overview' | 'utxos' | 'metadata' | 'mint' | 'reference_inputs'

export const ReviewTx = ({
formattedTx,
Expand All @@ -46,10 +47,11 @@ export const ReviewTx = ({
const {styles} = useStyles()
const strings = useStrings()

const tabsData = [
const tabsData: Array<[string, Tabs]> = [
[strings.overviewTab, 'overview'],
[strings.utxosTab, 'utxos'],
]
const [activeTab, setActiveTab] = React.useState<Tabs>(tabsData[0][1])

const showMetadataTab = !isEmptyString(formattedMetadata?.hash) && formattedMetadata?.metadata != null
const showMintTab = !!formattedTx.mint
Expand All @@ -59,12 +61,32 @@ export const ReviewTx = ({
if (showMintTab) tabsData.push([strings.mintTab, 'mint'])
if (showReferenceInoutsTab) tabsData.push([strings.referenceInputsTab, 'reference_inputs'])

// intentionally not using ref
const {isScrollBarShown: isOverviewScrollBarShown, setIsScrollBarShown: setOverviewIsScrollBarShown} = useScrollView()
const {isScrollBarShown: isUtxosScrollBarShown, setIsScrollBarShown: setUtxosIsScrollBarShown} = useScrollView()
const {isScrollBarShown: isMetadataScrollBarShown, setIsScrollBarShown: setMetadataIsScrollBarShown} = useScrollView()
const {isScrollBarShown: isMintScrollBarShown, setIsScrollBarShown: setMintIsScrollBarShown} = useScrollView()
const {isScrollBarShown: isReferenceInputsScrollBarShown, setIsScrollBarShown: setReferenceInputsIsScrollBarShown} =
useScrollView()

const scrollbarActive =
(isOverviewScrollBarShown && activeTab === 'overview') ||
(isUtxosScrollBarShown && activeTab === 'utxos') ||
(isMetadataScrollBarShown && activeTab === 'metadata') ||
(isMintScrollBarShown && activeTab === 'mint') ||
(isReferenceInputsScrollBarShown && activeTab === 'reference_inputs')

return (
<SafeArea style={styles.root}>
<MaterialTab.Navigator tabBar={(props) => <TabBar {...props} tabsData={tabsData} />}>
<MaterialTab.Navigator
tabBar={(props) => {
setActiveTab(tabsData[props.state.index][1])
return <TabBar {...props} tabsData={tabsData} />
}}
>
<MaterialTab.Screen name="overview">
{() => (
<ScrollView style={styles.root}>
<ScrollView style={styles.root} onScrollBarChange={setOverviewIsScrollBarShown}>
<OverviewTab
tx={formattedTx}
extraOperations={operations}
Expand All @@ -78,7 +100,7 @@ export const ReviewTx = ({

<MaterialTab.Screen name="utxos">
{() => (
<ScrollView style={styles.root}>
<ScrollView style={styles.root} onScrollBarChange={setUtxosIsScrollBarShown}>
<UTxOsTab tx={formattedTx} />
</ScrollView>
)}
Expand All @@ -87,7 +109,7 @@ export const ReviewTx = ({
{showMetadataTab && (
<MaterialTab.Screen name="metadata">
{() => (
<ScrollView style={styles.root}>
<ScrollView style={styles.root} onScrollBarChange={setMetadataIsScrollBarShown}>
<MetadataTab hash={formattedMetadata?.hash ?? null} metadata={formattedMetadata?.metadata ?? null} />
</ScrollView>
)}
Expand All @@ -97,7 +119,7 @@ export const ReviewTx = ({
{showMintTab && (
<MaterialTab.Screen name="mint">
{() => (
<ScrollView style={styles.root}>
<ScrollView style={styles.root} onScrollBarChange={setMintIsScrollBarShown}>
<MintTab mintData={formattedTx.mint} />
</ScrollView>
)}
Expand All @@ -107,15 +129,15 @@ export const ReviewTx = ({
{showReferenceInoutsTab && (
<MaterialTab.Screen name="reference_inputs">
{() => (
<ScrollView style={styles.root}>
<ScrollView style={styles.root} onScrollBarChange={setReferenceInputsIsScrollBarShown}>
<ReferenceInputsTab referenceInputs={formattedTx.referenceInputs} />
</ScrollView>
)}
</MaterialTab.Screen>
)}
</MaterialTab.Navigator>

<Actions>
<Actions style={scrollbarActive && styles.actionsScroll}>
<Button title={strings.confirm} onPress={onConfirm} />
</Actions>
</SafeArea>
Expand Down Expand Up @@ -206,6 +228,10 @@ const useStyles = () => {
width: '100%',
backgroundColor: color.el_primary_medium,
},
actionsScroll: {
...atoms.border_t,
borderTopColor: color.gray_200,
},
})

const colors = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ export const UTxOsTab = ({tx}: {tx: FormattedTx}) => {
<Accordion label={`${strings.utxosOutputsLabel} (${tx.outputs.length})`}>
<Outputs outputs={tx.outputs} />
</Accordion>

<Space height="lg" />
</View>
)
}
Expand Down Expand Up @@ -176,7 +178,7 @@ const useStyles = () => {
utxoTitleCircleInput: {
width: 12,
height: 12,
backgroundColor: color.primary_500,
backgroundColor: color.el_primary_medium,
...atoms.rounded_full,
},
utxoTitleCircleOutput: {
Expand Down
Loading