From 26a693a9f2e55d3b09d30030c4b4eb0e33049135 Mon Sep 17 00:00:00 2001 From: Dylan Jeffers Date: Tue, 14 Feb 2023 14:19:30 -0800 Subject: [PATCH 1/2] [C-2134 C-2030] Fix queueStatus on reachability, theme --- .../src/assets/images/iconDownloadGray.svg | 3 - .../mobile/src/assets/images/iconFilter.svg | 2 +- .../mobile/src/assets/images/iconNoWifi.svg | 2 +- .../src/assets/images/iconNoWifiSmall.svg | 2 +- .../OfflinePlaceholder.tsx | 5 +- .../favorites-screen/NoTracksPlaceholder.tsx | 7 +- .../favorites-screen/OfflineContentBanner.tsx | 5 +- .../src/screens/favorites-screen/utils.ts | 4 +- .../downloadQueueSagas/watchReachability.ts | 6 +- .../workers/downloadCollectionWorker.ts | 13 +- .../workers/downloadTrackWorker.ts | 12 +- .../sagas/requestDownloadAllFavoritesSaga.ts | 6 +- ...requestRemoveAllDownloadedFavoritesSaga.ts | 6 +- .../sagas/watchRemoveOfflineItems.ts | 7 +- .../src/store/offline-downloads/selectors.ts | 2 +- .../src/store/offline-downloads/slice.ts | 4 +- packages/web/package-lock.json | 2496 ++++++++--------- 17 files changed, 1287 insertions(+), 1295 deletions(-) delete mode 100644 packages/mobile/src/assets/images/iconDownloadGray.svg diff --git a/packages/mobile/src/assets/images/iconDownloadGray.svg b/packages/mobile/src/assets/images/iconDownloadGray.svg deleted file mode 100644 index 21621b16e8..0000000000 --- a/packages/mobile/src/assets/images/iconDownloadGray.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/packages/mobile/src/assets/images/iconFilter.svg b/packages/mobile/src/assets/images/iconFilter.svg index ee45e37abf..a6783bfaea 100644 --- a/packages/mobile/src/assets/images/iconFilter.svg +++ b/packages/mobile/src/assets/images/iconFilter.svg @@ -4,7 +4,7 @@ - + diff --git a/packages/mobile/src/assets/images/iconNoWifi.svg b/packages/mobile/src/assets/images/iconNoWifi.svg index 99f1daf1ac..4afac448c8 100644 --- a/packages/mobile/src/assets/images/iconNoWifi.svg +++ b/packages/mobile/src/assets/images/iconNoWifi.svg @@ -1,3 +1,3 @@ - + diff --git a/packages/mobile/src/assets/images/iconNoWifiSmall.svg b/packages/mobile/src/assets/images/iconNoWifiSmall.svg index f2d0adfdc3..37468b36d1 100644 --- a/packages/mobile/src/assets/images/iconNoWifiSmall.svg +++ b/packages/mobile/src/assets/images/iconNoWifiSmall.svg @@ -1,3 +1,3 @@ - + diff --git a/packages/mobile/src/components/offline-placeholder/OfflinePlaceholder.tsx b/packages/mobile/src/components/offline-placeholder/OfflinePlaceholder.tsx index 14ddcd995f..99ada2a237 100644 --- a/packages/mobile/src/components/offline-placeholder/OfflinePlaceholder.tsx +++ b/packages/mobile/src/components/offline-placeholder/OfflinePlaceholder.tsx @@ -7,6 +7,7 @@ import IconNoWifi from 'app/assets/images/iconNoWifi.svg' import IconRefresh from 'app/assets/images/iconRefresh.svg' import { Button, Text, Tile } from 'app/components/core' import { makeStyles } from 'app/styles' +import { useThemeColors } from 'app/utils/theme' import { messages } from './messages' @@ -52,9 +53,11 @@ export const OfflinePlaceholder = (props: OfflinePlaceholderProps) => { return await Promise.all([NetInfo.refresh(), wait(800)]) }) + const { neutralLight4 } = useThemeColors() + const body = ( - + {messages.title} {messages.subtitle}