diff --git a/.gitignore b/.gitignore index 27ef480e582..9b96571a4d8 100644 --- a/.gitignore +++ b/.gitignore @@ -119,21 +119,7 @@ e2e/test-results/* secrets.json !__mocks__/secrets.json -# Branding -# See scripts/sync_branding.sh -android/app/src/main/res/drawable* -android/app/src/main/res/layout* -android/app/src/main/res/mipmap* -ios/celo/Base.lproj/* -!ios/celo/Base.lproj/InfoPlist.strings -ios/celo/Images.xcassets/ ios/.xcode.env -src/brandingConfig.ts -src/icons/LogoHeart.tsx -src/icons/Logo.tsx -src/icons/WelcomeLogo.tsx -src/images/* -!src/images/Images.ts # Temporary files created by Metro to check the health of the file watcher .metro-health-check* diff --git a/WALLET.md b/WALLET.md index 218709cf99d..b4344afbee2 100644 --- a/WALLET.md +++ b/WALLET.md @@ -616,9 +616,9 @@ If they do not have fixes and they do not apply to production, you may ignore th ### Branding -Images, icons, and links related to the brand are stored in the `branding` folder. When running `yarn install`, the script `scripts/sync_branding.sh` is run to clone these files into the appropriate places in the app. +Images related to the brand are stored in the `src/images` folder. When adding new images, we also include the 1.5x, 2x, 3x, and 4x versions. The app will automatically download the appropriate size. -When adding new images to the `branding` folder, we also include the 1.5x, 2x, 3x, and 4x versions. The app will automatically download the appropriate size. +Links related to the brand are stored in the `src/brandingConfig.ts` file. ### Troubleshooting diff --git a/branding/android/app/src/main/res/drawable-hdpi/logo.png b/android/app/src/main/res/drawable-hdpi/logo.png similarity index 100% rename from branding/android/app/src/main/res/drawable-hdpi/logo.png rename to android/app/src/main/res/drawable-hdpi/logo.png diff --git a/branding/android/app/src/main/res/drawable-hdpi/splash_background.jpg b/android/app/src/main/res/drawable-hdpi/splash_background.jpg similarity index 100% rename from branding/android/app/src/main/res/drawable-hdpi/splash_background.jpg rename to android/app/src/main/res/drawable-hdpi/splash_background.jpg diff --git a/branding/android/app/src/main/res/drawable-mdpi/logo.png b/android/app/src/main/res/drawable-mdpi/logo.png similarity index 100% rename from branding/android/app/src/main/res/drawable-mdpi/logo.png rename to android/app/src/main/res/drawable-mdpi/logo.png diff --git a/branding/android/app/src/main/res/drawable-mdpi/splash_background.jpg b/android/app/src/main/res/drawable-mdpi/splash_background.jpg similarity index 100% rename from branding/android/app/src/main/res/drawable-mdpi/splash_background.jpg rename to android/app/src/main/res/drawable-mdpi/splash_background.jpg diff --git a/branding/android/app/src/main/res/drawable-xhdpi/logo.png b/android/app/src/main/res/drawable-xhdpi/logo.png similarity index 100% rename from branding/android/app/src/main/res/drawable-xhdpi/logo.png rename to android/app/src/main/res/drawable-xhdpi/logo.png diff --git a/branding/android/app/src/main/res/drawable-xhdpi/splash_background.jpg b/android/app/src/main/res/drawable-xhdpi/splash_background.jpg similarity index 100% rename from branding/android/app/src/main/res/drawable-xhdpi/splash_background.jpg rename to android/app/src/main/res/drawable-xhdpi/splash_background.jpg diff --git a/branding/android/app/src/main/res/drawable-xxhdpi/logo.png b/android/app/src/main/res/drawable-xxhdpi/logo.png similarity index 100% rename from branding/android/app/src/main/res/drawable-xxhdpi/logo.png rename to android/app/src/main/res/drawable-xxhdpi/logo.png diff --git a/branding/android/app/src/main/res/drawable-xxhdpi/splash_background.jpg b/android/app/src/main/res/drawable-xxhdpi/splash_background.jpg similarity index 100% rename from branding/android/app/src/main/res/drawable-xxhdpi/splash_background.jpg rename to android/app/src/main/res/drawable-xxhdpi/splash_background.jpg diff --git a/branding/android/app/src/main/res/drawable-xxxhdpi/logo.png b/android/app/src/main/res/drawable-xxxhdpi/logo.png similarity index 100% rename from branding/android/app/src/main/res/drawable-xxxhdpi/logo.png rename to android/app/src/main/res/drawable-xxxhdpi/logo.png diff --git a/branding/android/app/src/main/res/drawable-xxxhdpi/splash_background.jpg b/android/app/src/main/res/drawable-xxxhdpi/splash_background.jpg similarity index 100% rename from branding/android/app/src/main/res/drawable-xxxhdpi/splash_background.jpg rename to android/app/src/main/res/drawable-xxxhdpi/splash_background.jpg diff --git a/branding/android/app/src/main/res/drawable/ic_notification_small.xml b/android/app/src/main/res/drawable/ic_notification_small.xml similarity index 100% rename from branding/android/app/src/main/res/drawable/ic_notification_small.xml rename to android/app/src/main/res/drawable/ic_notification_small.xml diff --git a/branding/android/app/src/main/res/drawable/splash.xml b/android/app/src/main/res/drawable/splash.xml similarity index 100% rename from branding/android/app/src/main/res/drawable/splash.xml rename to android/app/src/main/res/drawable/splash.xml diff --git a/branding/android/app/src/main/res/layout/launch_screen.xml b/android/app/src/main/res/layout/launch_screen.xml similarity index 100% rename from branding/android/app/src/main/res/layout/launch_screen.xml rename to android/app/src/main/res/layout/launch_screen.xml diff --git a/branding/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from branding/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/branding/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from branding/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/branding/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from branding/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/branding/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png similarity index 100% rename from branding/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png rename to android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png diff --git a/branding/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png similarity index 100% rename from branding/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png rename to android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png diff --git a/branding/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from branding/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/branding/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png similarity index 100% rename from branding/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png rename to android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png diff --git a/branding/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png similarity index 100% rename from branding/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png rename to android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png diff --git a/branding/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from branding/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/branding/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png similarity index 100% rename from branding/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png diff --git a/branding/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png similarity index 100% rename from branding/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png rename to android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png diff --git a/branding/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from branding/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/branding/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png similarity index 100% rename from branding/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png diff --git a/branding/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png similarity index 100% rename from branding/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png rename to android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png diff --git a/branding/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from branding/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/branding/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png similarity index 100% rename from branding/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png diff --git a/branding/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png similarity index 100% rename from branding/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png rename to android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/branding/ios/celo/Base.lproj/LaunchScreen.xib b/ios/celo/Base.lproj/LaunchScreen.xib similarity index 100% rename from branding/ios/celo/Base.lproj/LaunchScreen.xib rename to ios/celo/Base.lproj/LaunchScreen.xib diff --git a/branding/ios/celo/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/celo/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from branding/ios/celo/Images.xcassets/AppIcon.appiconset/Contents.json rename to ios/celo/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from branding/ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to ios/celo/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/branding/ios/celo/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png b/ios/celo/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png similarity index 100% rename from branding/ios/celo/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png rename to ios/celo/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png diff --git a/branding/ios/celo/Images.xcassets/Contents.json b/ios/celo/Images.xcassets/Contents.json similarity index 100% rename from branding/ios/celo/Images.xcassets/Contents.json rename to ios/celo/Images.xcassets/Contents.json diff --git a/branding/ios/celo/Images.xcassets/logo.imageset/Contents.json b/ios/celo/Images.xcassets/logo.imageset/Contents.json similarity index 100% rename from branding/ios/celo/Images.xcassets/logo.imageset/Contents.json rename to ios/celo/Images.xcassets/logo.imageset/Contents.json diff --git a/branding/ios/celo/Images.xcassets/logo.imageset/logo@2x.png b/ios/celo/Images.xcassets/logo.imageset/logo@2x.png similarity index 100% rename from branding/ios/celo/Images.xcassets/logo.imageset/logo@2x.png rename to ios/celo/Images.xcassets/logo.imageset/logo@2x.png diff --git a/branding/ios/celo/Images.xcassets/logo.imageset/logo@3x.png b/ios/celo/Images.xcassets/logo.imageset/logo@3x.png similarity index 100% rename from branding/ios/celo/Images.xcassets/logo.imageset/logo@3x.png rename to ios/celo/Images.xcassets/logo.imageset/logo@3x.png diff --git a/branding/ios/celo/Images.xcassets/splashBackground.imageset/Contents.json b/ios/celo/Images.xcassets/splashBackground.imageset/Contents.json similarity index 100% rename from branding/ios/celo/Images.xcassets/splashBackground.imageset/Contents.json rename to ios/celo/Images.xcassets/splashBackground.imageset/Contents.json diff --git a/branding/ios/celo/Images.xcassets/splashBackground.imageset/splashBackground@2x.jpg b/ios/celo/Images.xcassets/splashBackground.imageset/splashBackground@2x.jpg similarity index 100% rename from branding/ios/celo/Images.xcassets/splashBackground.imageset/splashBackground@2x.jpg rename to ios/celo/Images.xcassets/splashBackground.imageset/splashBackground@2x.jpg diff --git a/branding/ios/celo/Images.xcassets/splashBackground.imageset/splashBackground@3x.jpg b/ios/celo/Images.xcassets/splashBackground.imageset/splashBackground@3x.jpg similarity index 100% rename from branding/ios/celo/Images.xcassets/splashBackground.imageset/splashBackground@3x.jpg rename to ios/celo/Images.xcassets/splashBackground.imageset/splashBackground@3x.jpg diff --git a/package.json b/package.json index 8a286f513e8..7db37757ff0 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "dev:emulator:list": "$ANDROID_HOME/emulator/emulator -list-avds", "dev:emulator:run": "$ANDROID_HOME/emulator/emulator -avd", "knip:depcheck": "knip --include dependencies", - "test": "export TZ=UTC && ./scripts/sync_branding.sh && jest --silent", + "test": "export TZ=UTC && jest --silent", "test:all": "yarn lint && yarn build:ts && yarn test", "test:ci": "yarn test --coverage --maxWorkers=3", "test:watch": "yarn test --watch --maxWorkers=4", @@ -51,7 +51,7 @@ "e2e:test:ios-release": "detox test -c ios.release -l verbose", "pre-deploy": "./scripts/pre-deploy.sh", "deploy:update-disclaimer": "yarn licenses generate-disclaimer --prod > src/account/LicenseDisclaimer.txt && ./scripts/copy_license_to_android_assets.sh", - "postinstall": "patch-package && yarn keys:decrypt && ./scripts/sync_branding.sh && ./scripts/copy_license_to_android_assets.sh", + "postinstall": "patch-package && yarn keys:decrypt && ./scripts/copy_license_to_android_assets.sh", "keys:decrypt": "bash scripts/key_placer.sh decrypt", "keys:encrypt": "bash scripts/key_placer.sh encrypt" }, diff --git a/scripts/sync_branding.sh b/scripts/sync_branding.sh deleted file mode 100755 index 96fddb74a0b..00000000000 --- a/scripts/sync_branding.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -# ======================================== -# Setup branding used in the project -# ======================================== - -mobile_root="$(dirname "$(dirname "$0")")" -echo $mobile_root -cd "$mobile_root" - -echo "Copying files from branding to project" - -rsync -avyz --exclude '.git' --exclude '.gitignore' "$mobile_root/branding/" "$mobile_root" diff --git a/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap b/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap index 878527bd6a7..6dc1f07a9de 100644 --- a/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap +++ b/src/account/__snapshots__/AccountKeyEducation.test.tsx.snap @@ -148,7 +148,7 @@ exports[`AccountKeyEducation renders correctly 1`] = ` resizeMode="contain" source={ { - "testUri": "../../../src/images/account-key-1.png", + "testUri": "../../../src/images/assets/account-key-1.png", } } style={ @@ -218,7 +218,7 @@ exports[`AccountKeyEducation renders correctly 1`] = ` resizeMode="contain" source={ { - "testUri": "../../../src/images/account-key-2.png", + "testUri": "../../../src/images/assets/account-key-2.png", } } style={ @@ -288,7 +288,7 @@ exports[`AccountKeyEducation renders correctly 1`] = ` resizeMode="contain" source={ { - "testUri": "../../../src/images/account-key-3.png", + "testUri": "../../../src/images/assets/account-key-3.png", } } style={ @@ -358,7 +358,7 @@ exports[`AccountKeyEducation renders correctly 1`] = ` resizeMode="contain" source={ { - "testUri": "../../../src/images/account-key-4.png", + "testUri": "../../../src/images/assets/account-key-4.png", } } style={ diff --git a/src/account/__snapshots__/GoldEducation.test.tsx.snap b/src/account/__snapshots__/GoldEducation.test.tsx.snap index d8f62d17aa5..fe181a1ddc7 100644 --- a/src/account/__snapshots__/GoldEducation.test.tsx.snap +++ b/src/account/__snapshots__/GoldEducation.test.tsx.snap @@ -148,7 +148,7 @@ exports[`renders correctly 1`] = ` resizeMode="contain" source={ { - "testUri": "../../../src/images/celo-education-1.png", + "testUri": "../../../src/images/assets/celo-education-1.png", } } style={ @@ -218,7 +218,7 @@ exports[`renders correctly 1`] = ` resizeMode="contain" source={ { - "testUri": "../../../src/images/celo-education-2.png", + "testUri": "../../../src/images/assets/celo-education-2.png", } } style={ @@ -288,7 +288,7 @@ exports[`renders correctly 1`] = ` resizeMode="contain" source={ { - "testUri": "../../../src/images/celo-education-3.png", + "testUri": "../../../src/images/assets/celo-education-3.png", } } style={ @@ -358,7 +358,7 @@ exports[`renders correctly 1`] = ` resizeMode="contain" source={ { - "testUri": "../../../src/images/celo-education-4.png", + "testUri": "../../../src/images/assets/celo-education-4.png", } } style={ diff --git a/src/backup/BackupIntroduction.tsx b/src/backup/BackupIntroduction.tsx index 33a200c56b1..7e1dbf69190 100644 --- a/src/backup/BackupIntroduction.tsx +++ b/src/backup/BackupIntroduction.tsx @@ -12,7 +12,7 @@ import BackupPhraseContainer, { import { useAccountKey } from 'src/backup/utils' import Button from 'src/components/Button' import TextButton from 'src/components/TextButton' -import Logo from 'src/icons/Logo' +import Logo from 'src/images/Logo' import { navigate } from 'src/navigator/NavigationService' import { Screens } from 'src/navigator/Screens' import { StackParamList } from 'src/navigator/types' diff --git a/branding/src/brandingConfig.ts b/src/brandingConfig.ts similarity index 70% rename from branding/src/brandingConfig.ts rename to src/brandingConfig.ts index 23834138731..d9da5fdfe37 100644 --- a/branding/src/brandingConfig.ts +++ b/src/brandingConfig.ts @@ -1,15 +1,10 @@ export const APP_NAME = 'Valora' export const WEB_LINK = 'https://valora.xyz/' -export const CELO_FAUCET_LINK = 'https://celo.org/app' -export const CELO_TERMS_LINK = 'https://celo.org/terms' export const TOS_LINK = 'https://valora.xyz/terms' export const PRIVACY_LINK = 'https://valora.xyz/privacy' export const FAQ_LINK = 'https://valora.xyz/faq' export const FUNDING_LINK = 'https://valora.xyz/fund-wallet' -export const CELO_REWARDS_LINK = 'https://celo.org/celo-rewards-education' export const FORUM_LINK = 'https://forum.celo.org/c/valora/8' -export const INVITE_REWARDS_LEARN_MORE = 'https://valora.xyz/support/invite-rewards-learn-more' -export const DAPPS_LEARN_MORE = 'https://valora.xyz/support/dapps-learn-more' export const SWAP_LEARN_MORE = 'https://valora.xyz/support/swap-learn-more' export const TRANSACTION_FEES_LEARN_MORE = 'https://valora.xyz/support/transaction-fees-learn-more' export const INVITE_REWARDS_NFTS_LEARN_MORE = diff --git a/src/components/BeatingHeartLoader.tsx b/src/components/BeatingHeartLoader.tsx index 9d239e28878..c611bdf5f12 100644 --- a/src/components/BeatingHeartLoader.tsx +++ b/src/components/BeatingHeartLoader.tsx @@ -7,7 +7,7 @@ import Animated, { withSequence, withTiming, } from 'react-native-reanimated' -import LogoHeart from 'src/icons/LogoHeart' +import LogoHeart from 'src/images/LogoHeart' const BeatingHeartLoader = ({ size }: { size: number }) => { const scale = useSharedValue(1) diff --git a/src/dappsExplorer/DappCard.tsx b/src/dappsExplorer/DappCard.tsx index 6ec59fef305..e42f665ee79 100644 --- a/src/dappsExplorer/DappCard.tsx +++ b/src/dappsExplorer/DappCard.tsx @@ -1,14 +1,14 @@ import React from 'react' import { Image, StyleSheet, Text, View, ViewStyle } from 'react-native' -import { DappExplorerEvents } from 'src/analytics/Events' import AppAnalytics from 'src/analytics/AppAnalytics' +import { DappExplorerEvents } from 'src/analytics/Events' import Card from 'src/components/Card' import Touchable from 'src/components/Touchable' import { favoriteDappIdsSelector } from 'src/dapps/selectors' import { favoriteDapp, unfavoriteDapp } from 'src/dapps/slice' import { Dapp, DappSection } from 'src/dapps/types' -import Star from 'src/icons/Star' import StarOutline from 'src/icons/StarOutline' +import Star from 'src/images/Star' import { useDispatch, useSelector } from 'src/redux/hooks' import { Colors } from 'src/styles/colors' import { typeScale } from 'src/styles/fonts' diff --git a/src/earn/EarnDepositBottomSheet.tsx b/src/earn/EarnDepositBottomSheet.tsx index b096f09ca90..394d35b4943 100644 --- a/src/earn/EarnDepositBottomSheet.tsx +++ b/src/earn/EarnDepositBottomSheet.tsx @@ -16,7 +16,7 @@ import { PROVIDER_ID } from 'src/earn/constants' import { depositStatusSelector } from 'src/earn/selectors' import { depositStart } from 'src/earn/slice' import InfoIcon from 'src/icons/InfoIcon' -import Logo from 'src/icons/Logo' +import Logo from 'src/images/Logo' import { navigate } from 'src/navigator/NavigationService' import { Screens } from 'src/navigator/Screens' import { useSelector } from 'src/redux/hooks' diff --git a/src/earn/EarnInfoScreen.tsx b/src/earn/EarnInfoScreen.tsx index 7254d1f6a74..aba04dc7adf 100644 --- a/src/earn/EarnInfoScreen.tsx +++ b/src/earn/EarnInfoScreen.tsx @@ -9,11 +9,11 @@ import Button, { BtnSizes, BtnTypes } from 'src/components/Button' import { APP_NAME, EARN_STABLECOINS_LEARN_MORE } from 'src/config' import { EarnTabType } from 'src/earn/types' import ArrowDown from 'src/icons/ArrowDown' -import Blob from 'src/icons/Blob' import CircledIcon from 'src/icons/CircledIcon' import EarnCoins from 'src/icons/EarnCoins' -import Logo from 'src/icons/Logo' -import Palm from 'src/icons/Palm' +import Blob from 'src/images/Blob' +import Logo from 'src/images/Logo' +import Palm from 'src/images/Palm' import { headerWithCloseButton } from 'src/navigator/Headers' import { navigate } from 'src/navigator/NavigationService' import { Screens } from 'src/navigator/Screens' diff --git a/src/fiatExchanges/__snapshots__/CashInSuccess.test.tsx.snap b/src/fiatExchanges/__snapshots__/CashInSuccess.test.tsx.snap index 74a933ed046..992dc545c12 100644 --- a/src/fiatExchanges/__snapshots__/CashInSuccess.test.tsx.snap +++ b/src/fiatExchanges/__snapshots__/CashInSuccess.test.tsx.snap @@ -30,7 +30,7 @@ exports[`CashinInSuccess renders correctly with a provider 1`] = ` resizeMode="contain" source={ { - "testUri": "../../../src/images/fiat-exchange.png", + "testUri": "../../../src/images/assets/fiat-exchange.png", } } /> @@ -200,7 +200,7 @@ exports[`CashinInSuccess renders correctly without a provider 1`] = ` resizeMode="contain" source={ { - "testUri": "../../../src/images/fiat-exchange.png", + "testUri": "../../../src/images/assets/fiat-exchange.png", } } /> diff --git a/src/home/NotificationBox.tsx b/src/home/NotificationBox.tsx index f4b882fd7bf..328fadc4b94 100644 --- a/src/home/NotificationBox.tsx +++ b/src/home/NotificationBox.tsx @@ -17,8 +17,8 @@ import { dismissNotification } from 'src/home/actions' import { DEFAULT_PRIORITY } from 'src/home/reducers' import { getExtraNotifications } from 'src/home/selectors' import { Notification, NotificationBannerCTATypes, NotificationType } from 'src/home/types' -import GuideKeyIcon from 'src/icons/GuideKeyHomeCardIcon' import KeylessBackup from 'src/icons/KeylessBackup' +import GuideKeyIcon from 'src/images/GuideKeyHomeCardIcon' import { getVerified, learnCelo } from 'src/images/Images' import { ensurePincode, navigate } from 'src/navigator/NavigationService' import { Screens } from 'src/navigator/Screens' diff --git a/src/home/__snapshots__/NotificationBox.test.tsx.snap b/src/home/__snapshots__/NotificationBox.test.tsx.snap index f0ae856c6e9..9b4272c4e05 100644 --- a/src/home/__snapshots__/NotificationBox.test.tsx.snap +++ b/src/home/__snapshots__/NotificationBox.test.tsx.snap @@ -429,7 +429,7 @@ exports[`NotificationBox renders correctly for with all notifications 1`] = ` resizeMode="contain" source={ { - "testUri": "../../../src/images/get-verified.png", + "testUri": "../../../src/images/assets/get-verified.png", } } style={ @@ -845,7 +845,7 @@ exports[`NotificationBox renders correctly for with all notifications 1`] = ` resizeMode="contain" source={ { - "testUri": "../../../src/images/learn-celo.png", + "testUri": "../../../src/images/assets/learn-celo.png", } } style={ diff --git a/src/icons/Blob.tsx b/src/images/Blob.tsx similarity index 100% rename from src/icons/Blob.tsx rename to src/images/Blob.tsx diff --git a/src/icons/GuideKeyHomeCardIcon.tsx b/src/images/GuideKeyHomeCardIcon.tsx similarity index 100% rename from src/icons/GuideKeyHomeCardIcon.tsx rename to src/images/GuideKeyHomeCardIcon.tsx diff --git a/src/icons/GuideKeyIcon.tsx b/src/images/GuideKeyIcon.tsx similarity index 100% rename from src/icons/GuideKeyIcon.tsx rename to src/images/GuideKeyIcon.tsx diff --git a/src/images/Images.ts b/src/images/Images.ts index 23033de2532..c134b6f0ae7 100644 --- a/src/images/Images.ts +++ b/src/images/Images.ts @@ -1,28 +1,28 @@ -export const accountKey1 = require('src/images/account-key-1.png') -export const accountKey2 = require('src/images/account-key-2.png') -export const accountKey3 = require('src/images/account-key-3.png') -export const accountKey4 = require('src/images/account-key-4.png') -export const background = require('src/images/background.jpg') -export const backupKey = require('src/images/backup-key.png') -export const biometryFace = require('src/images/biometry-face.png') -export const biometryFaceId = require('src/images/biometry-face-id.png') -export const biometryFingerprint = require('src/images/biometry-fingerprint.png') -export const biometryIris = require('src/images/biometry-iris.png') -export const biometryTouchId = require('src/images/biometry-touch-id.png') -export const celoEducation1 = require('src/images/celo-education-1.png') -export const celoEducation2 = require('src/images/celo-education-2.png') -export const celoEducation3 = require('src/images/celo-education-3.png') -export const celoEducation4 = require('src/images/celo-education-4.png') -export const email = require('src/images/email.png') -export const fiatExchange = require('src/images/fiat-exchange.png') -export const getVerified = require('src/images/get-verified.png') -export const inviteModal = require('src/images/invite-modal.png') -export const inviteWithRewards = require('src/images/invite-rewards.png') -export const learnCelo = require('src/images/learn-celo.png') -export const notificationInvite = require('src/images/notification-invite.png') -export const onboardingEducation1 = require('src/images/onboarding-education-1.png') -export const onboardingEducation2 = require('src/images/onboarding-education-2.png') -export const onboardingEducation3 = require('src/images/onboarding-education-3.png') -export const pointsCardBackground = require('src/images/points-card-background.png') -export const pointsIllustration = require('src/images/points-illustration.png') -export const welcomeBackground = require('src/images/intro-background.png') +export const accountKey1 = require('src/images/assets/account-key-1.png') +export const accountKey2 = require('src/images/assets/account-key-2.png') +export const accountKey3 = require('src/images/assets/account-key-3.png') +export const accountKey4 = require('src/images/assets/account-key-4.png') +export const background = require('src/images/assets/background.jpg') +export const backupKey = require('src/images/assets/backup-key.png') +export const biometryFace = require('src/images/assets/biometry-face.png') +export const biometryFaceId = require('src/images/assets/biometry-face-id.png') +export const biometryFingerprint = require('src/images/assets/biometry-fingerprint.png') +export const biometryIris = require('src/images/assets/biometry-iris.png') +export const biometryTouchId = require('src/images/assets/biometry-touch-id.png') +export const celoEducation1 = require('src/images/assets/celo-education-1.png') +export const celoEducation2 = require('src/images/assets/celo-education-2.png') +export const celoEducation3 = require('src/images/assets/celo-education-3.png') +export const celoEducation4 = require('src/images/assets/celo-education-4.png') +export const email = require('src/images/assets/email.png') +export const fiatExchange = require('src/images/assets/fiat-exchange.png') +export const getVerified = require('src/images/assets/get-verified.png') +export const inviteModal = require('src/images/assets/invite-modal.png') +export const inviteWithRewards = require('src/images/assets/invite-rewards.png') +export const learnCelo = require('src/images/assets/learn-celo.png') +export const notificationInvite = require('src/images/assets/notification-invite.png') +export const onboardingEducation1 = require('src/images/assets/onboarding-education-1.png') +export const onboardingEducation2 = require('src/images/assets/onboarding-education-2.png') +export const onboardingEducation3 = require('src/images/assets/onboarding-education-3.png') +export const pointsCardBackground = require('src/images/assets/points-card-background.png') +export const pointsIllustration = require('src/images/assets/points-illustration.png') +export const welcomeBackground = require('src/images/assets/intro-background.png') diff --git a/branding/src/icons/Logo.tsx b/src/images/Logo.tsx similarity index 100% rename from branding/src/icons/Logo.tsx rename to src/images/Logo.tsx diff --git a/branding/src/icons/LogoHeart.tsx b/src/images/LogoHeart.tsx similarity index 100% rename from branding/src/icons/LogoHeart.tsx rename to src/images/LogoHeart.tsx diff --git a/src/icons/NftReceivedIcon.tsx b/src/images/NftReceivedIcon.tsx similarity index 100% rename from src/icons/NftReceivedIcon.tsx rename to src/images/NftReceivedIcon.tsx diff --git a/src/icons/NftSentIcon.tsx b/src/images/NftSentIcon.tsx similarity index 100% rename from src/icons/NftSentIcon.tsx rename to src/images/NftSentIcon.tsx diff --git a/src/icons/Palm.tsx b/src/images/Palm.tsx similarity index 100% rename from src/icons/Palm.tsx rename to src/images/Palm.tsx diff --git a/src/icons/Star.tsx b/src/images/Star.tsx similarity index 100% rename from src/icons/Star.tsx rename to src/images/Star.tsx diff --git a/src/icons/WaveCurve.tsx b/src/images/WaveCurve.tsx similarity index 100% rename from src/icons/WaveCurve.tsx rename to src/images/WaveCurve.tsx diff --git a/branding/src/icons/WelcomeLogo.tsx b/src/images/WelcomeLogo.tsx similarity index 100% rename from branding/src/icons/WelcomeLogo.tsx rename to src/images/WelcomeLogo.tsx diff --git a/branding/src/images/account-key-1.png b/src/images/assets/account-key-1.png similarity index 100% rename from branding/src/images/account-key-1.png rename to src/images/assets/account-key-1.png diff --git a/branding/src/images/account-key-1@1.5x.png b/src/images/assets/account-key-1@1.5x.png similarity index 100% rename from branding/src/images/account-key-1@1.5x.png rename to src/images/assets/account-key-1@1.5x.png diff --git a/branding/src/images/account-key-1@2x.png b/src/images/assets/account-key-1@2x.png similarity index 100% rename from branding/src/images/account-key-1@2x.png rename to src/images/assets/account-key-1@2x.png diff --git a/branding/src/images/account-key-1@3x.png b/src/images/assets/account-key-1@3x.png similarity index 100% rename from branding/src/images/account-key-1@3x.png rename to src/images/assets/account-key-1@3x.png diff --git a/branding/src/images/account-key-1@4x.png b/src/images/assets/account-key-1@4x.png similarity index 100% rename from branding/src/images/account-key-1@4x.png rename to src/images/assets/account-key-1@4x.png diff --git a/branding/src/images/account-key-2.png b/src/images/assets/account-key-2.png similarity index 100% rename from branding/src/images/account-key-2.png rename to src/images/assets/account-key-2.png diff --git a/branding/src/images/account-key-2@1.5x.png b/src/images/assets/account-key-2@1.5x.png similarity index 100% rename from branding/src/images/account-key-2@1.5x.png rename to src/images/assets/account-key-2@1.5x.png diff --git a/branding/src/images/account-key-2@2x.png b/src/images/assets/account-key-2@2x.png similarity index 100% rename from branding/src/images/account-key-2@2x.png rename to src/images/assets/account-key-2@2x.png diff --git a/branding/src/images/account-key-2@3x.png b/src/images/assets/account-key-2@3x.png similarity index 100% rename from branding/src/images/account-key-2@3x.png rename to src/images/assets/account-key-2@3x.png diff --git a/branding/src/images/account-key-2@4x.png b/src/images/assets/account-key-2@4x.png similarity index 100% rename from branding/src/images/account-key-2@4x.png rename to src/images/assets/account-key-2@4x.png diff --git a/branding/src/images/account-key-3.png b/src/images/assets/account-key-3.png similarity index 100% rename from branding/src/images/account-key-3.png rename to src/images/assets/account-key-3.png diff --git a/branding/src/images/account-key-3@1.5x.png b/src/images/assets/account-key-3@1.5x.png similarity index 100% rename from branding/src/images/account-key-3@1.5x.png rename to src/images/assets/account-key-3@1.5x.png diff --git a/branding/src/images/account-key-3@2x.png b/src/images/assets/account-key-3@2x.png similarity index 100% rename from branding/src/images/account-key-3@2x.png rename to src/images/assets/account-key-3@2x.png diff --git a/branding/src/images/account-key-3@3x.png b/src/images/assets/account-key-3@3x.png similarity index 100% rename from branding/src/images/account-key-3@3x.png rename to src/images/assets/account-key-3@3x.png diff --git a/branding/src/images/account-key-3@4x.png b/src/images/assets/account-key-3@4x.png similarity index 100% rename from branding/src/images/account-key-3@4x.png rename to src/images/assets/account-key-3@4x.png diff --git a/branding/src/images/account-key-4.png b/src/images/assets/account-key-4.png similarity index 100% rename from branding/src/images/account-key-4.png rename to src/images/assets/account-key-4.png diff --git a/branding/src/images/account-key-4@1.5x.png b/src/images/assets/account-key-4@1.5x.png similarity index 100% rename from branding/src/images/account-key-4@1.5x.png rename to src/images/assets/account-key-4@1.5x.png diff --git a/branding/src/images/account-key-4@2x.png b/src/images/assets/account-key-4@2x.png similarity index 100% rename from branding/src/images/account-key-4@2x.png rename to src/images/assets/account-key-4@2x.png diff --git a/branding/src/images/account-key-4@3x.png b/src/images/assets/account-key-4@3x.png similarity index 100% rename from branding/src/images/account-key-4@3x.png rename to src/images/assets/account-key-4@3x.png diff --git a/branding/src/images/account-key-4@4x.png b/src/images/assets/account-key-4@4x.png similarity index 100% rename from branding/src/images/account-key-4@4x.png rename to src/images/assets/account-key-4@4x.png diff --git a/branding/src/images/background.jpg b/src/images/assets/background.jpg similarity index 100% rename from branding/src/images/background.jpg rename to src/images/assets/background.jpg diff --git a/branding/src/images/background@1.5x.jpg b/src/images/assets/background@1.5x.jpg similarity index 100% rename from branding/src/images/background@1.5x.jpg rename to src/images/assets/background@1.5x.jpg diff --git a/branding/src/images/background@2x.jpg b/src/images/assets/background@2x.jpg similarity index 100% rename from branding/src/images/background@2x.jpg rename to src/images/assets/background@2x.jpg diff --git a/branding/src/images/background@3x.jpg b/src/images/assets/background@3x.jpg similarity index 100% rename from branding/src/images/background@3x.jpg rename to src/images/assets/background@3x.jpg diff --git a/branding/src/images/background@4x.jpg b/src/images/assets/background@4x.jpg similarity index 100% rename from branding/src/images/background@4x.jpg rename to src/images/assets/background@4x.jpg diff --git a/branding/src/images/backup-key.png b/src/images/assets/backup-key.png similarity index 100% rename from branding/src/images/backup-key.png rename to src/images/assets/backup-key.png diff --git a/branding/src/images/backup-key@1.5x.png b/src/images/assets/backup-key@1.5x.png similarity index 100% rename from branding/src/images/backup-key@1.5x.png rename to src/images/assets/backup-key@1.5x.png diff --git a/branding/src/images/backup-key@2x.png b/src/images/assets/backup-key@2x.png similarity index 100% rename from branding/src/images/backup-key@2x.png rename to src/images/assets/backup-key@2x.png diff --git a/branding/src/images/backup-key@3x.png b/src/images/assets/backup-key@3x.png similarity index 100% rename from branding/src/images/backup-key@3x.png rename to src/images/assets/backup-key@3x.png diff --git a/branding/src/images/backup-key@4x.png b/src/images/assets/backup-key@4x.png similarity index 100% rename from branding/src/images/backup-key@4x.png rename to src/images/assets/backup-key@4x.png diff --git a/branding/src/images/biometry-face-id.png b/src/images/assets/biometry-face-id.png similarity index 100% rename from branding/src/images/biometry-face-id.png rename to src/images/assets/biometry-face-id.png diff --git a/branding/src/images/biometry-face-id@1.5x.png b/src/images/assets/biometry-face-id@1.5x.png similarity index 100% rename from branding/src/images/biometry-face-id@1.5x.png rename to src/images/assets/biometry-face-id@1.5x.png diff --git a/branding/src/images/biometry-face-id@2x.png b/src/images/assets/biometry-face-id@2x.png similarity index 100% rename from branding/src/images/biometry-face-id@2x.png rename to src/images/assets/biometry-face-id@2x.png diff --git a/branding/src/images/biometry-face-id@3x.png b/src/images/assets/biometry-face-id@3x.png similarity index 100% rename from branding/src/images/biometry-face-id@3x.png rename to src/images/assets/biometry-face-id@3x.png diff --git a/branding/src/images/biometry-face-id@4x.png b/src/images/assets/biometry-face-id@4x.png similarity index 100% rename from branding/src/images/biometry-face-id@4x.png rename to src/images/assets/biometry-face-id@4x.png diff --git a/branding/src/images/biometry-face.png b/src/images/assets/biometry-face.png similarity index 100% rename from branding/src/images/biometry-face.png rename to src/images/assets/biometry-face.png diff --git a/branding/src/images/biometry-face@1.5x.png b/src/images/assets/biometry-face@1.5x.png similarity index 100% rename from branding/src/images/biometry-face@1.5x.png rename to src/images/assets/biometry-face@1.5x.png diff --git a/branding/src/images/biometry-face@2x.png b/src/images/assets/biometry-face@2x.png similarity index 100% rename from branding/src/images/biometry-face@2x.png rename to src/images/assets/biometry-face@2x.png diff --git a/branding/src/images/biometry-face@3x.png b/src/images/assets/biometry-face@3x.png similarity index 100% rename from branding/src/images/biometry-face@3x.png rename to src/images/assets/biometry-face@3x.png diff --git a/branding/src/images/biometry-face@4x.png b/src/images/assets/biometry-face@4x.png similarity index 100% rename from branding/src/images/biometry-face@4x.png rename to src/images/assets/biometry-face@4x.png diff --git a/branding/src/images/biometry-fingerprint.png b/src/images/assets/biometry-fingerprint.png similarity index 100% rename from branding/src/images/biometry-fingerprint.png rename to src/images/assets/biometry-fingerprint.png diff --git a/branding/src/images/biometry-fingerprint@1.5x.png b/src/images/assets/biometry-fingerprint@1.5x.png similarity index 100% rename from branding/src/images/biometry-fingerprint@1.5x.png rename to src/images/assets/biometry-fingerprint@1.5x.png diff --git a/branding/src/images/biometry-fingerprint@2x.png b/src/images/assets/biometry-fingerprint@2x.png similarity index 100% rename from branding/src/images/biometry-fingerprint@2x.png rename to src/images/assets/biometry-fingerprint@2x.png diff --git a/branding/src/images/biometry-fingerprint@3x.png b/src/images/assets/biometry-fingerprint@3x.png similarity index 100% rename from branding/src/images/biometry-fingerprint@3x.png rename to src/images/assets/biometry-fingerprint@3x.png diff --git a/branding/src/images/biometry-fingerprint@4x.png b/src/images/assets/biometry-fingerprint@4x.png similarity index 100% rename from branding/src/images/biometry-fingerprint@4x.png rename to src/images/assets/biometry-fingerprint@4x.png diff --git a/branding/src/images/biometry-iris.png b/src/images/assets/biometry-iris.png similarity index 100% rename from branding/src/images/biometry-iris.png rename to src/images/assets/biometry-iris.png diff --git a/branding/src/images/biometry-iris@1.5x.png b/src/images/assets/biometry-iris@1.5x.png similarity index 100% rename from branding/src/images/biometry-iris@1.5x.png rename to src/images/assets/biometry-iris@1.5x.png diff --git a/branding/src/images/biometry-iris@2x.png b/src/images/assets/biometry-iris@2x.png similarity index 100% rename from branding/src/images/biometry-iris@2x.png rename to src/images/assets/biometry-iris@2x.png diff --git a/branding/src/images/biometry-iris@3x.png b/src/images/assets/biometry-iris@3x.png similarity index 100% rename from branding/src/images/biometry-iris@3x.png rename to src/images/assets/biometry-iris@3x.png diff --git a/branding/src/images/biometry-iris@4x.png b/src/images/assets/biometry-iris@4x.png similarity index 100% rename from branding/src/images/biometry-iris@4x.png rename to src/images/assets/biometry-iris@4x.png diff --git a/branding/src/images/biometry-touch-id.png b/src/images/assets/biometry-touch-id.png similarity index 100% rename from branding/src/images/biometry-touch-id.png rename to src/images/assets/biometry-touch-id.png diff --git a/branding/src/images/biometry-touch-id@1.5x.png b/src/images/assets/biometry-touch-id@1.5x.png similarity index 100% rename from branding/src/images/biometry-touch-id@1.5x.png rename to src/images/assets/biometry-touch-id@1.5x.png diff --git a/branding/src/images/biometry-touch-id@2x.png b/src/images/assets/biometry-touch-id@2x.png similarity index 100% rename from branding/src/images/biometry-touch-id@2x.png rename to src/images/assets/biometry-touch-id@2x.png diff --git a/branding/src/images/biometry-touch-id@3x.png b/src/images/assets/biometry-touch-id@3x.png similarity index 100% rename from branding/src/images/biometry-touch-id@3x.png rename to src/images/assets/biometry-touch-id@3x.png diff --git a/branding/src/images/biometry-touch-id@4x.png b/src/images/assets/biometry-touch-id@4x.png similarity index 100% rename from branding/src/images/biometry-touch-id@4x.png rename to src/images/assets/biometry-touch-id@4x.png diff --git a/branding/src/images/celo-education-1.png b/src/images/assets/celo-education-1.png similarity index 100% rename from branding/src/images/celo-education-1.png rename to src/images/assets/celo-education-1.png diff --git a/branding/src/images/celo-education-1@1.5x.png b/src/images/assets/celo-education-1@1.5x.png similarity index 100% rename from branding/src/images/celo-education-1@1.5x.png rename to src/images/assets/celo-education-1@1.5x.png diff --git a/branding/src/images/celo-education-1@2x.png b/src/images/assets/celo-education-1@2x.png similarity index 100% rename from branding/src/images/celo-education-1@2x.png rename to src/images/assets/celo-education-1@2x.png diff --git a/branding/src/images/celo-education-1@3x.png b/src/images/assets/celo-education-1@3x.png similarity index 100% rename from branding/src/images/celo-education-1@3x.png rename to src/images/assets/celo-education-1@3x.png diff --git a/branding/src/images/celo-education-1@4x.png b/src/images/assets/celo-education-1@4x.png similarity index 100% rename from branding/src/images/celo-education-1@4x.png rename to src/images/assets/celo-education-1@4x.png diff --git a/branding/src/images/celo-education-2.png b/src/images/assets/celo-education-2.png similarity index 100% rename from branding/src/images/celo-education-2.png rename to src/images/assets/celo-education-2.png diff --git a/branding/src/images/celo-education-2@1.5x.png b/src/images/assets/celo-education-2@1.5x.png similarity index 100% rename from branding/src/images/celo-education-2@1.5x.png rename to src/images/assets/celo-education-2@1.5x.png diff --git a/branding/src/images/celo-education-2@2x.png b/src/images/assets/celo-education-2@2x.png similarity index 100% rename from branding/src/images/celo-education-2@2x.png rename to src/images/assets/celo-education-2@2x.png diff --git a/branding/src/images/celo-education-2@3x.png b/src/images/assets/celo-education-2@3x.png similarity index 100% rename from branding/src/images/celo-education-2@3x.png rename to src/images/assets/celo-education-2@3x.png diff --git a/branding/src/images/celo-education-2@4x.png b/src/images/assets/celo-education-2@4x.png similarity index 100% rename from branding/src/images/celo-education-2@4x.png rename to src/images/assets/celo-education-2@4x.png diff --git a/branding/src/images/celo-education-3.png b/src/images/assets/celo-education-3.png similarity index 100% rename from branding/src/images/celo-education-3.png rename to src/images/assets/celo-education-3.png diff --git a/branding/src/images/celo-education-3@1.5x.png b/src/images/assets/celo-education-3@1.5x.png similarity index 100% rename from branding/src/images/celo-education-3@1.5x.png rename to src/images/assets/celo-education-3@1.5x.png diff --git a/branding/src/images/celo-education-3@2x.png b/src/images/assets/celo-education-3@2x.png similarity index 100% rename from branding/src/images/celo-education-3@2x.png rename to src/images/assets/celo-education-3@2x.png diff --git a/branding/src/images/celo-education-3@3x.png b/src/images/assets/celo-education-3@3x.png similarity index 100% rename from branding/src/images/celo-education-3@3x.png rename to src/images/assets/celo-education-3@3x.png diff --git a/branding/src/images/celo-education-3@4x.png b/src/images/assets/celo-education-3@4x.png similarity index 100% rename from branding/src/images/celo-education-3@4x.png rename to src/images/assets/celo-education-3@4x.png diff --git a/branding/src/images/celo-education-4.png b/src/images/assets/celo-education-4.png similarity index 100% rename from branding/src/images/celo-education-4.png rename to src/images/assets/celo-education-4.png diff --git a/branding/src/images/celo-education-4@1.5x.png b/src/images/assets/celo-education-4@1.5x.png similarity index 100% rename from branding/src/images/celo-education-4@1.5x.png rename to src/images/assets/celo-education-4@1.5x.png diff --git a/branding/src/images/celo-education-4@2x.png b/src/images/assets/celo-education-4@2x.png similarity index 100% rename from branding/src/images/celo-education-4@2x.png rename to src/images/assets/celo-education-4@2x.png diff --git a/branding/src/images/celo-education-4@3x.png b/src/images/assets/celo-education-4@3x.png similarity index 100% rename from branding/src/images/celo-education-4@3x.png rename to src/images/assets/celo-education-4@3x.png diff --git a/branding/src/images/celo-education-4@4x.png b/src/images/assets/celo-education-4@4x.png similarity index 100% rename from branding/src/images/celo-education-4@4x.png rename to src/images/assets/celo-education-4@4x.png diff --git a/branding/src/images/email.png b/src/images/assets/email.png similarity index 100% rename from branding/src/images/email.png rename to src/images/assets/email.png diff --git a/branding/src/images/email@1.5x.png b/src/images/assets/email@1.5x.png similarity index 100% rename from branding/src/images/email@1.5x.png rename to src/images/assets/email@1.5x.png diff --git a/branding/src/images/email@2x.png b/src/images/assets/email@2x.png similarity index 100% rename from branding/src/images/email@2x.png rename to src/images/assets/email@2x.png diff --git a/branding/src/images/email@3x.png b/src/images/assets/email@3x.png similarity index 100% rename from branding/src/images/email@3x.png rename to src/images/assets/email@3x.png diff --git a/branding/src/images/email@4x.png b/src/images/assets/email@4x.png similarity index 100% rename from branding/src/images/email@4x.png rename to src/images/assets/email@4x.png diff --git a/branding/src/images/fiat-exchange.png b/src/images/assets/fiat-exchange.png similarity index 100% rename from branding/src/images/fiat-exchange.png rename to src/images/assets/fiat-exchange.png diff --git a/branding/src/images/fiat-exchange@1.5x.png b/src/images/assets/fiat-exchange@1.5x.png similarity index 100% rename from branding/src/images/fiat-exchange@1.5x.png rename to src/images/assets/fiat-exchange@1.5x.png diff --git a/branding/src/images/fiat-exchange@2x.png b/src/images/assets/fiat-exchange@2x.png similarity index 100% rename from branding/src/images/fiat-exchange@2x.png rename to src/images/assets/fiat-exchange@2x.png diff --git a/branding/src/images/fiat-exchange@3x.png b/src/images/assets/fiat-exchange@3x.png similarity index 100% rename from branding/src/images/fiat-exchange@3x.png rename to src/images/assets/fiat-exchange@3x.png diff --git a/branding/src/images/fiat-exchange@4x.png b/src/images/assets/fiat-exchange@4x.png similarity index 100% rename from branding/src/images/fiat-exchange@4x.png rename to src/images/assets/fiat-exchange@4x.png diff --git a/branding/src/images/get-verified.png b/src/images/assets/get-verified.png similarity index 100% rename from branding/src/images/get-verified.png rename to src/images/assets/get-verified.png diff --git a/branding/src/images/get-verified@1.5x.png b/src/images/assets/get-verified@1.5x.png similarity index 100% rename from branding/src/images/get-verified@1.5x.png rename to src/images/assets/get-verified@1.5x.png diff --git a/branding/src/images/get-verified@2x.png b/src/images/assets/get-verified@2x.png similarity index 100% rename from branding/src/images/get-verified@2x.png rename to src/images/assets/get-verified@2x.png diff --git a/branding/src/images/get-verified@3x.png b/src/images/assets/get-verified@3x.png similarity index 100% rename from branding/src/images/get-verified@3x.png rename to src/images/assets/get-verified@3x.png diff --git a/branding/src/images/get-verified@4x.png b/src/images/assets/get-verified@4x.png similarity index 100% rename from branding/src/images/get-verified@4x.png rename to src/images/assets/get-verified@4x.png diff --git a/branding/src/images/intro-background.png b/src/images/assets/intro-background.png similarity index 100% rename from branding/src/images/intro-background.png rename to src/images/assets/intro-background.png diff --git a/branding/src/images/intro-background@1.5x.png b/src/images/assets/intro-background@1.5x.png similarity index 100% rename from branding/src/images/intro-background@1.5x.png rename to src/images/assets/intro-background@1.5x.png diff --git a/branding/src/images/intro-background@2x.png b/src/images/assets/intro-background@2x.png similarity index 100% rename from branding/src/images/intro-background@2x.png rename to src/images/assets/intro-background@2x.png diff --git a/branding/src/images/intro-background@3x.png b/src/images/assets/intro-background@3x.png similarity index 100% rename from branding/src/images/intro-background@3x.png rename to src/images/assets/intro-background@3x.png diff --git a/branding/src/images/intro-background@4x.png b/src/images/assets/intro-background@4x.png similarity index 100% rename from branding/src/images/intro-background@4x.png rename to src/images/assets/intro-background@4x.png diff --git a/branding/src/images/invite-modal.png b/src/images/assets/invite-modal.png similarity index 100% rename from branding/src/images/invite-modal.png rename to src/images/assets/invite-modal.png diff --git a/branding/src/images/invite-modal@1.5x.png b/src/images/assets/invite-modal@1.5x.png similarity index 100% rename from branding/src/images/invite-modal@1.5x.png rename to src/images/assets/invite-modal@1.5x.png diff --git a/branding/src/images/invite-modal@2x.png b/src/images/assets/invite-modal@2x.png similarity index 100% rename from branding/src/images/invite-modal@2x.png rename to src/images/assets/invite-modal@2x.png diff --git a/branding/src/images/invite-modal@3x.png b/src/images/assets/invite-modal@3x.png similarity index 100% rename from branding/src/images/invite-modal@3x.png rename to src/images/assets/invite-modal@3x.png diff --git a/branding/src/images/invite-modal@4x.png b/src/images/assets/invite-modal@4x.png similarity index 100% rename from branding/src/images/invite-modal@4x.png rename to src/images/assets/invite-modal@4x.png diff --git a/branding/src/images/invite-rewards.png b/src/images/assets/invite-rewards.png similarity index 100% rename from branding/src/images/invite-rewards.png rename to src/images/assets/invite-rewards.png diff --git a/branding/src/images/invite-rewards@1.5x.png b/src/images/assets/invite-rewards@1.5x.png similarity index 100% rename from branding/src/images/invite-rewards@1.5x.png rename to src/images/assets/invite-rewards@1.5x.png diff --git a/branding/src/images/invite-rewards@2x.png b/src/images/assets/invite-rewards@2x.png similarity index 100% rename from branding/src/images/invite-rewards@2x.png rename to src/images/assets/invite-rewards@2x.png diff --git a/branding/src/images/invite-rewards@3x.png b/src/images/assets/invite-rewards@3x.png similarity index 100% rename from branding/src/images/invite-rewards@3x.png rename to src/images/assets/invite-rewards@3x.png diff --git a/branding/src/images/invite-rewards@4x.png b/src/images/assets/invite-rewards@4x.png similarity index 100% rename from branding/src/images/invite-rewards@4x.png rename to src/images/assets/invite-rewards@4x.png diff --git a/branding/src/images/learn-celo.png b/src/images/assets/learn-celo.png similarity index 100% rename from branding/src/images/learn-celo.png rename to src/images/assets/learn-celo.png diff --git a/branding/src/images/learn-celo@1.5x.png b/src/images/assets/learn-celo@1.5x.png similarity index 100% rename from branding/src/images/learn-celo@1.5x.png rename to src/images/assets/learn-celo@1.5x.png diff --git a/branding/src/images/learn-celo@2x.png b/src/images/assets/learn-celo@2x.png similarity index 100% rename from branding/src/images/learn-celo@2x.png rename to src/images/assets/learn-celo@2x.png diff --git a/branding/src/images/learn-celo@3x.png b/src/images/assets/learn-celo@3x.png similarity index 100% rename from branding/src/images/learn-celo@3x.png rename to src/images/assets/learn-celo@3x.png diff --git a/branding/src/images/learn-celo@4x.png b/src/images/assets/learn-celo@4x.png similarity index 100% rename from branding/src/images/learn-celo@4x.png rename to src/images/assets/learn-celo@4x.png diff --git a/branding/src/images/notification-invite.png b/src/images/assets/notification-invite.png similarity index 100% rename from branding/src/images/notification-invite.png rename to src/images/assets/notification-invite.png diff --git a/branding/src/images/notification-invite@1.5x.png b/src/images/assets/notification-invite@1.5x.png similarity index 100% rename from branding/src/images/notification-invite@1.5x.png rename to src/images/assets/notification-invite@1.5x.png diff --git a/branding/src/images/notification-invite@2x.png b/src/images/assets/notification-invite@2x.png similarity index 100% rename from branding/src/images/notification-invite@2x.png rename to src/images/assets/notification-invite@2x.png diff --git a/branding/src/images/notification-invite@3x.png b/src/images/assets/notification-invite@3x.png similarity index 100% rename from branding/src/images/notification-invite@3x.png rename to src/images/assets/notification-invite@3x.png diff --git a/branding/src/images/notification-invite@4x.png b/src/images/assets/notification-invite@4x.png similarity index 100% rename from branding/src/images/notification-invite@4x.png rename to src/images/assets/notification-invite@4x.png diff --git a/branding/src/images/onboarding-education-1.png b/src/images/assets/onboarding-education-1.png similarity index 100% rename from branding/src/images/onboarding-education-1.png rename to src/images/assets/onboarding-education-1.png diff --git a/branding/src/images/onboarding-education-1@1.5x.png b/src/images/assets/onboarding-education-1@1.5x.png similarity index 100% rename from branding/src/images/onboarding-education-1@1.5x.png rename to src/images/assets/onboarding-education-1@1.5x.png diff --git a/branding/src/images/onboarding-education-1@2x.png b/src/images/assets/onboarding-education-1@2x.png similarity index 100% rename from branding/src/images/onboarding-education-1@2x.png rename to src/images/assets/onboarding-education-1@2x.png diff --git a/branding/src/images/onboarding-education-1@3x.png b/src/images/assets/onboarding-education-1@3x.png similarity index 100% rename from branding/src/images/onboarding-education-1@3x.png rename to src/images/assets/onboarding-education-1@3x.png diff --git a/branding/src/images/onboarding-education-1@4x.png b/src/images/assets/onboarding-education-1@4x.png similarity index 100% rename from branding/src/images/onboarding-education-1@4x.png rename to src/images/assets/onboarding-education-1@4x.png diff --git a/branding/src/images/onboarding-education-2.png b/src/images/assets/onboarding-education-2.png similarity index 100% rename from branding/src/images/onboarding-education-2.png rename to src/images/assets/onboarding-education-2.png diff --git a/branding/src/images/onboarding-education-2@1.5x.png b/src/images/assets/onboarding-education-2@1.5x.png similarity index 100% rename from branding/src/images/onboarding-education-2@1.5x.png rename to src/images/assets/onboarding-education-2@1.5x.png diff --git a/branding/src/images/onboarding-education-2@2x.png b/src/images/assets/onboarding-education-2@2x.png similarity index 100% rename from branding/src/images/onboarding-education-2@2x.png rename to src/images/assets/onboarding-education-2@2x.png diff --git a/branding/src/images/onboarding-education-2@3x.png b/src/images/assets/onboarding-education-2@3x.png similarity index 100% rename from branding/src/images/onboarding-education-2@3x.png rename to src/images/assets/onboarding-education-2@3x.png diff --git a/branding/src/images/onboarding-education-2@4x.png b/src/images/assets/onboarding-education-2@4x.png similarity index 100% rename from branding/src/images/onboarding-education-2@4x.png rename to src/images/assets/onboarding-education-2@4x.png diff --git a/branding/src/images/onboarding-education-3.png b/src/images/assets/onboarding-education-3.png similarity index 100% rename from branding/src/images/onboarding-education-3.png rename to src/images/assets/onboarding-education-3.png diff --git a/branding/src/images/onboarding-education-3@1.5x.png b/src/images/assets/onboarding-education-3@1.5x.png similarity index 100% rename from branding/src/images/onboarding-education-3@1.5x.png rename to src/images/assets/onboarding-education-3@1.5x.png diff --git a/branding/src/images/onboarding-education-3@2x.png b/src/images/assets/onboarding-education-3@2x.png similarity index 100% rename from branding/src/images/onboarding-education-3@2x.png rename to src/images/assets/onboarding-education-3@2x.png diff --git a/branding/src/images/onboarding-education-3@3x.png b/src/images/assets/onboarding-education-3@3x.png similarity index 100% rename from branding/src/images/onboarding-education-3@3x.png rename to src/images/assets/onboarding-education-3@3x.png diff --git a/branding/src/images/onboarding-education-3@4x.png b/src/images/assets/onboarding-education-3@4x.png similarity index 100% rename from branding/src/images/onboarding-education-3@4x.png rename to src/images/assets/onboarding-education-3@4x.png diff --git a/branding/src/images/points-card-background.png b/src/images/assets/points-card-background.png similarity index 100% rename from branding/src/images/points-card-background.png rename to src/images/assets/points-card-background.png diff --git a/branding/src/images/points-card-background@1.5x.png b/src/images/assets/points-card-background@1.5x.png similarity index 100% rename from branding/src/images/points-card-background@1.5x.png rename to src/images/assets/points-card-background@1.5x.png diff --git a/branding/src/images/points-card-background@2x.png b/src/images/assets/points-card-background@2x.png similarity index 100% rename from branding/src/images/points-card-background@2x.png rename to src/images/assets/points-card-background@2x.png diff --git a/branding/src/images/points-card-background@3x.png b/src/images/assets/points-card-background@3x.png similarity index 100% rename from branding/src/images/points-card-background@3x.png rename to src/images/assets/points-card-background@3x.png diff --git a/branding/src/images/points-card-background@4x.png b/src/images/assets/points-card-background@4x.png similarity index 100% rename from branding/src/images/points-card-background@4x.png rename to src/images/assets/points-card-background@4x.png diff --git a/branding/src/images/points-illustration.png b/src/images/assets/points-illustration.png similarity index 100% rename from branding/src/images/points-illustration.png rename to src/images/assets/points-illustration.png diff --git a/branding/src/images/points-illustration@1.5x.png b/src/images/assets/points-illustration@1.5x.png similarity index 100% rename from branding/src/images/points-illustration@1.5x.png rename to src/images/assets/points-illustration@1.5x.png diff --git a/branding/src/images/points-illustration@2x.png b/src/images/assets/points-illustration@2x.png similarity index 100% rename from branding/src/images/points-illustration@2x.png rename to src/images/assets/points-illustration@2x.png diff --git a/branding/src/images/points-illustration@3x.png b/src/images/assets/points-illustration@3x.png similarity index 100% rename from branding/src/images/points-illustration@3x.png rename to src/images/assets/points-illustration@3x.png diff --git a/branding/src/images/points-illustration@4x.png b/src/images/assets/points-illustration@4x.png similarity index 100% rename from branding/src/images/points-illustration@4x.png rename to src/images/assets/points-illustration@4x.png diff --git a/src/images/link-arrow.png b/src/images/link-arrow.png deleted file mode 100644 index 2faf598eb9f..00000000000 Binary files a/src/images/link-arrow.png and /dev/null differ diff --git a/src/jumpstart/JumpstartAddAssets.tsx b/src/jumpstart/JumpstartAddAssets.tsx index e08d3f908b6..7c7b6e32259 100644 --- a/src/jumpstart/JumpstartAddAssets.tsx +++ b/src/jumpstart/JumpstartAddAssets.tsx @@ -10,8 +10,8 @@ import { BottomSheetRefType } from 'src/components/BottomSheet' import Button, { BtnSizes, BtnTypes } from 'src/components/Button' import CustomHeader from 'src/components/header/CustomHeader' import { CICOFlow, FiatExchangeFlow } from 'src/fiatExchanges/utils' -import Palm from 'src/icons/Palm' -import WaveCurve from 'src/icons/WaveCurve' +import Palm from 'src/images/Palm' +import WaveCurve from 'src/images/WaveCurve' import { navigate } from 'src/navigator/NavigationService' import { Screens } from 'src/navigator/Screens' import { isAppSwapsEnabledSelector } from 'src/navigator/selectors' diff --git a/src/jumpstart/JumpstartTransactionDetailsScreen.tsx b/src/jumpstart/JumpstartTransactionDetailsScreen.tsx index ba931b0df3a..c9bad10626e 100644 --- a/src/jumpstart/JumpstartTransactionDetailsScreen.tsx +++ b/src/jumpstart/JumpstartTransactionDetailsScreen.tsx @@ -19,7 +19,7 @@ import TokenDisplay from 'src/components/TokenDisplay' import TokenIcon, { IconSize } from 'src/components/TokenIcon' import CustomHeader from 'src/components/header/CustomHeader' import Checkmark from 'src/icons/Checkmark' -import Logo from 'src/icons/Logo' +import Logo from 'src/images/Logo' import { fetchClaimStatus } from 'src/jumpstart/fetchClaimStatus' import { jumpstartReclaimStatusSelector } from 'src/jumpstart/selectors' import { jumpstartReclaimErrorDismissed, jumpstartReclaimStarted } from 'src/jumpstart/slice' diff --git a/src/navigator/TabNavigator.tsx b/src/navigator/TabNavigator.tsx index b12acbde147..3bd5f7ac4a3 100644 --- a/src/navigator/TabNavigator.tsx +++ b/src/navigator/TabNavigator.tsx @@ -5,9 +5,9 @@ import { useTranslation } from 'react-i18next' import { StyleSheet } from 'react-native' import TabDiscover from 'src/dappsExplorer/TabDiscover' import TabHome from 'src/home/TabHome' -import Logo from 'src/icons/Logo' import Discover from 'src/icons/navigator/Discover' import Wallet from 'src/icons/navigator/Wallet' +import Logo from 'src/images/Logo' import { tabHeader } from 'src/navigator/Headers' import { Screens } from 'src/navigator/Screens' import { StackParamList } from 'src/navigator/types' diff --git a/src/onboarding/ChooseYourAdventure.tsx b/src/onboarding/ChooseYourAdventure.tsx index 928dcd5423a..04240eddb23 100644 --- a/src/onboarding/ChooseYourAdventure.tsx +++ b/src/onboarding/ChooseYourAdventure.tsx @@ -10,9 +10,9 @@ import TextButton from 'src/components/TextButton' import Touchable from 'src/components/Touchable' import { FiatExchangeFlow } from 'src/fiatExchanges/utils' import EarnCoins from 'src/icons/EarnCoins' -import LogoHeart from 'src/icons/LogoHeart' import PlusIcon from 'src/icons/PlusIcon' import ProfilePlus from 'src/icons/ProfilePlus' +import LogoHeart from 'src/images/LogoHeart' import { nuxNavigationOptionsNoBackButton } from 'src/navigator/Headers' import { navigate, diff --git a/src/onboarding/registration/ProtectWallet.tsx b/src/onboarding/registration/ProtectWallet.tsx index 0f9bd053aea..b0d964c5ad8 100644 --- a/src/onboarding/registration/ProtectWallet.tsx +++ b/src/onboarding/registration/ProtectWallet.tsx @@ -6,10 +6,10 @@ import { SafeAreaView } from 'react-native-safe-area-context' import { recoveryPhraseInOnboardingStarted } from 'src/account/actions' import { RecoveryPhraseInOnboardingStatus } from 'src/account/reducer' import { recoveryPhraseInOnboardingStatusSelector } from 'src/account/selectors' -import { OnboardingEvents } from 'src/analytics/Events' import AppAnalytics from 'src/analytics/AppAnalytics' +import { OnboardingEvents } from 'src/analytics/Events' import OnboardingCard from 'src/components/OnboardingCard' -import GuideKeyIcon from 'src/icons/GuideKeyIcon' +import GuideKeyIcon from 'src/images/GuideKeyIcon' import { HeaderTitleWithSubtitle, nuxNavigationOptionsOnboarding } from 'src/navigator/Headers' import { ensurePincode, navigate } from 'src/navigator/NavigationService' import { Screens } from 'src/navigator/Screens' diff --git a/src/onboarding/registration/RegulatoryTerms.tsx b/src/onboarding/registration/RegulatoryTerms.tsx index 7cc2b87170e..99a855194d4 100644 --- a/src/onboarding/registration/RegulatoryTerms.tsx +++ b/src/onboarding/registration/RegulatoryTerms.tsx @@ -11,7 +11,7 @@ import Button, { BtnSizes, BtnTypes } from 'src/components/Button' import DevSkipButton from 'src/components/DevSkipButton' import { PRIVACY_LINK, TOS_LINK } from 'src/config' import { withTranslation } from 'src/i18n' -import Logo from 'src/icons/Logo' +import Logo from 'src/images/Logo' import { nuxNavigationOptions } from 'src/navigator/Headers' import { navigate } from 'src/navigator/NavigationService' import { Screens } from 'src/navigator/Screens' diff --git a/src/onboarding/success/OnboardingSuccessScreen.tsx b/src/onboarding/success/OnboardingSuccessScreen.tsx index 300b86da7f4..c1dbf562629 100644 --- a/src/onboarding/success/OnboardingSuccessScreen.tsx +++ b/src/onboarding/success/OnboardingSuccessScreen.tsx @@ -1,8 +1,8 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' import { Image, StyleSheet, Text, View } from 'react-native' -import Logo from 'src/icons/Logo' import { background } from 'src/images/Images' +import Logo from 'src/images/Logo' import { nuxNavigationOptionsNoBackButton } from 'src/navigator/Headers' import { Screens } from 'src/navigator/Screens' import { goToNextOnboardingScreen, onboardingPropsSelector } from 'src/onboarding/steps' diff --git a/src/onboarding/welcome/Welcome.tsx b/src/onboarding/welcome/Welcome.tsx index 56bf30f60cc..c33087a00a6 100644 --- a/src/onboarding/welcome/Welcome.tsx +++ b/src/onboarding/welcome/Welcome.tsx @@ -9,8 +9,8 @@ import { OnboardingEvents } from 'src/analytics/Events' import { TOS_LINK } from 'src/brandingConfig' import Button, { BtnSizes, BtnTypes } from 'src/components/Button' import CheckBox from 'src/icons/CheckBox' -import WelcomeLogo from 'src/icons/WelcomeLogo' import { welcomeBackground } from 'src/images/Images' +import WelcomeLogo from 'src/images/WelcomeLogo' import { nuxNavigationOptions } from 'src/navigator/Headers' import { navigate } from 'src/navigator/NavigationService' import { Screens } from 'src/navigator/Screens' diff --git a/src/points/ActivityCard.tsx b/src/points/ActivityCard.tsx index 3851adc25de..b6fa718018a 100644 --- a/src/points/ActivityCard.tsx +++ b/src/points/ActivityCard.tsx @@ -6,7 +6,7 @@ import { PointsEvents } from 'src/analytics/Events' import Touchable from 'src/components/Touchable' import CheckCircle from 'src/icons/CheckCircle' import ComingSoon from 'src/icons/ComingSoon' -import LogoHeart from 'src/icons/LogoHeart' +import LogoHeart from 'src/images/LogoHeart' import { PointsActivity } from 'src/points/types' import { Colors } from 'src/styles/colors' import { typeScale } from 'src/styles/fonts' diff --git a/src/points/PointsHistoryBottomSheet.tsx b/src/points/PointsHistoryBottomSheet.tsx index 12fa96f8e2e..0d50baad0fb 100644 --- a/src/points/PointsHistoryBottomSheet.tsx +++ b/src/points/PointsHistoryBottomSheet.tsx @@ -11,7 +11,7 @@ import { NotificationVariant } from 'src/components/InLineNotification' import SectionHead from 'src/components/SectionHead' import Toast from 'src/components/Toast' import { default as Attention, default as AttentionIcon } from 'src/icons/Attention' -import LogoHeart from 'src/icons/LogoHeart' +import LogoHeart from 'src/images/LogoHeart' import { HistoryCardMetadata, useGetHistoryDefinition } from 'src/points/cardDefinitions' import { nextPageUrlSelector, diff --git a/src/points/PointsHome.tsx b/src/points/PointsHome.tsx index a468049d7e7..f8b6f37a29c 100644 --- a/src/points/PointsHome.tsx +++ b/src/points/PointsHome.tsx @@ -15,7 +15,7 @@ import Toast from 'src/components/Toast' import Touchable from 'src/components/Touchable' import CustomHeader from 'src/components/header/CustomHeader' import AttentionIcon from 'src/icons/Attention' -import LogoHeart from 'src/icons/LogoHeart' +import LogoHeart from 'src/images/LogoHeart' import { Screens } from 'src/navigator/Screens' import { StackParamList } from 'src/navigator/types' import ActivityCardSection from 'src/points/ActivityCardSection' diff --git a/src/recipients/RecipientItemV2.tsx b/src/recipients/RecipientItemV2.tsx index 2208ddabb2f..8063ce416f3 100644 --- a/src/recipients/RecipientItemV2.tsx +++ b/src/recipients/RecipientItemV2.tsx @@ -3,12 +3,12 @@ import { useTranslation } from 'react-i18next' import { ActivityIndicator, Keyboard, StyleSheet, Text, View } from 'react-native' import ContactCircle from 'src/components/ContactCircle' import Touchable from 'src/components/Touchable' -import Logo from 'src/icons/Logo' import QuestionIcon from 'src/icons/QuestionIcon' import { addressToVerificationStatusSelector, e164NumberToAddressSelector, } from 'src/identity/selectors' +import Logo from 'src/images/Logo' import { Recipient, RecipientType, diff --git a/src/transactions/feed/NftFeedItem.tsx b/src/transactions/feed/NftFeedItem.tsx index d0a1309c7c7..0a7dc2c26a0 100644 --- a/src/transactions/feed/NftFeedItem.tsx +++ b/src/transactions/feed/NftFeedItem.tsx @@ -1,13 +1,13 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { StyleSheet, Text, View } from 'react-native' -import { HomeEvents } from 'src/analytics/Events' import AppAnalytics from 'src/analytics/AppAnalytics' +import { HomeEvents } from 'src/analytics/Events' import IconWithNetworkBadge from 'src/components/IconWithNetworkBadge' import Touchable from 'src/components/Touchable' import ImageErrorIcon from 'src/icons/ImageErrorIcon' -import NftReceivedIcon from 'src/icons/NftReceivedIcon' -import NftSentIcon from 'src/icons/NftSentIcon' +import NftReceivedIcon from 'src/images/NftReceivedIcon' +import NftSentIcon from 'src/images/NftSentIcon' import { navigate } from 'src/navigator/NavigationService' import { Screens } from 'src/navigator/Screens' import NftMedia from 'src/nfts/NftMedia' diff --git a/src/walletConnect/screens/Logos.tsx b/src/walletConnect/screens/Logos.tsx index e0fa7ae2463..d2ef0ae74b8 100644 --- a/src/walletConnect/screens/Logos.tsx +++ b/src/walletConnect/screens/Logos.tsx @@ -1,7 +1,7 @@ import React from 'react' import { Image, StyleSheet, Text, View } from 'react-native' import { SvgUri } from 'react-native-svg' -import Logo from 'src/icons/Logo' +import Logo from 'src/images/Logo' import { Colors } from 'src/styles/colors' import { typeScale } from 'src/styles/fonts' import { Shadow, Spacing, getShadowStyle } from 'src/styles/styles'