Skip to content
Open
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
16 changes: 11 additions & 5 deletions app/components/Nav/Main/MainNavigator.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import Asset from '../../Views/Asset';
import AssetDetails from '../../Views/AssetDetails';
import AddAsset from '../../Views/AddAsset';
import Collectible from '../../Views/Collectible';
import NftFullView from '../../Views/NftFullView';
import SendLegacy from '../../Views/confirmations/legacy/Send';
import SendTo from '../../Views/confirmations/legacy/SendFlow/SendTo';
import { RevealPrivateCredential } from '../../Views/RevealPrivateCredential';
Expand Down Expand Up @@ -196,11 +197,6 @@ const WalletTabStackFlow = () => (
component={WalletModalFlow}
options={{ headerShown: false }}
/>
<Stack.Screen
name="AddAsset"
component={AddAsset}
options={AddAsset.navigationOptions}
/>
<Stack.Screen
name="Collectible"
component={Collectible}
Expand Down Expand Up @@ -943,6 +939,11 @@ const MainNavigator = () => {
}}
/>
<Stack.Screen name="Home" component={HomeTabs} />
<Stack.Screen
name="AddAsset"
component={AddAsset}
options={{ headerShown: false }}
/>
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be moved out to the main stack to work with the new asset full pages. Additionally, it should not have the bottom nav

{isRewardsEnabled && (
<Stack.Screen
name={Routes.SETTINGS_VIEW}
Expand Down Expand Up @@ -992,6 +993,11 @@ const MainNavigator = () => {
name="NftDetailsFullImage"
component={NftDetailsFullImageModeView}
/>
<Stack.Screen
name={Routes.WALLET.NFTS_FULL_VIEW}
component={NftFullView}
options={{ headerShown: false }}
/>
<Stack.Screen name="PaymentRequestView" component={PaymentRequestView} />
<Stack.Screen name={Routes.RAMP.BUY}>
{() => <RampRoutes rampType={RampType.BUY} />}
Expand Down
18 changes: 18 additions & 0 deletions app/components/Nav/Main/__snapshots__/MainNavigator.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,15 @@ exports[`MainNavigator matches rendered snapshot 1`] = `
component={[Function]}
name="Home"
/>
<Screen
component={[Function]}
name="AddAsset"
options={
{
"headerShown": false,
}
}
/>
<Screen
component={[Function]}
name="Asset"
Expand Down Expand Up @@ -92,6 +101,15 @@ exports[`MainNavigator matches rendered snapshot 1`] = `
component={[Function]}
name="NftDetailsFullImage"
/>
<Screen
component={[Function]}
name="NftFullView"
options={
{
"headerShown": false,
}
}
/>
<Screen
component={[Function]}
name="PaymentRequestView"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ const styleSheet = (params: {
textContainer: {
alignItems: 'center',
justifyContent: 'flex-start',
backgroundColor: colors.background.alternative,
backgroundColor: colors.background.section,
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated based on design

borderRadius: 8,
},
textWrapper: {
Expand Down
Loading
Loading