Skip to content

Commit

Permalink
fix app.js conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
giansb committed Jan 7, 2025
1 parent 4219833 commit bdca2bb
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,18 @@ const NavigationRoute = ({ internalScreen: InternalScreen }) => {
const newUiEnabled = useNewUiEnabled();

return (
<div className="app-body">
<div className="app-container">
<Navigation />
<div
style={{
display: 'flex',
flexDirection: 'column',
minHeight: '100%',
}}
>
<Navigation />
<div style={{ flex: 1 }}>
<InternalScreen />
{newUiEnabled ? <Footer /> : ''}
</div>
{newUiEnabled && <Footer />}
</div>
);
};
Expand Down

0 comments on commit bdca2bb

Please sign in to comment.