Skip to content
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
5 changes: 5 additions & 0 deletions .changeset/brave-ears-teach.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"live-mobile": patch
---

Fix 2 firmware update banners being displayed on the wallet screen
12 changes: 4 additions & 8 deletions apps/ledger-live-mobile/src/screens/Portfolio/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable import/named */
import React, { useCallback, useMemo, useState, memo } from "react";
import { useSelector } from "react-redux";
import { FlatList, LayoutChangeEvent } from "react-native";
import { FlatList } from "react-native";
import Animated, {
useAnimatedScrollHandler,
useSharedValue,
Expand All @@ -14,10 +14,8 @@ import { isAccountEmpty } from "@ledgerhq/live-common/account/index";
import { Box, Flex, Link as TextLink, Text } from "@ledgerhq/native-ui";

import styled, { useTheme } from "styled-components/native";
import { FlexBoxProps } from "@ledgerhq/native-ui/components/Layout/Flex";
import proxyStyled from "@ledgerhq/native-ui/components/styled";
import { PlusMedium } from "@ledgerhq/native-ui/assets/icons";
import { Currency } from "@ledgerhq/live-common/types/index";
import { useRefreshAccountsOrdering } from "../../actions/general";
import { accountsSelector } from "../../reducers/accounts";
import {
Expand All @@ -33,7 +31,6 @@ import Carousel from "../../components/Carousel";
import Header from "./Header";
import TrackScreen from "../../analytics/TrackScreen";
import MigrateAccountsBanner from "../MigrateAccounts/Banner";
import RequireTerms from "../../components/RequireTerms";
import { NavigatorName } from "../../const";
import FabActions from "../../components/FabActions";
import FirmwareUpdateBanner from "../../components/FirmwareUpdateBanner";
Expand Down Expand Up @@ -279,8 +276,10 @@ function PortfolioScreen({ navigation }: Props) {

return (
<>
<FirmwareUpdateBanner />
<TabBarSafeAreaView>
<Flex px={6} py={4}>
<FirmwareUpdateBanner />
</Flex>
<CheckLanguageAvailability />
<CheckTermOfUseUpdate />
<TrackScreen
Expand All @@ -297,9 +296,6 @@ function PortfolioScreen({ navigation }: Props) {
hidePortfolio={areAccountsEmpty}
/>
</Box>
<Flex px={6} py={4}>
<FirmwareUpdateBanner />
</Flex>
<AnimatedFlatListWithRefreshControl
data={data}
style={{ flex: 1, position: "relative" }}
Expand Down