diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 9292b63e4..89cde8b3d 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -1,5 +1,5 @@ name: "Bug Report" -description: "Found a bug in Zeus? Use this issue template to report it." +description: "Found a bug in ZEUS? Use this issue template to report it." labels: ["Bug"] body: - type: markdown @@ -26,8 +26,8 @@ body: - type: dropdown id: version attributes: - label: Zeus version - description: What version of Zeus were you running when the bug occurred? + label: ZEUS version + description: What version of ZEUS were you running when the bug occurred? options: - v0.8.0 - v0.7.7 @@ -58,7 +58,7 @@ body: id: network attributes: label: Network - description: What network were you using Zeus with when the bug occurred? + description: What network were you using ZEUS with when the bug occurred? options: - Tor - Clearnet diff --git a/.github/ISSUE_TEMPLATE/enhancement.yml b/.github/ISSUE_TEMPLATE/enhancement.yml index 106307553..0d7a81116 100644 --- a/.github/ISSUE_TEMPLATE/enhancement.yml +++ b/.github/ISSUE_TEMPLATE/enhancement.yml @@ -1,16 +1,16 @@ name: Enhancement -description: Suggest an enhancement you'd like to see in Zeus! +description: Suggest an enhancement you'd like to see in ZEUS! labels: ["Enhancement"] body: - type: markdown attributes: value: | - We're always looking for suggestions on how we could improve Zeus! + We're always looking for suggestions on how we could improve ZEUS! - type: textarea id: describe attributes: label: Describe your enhancement idea description: A clear and concise description of your enhancement idea. Include images / mockups if relevant. - placeholder: Zeus would be even better if... + placeholder: ZEUS would be even better if... validations: required: true diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index fc77e1c9e..6c970cbfc 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -45,7 +45,7 @@ I have tested this PR with the following types of nodes (please specify node ver ### Locales - [ ] I’ve added new locale text that requires translations -- [ ] I’m aware that new translations should be made on the Zeus [Transfix page](https://app.transifex.com/ZeusLN/zeus/) and not directly to this repo +- [ ] I’m aware that new translations should be made on the ZEUS [Transfix page](https://app.transifex.com/ZeusLN/zeus/) and not directly to this repo ### Third Party Dependencies and Packages diff --git a/README.md b/README.md index e256b305a..ab78f4836 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -# Zeus +# ZEUS

-Zeus is a mobile Bitcoin/Lightning node manager and wallet application for LND, Core Lightning, and Eclair. ⚡️ +ZEUS is a mobile Bitcoin/Lightning node manager and wallet application for LND, Core Lightning, and Eclair. ⚡️ -Zeus is built on TypeScript and React Native. It runs on both iOS and Android. +ZEUS is built on TypeScript and React Native. It runs on both iOS and Android. Read more on our [documentation site](https://docs.zeusln.app/). @@ -68,25 +68,25 @@ and - [ ] PayJoin - [x] [Lightning Node Connect](https://docs.lightning.engineering/lightning-network-tools/lightning-terminal/lightning-node-connect) -## Connecting Zeus to your node +## Connecting ZEUS to your node -Currently, to use Zeus, you must have a Bitcoin Lightning node running [Lightning Network Daemon (lnd)](https://github.com/LightningNetwork/lnd), [eclair](https://github.com/ACINQ/eclair), or [Core Lightning](https://github.com/ElementsProject/lightning) using the [REST](https://github.com/Ride-The-Lightning/c-lightning-REST/) or [Sparko](https://github.com/fiatjaf/sparko) API. +You can connect ZEUS to a remote Bitcoin Lightning node running [Lightning Network Daemon (lnd)](https://github.com/LightningNetwork/lnd), [eclair](https://github.com/ACINQ/eclair), or [Core Lightning](https://github.com/ElementsProject/lightning) using the [REST](https://github.com/Ride-The-Lightning/c-lightning-REST/) or [Sparko](https://github.com/fiatjaf/sparko) API. -You must provide Zeus with your node's hostname, port number, and the macaroon you choose to use in **hex format**. If you need help converting your macaroon to hex format we wrote up a Node.js script that can use +You must provide ZEUS with your node's hostname, port number, and the macaroon you choose to use in **hex format**. If you need help converting your macaroon to hex format we wrote up a Node.js script that can use [here](https://github.com/ZeusLN/lnd-hex-macaroon-generator/). Alternatively, if you're running a Unix-based operating system (eg. macOS, Linux) you can run `xxd -ps -u -c 1000 /path/to/admin.macaroon` to generate your macaroon in hex format. ### Tor Connection Guides -Zeus has support for connecting to you node entirely over the Tor network. You can refer to these guides to set up a Tor hidden service on your lnd node. The instructions are generally interchangeable and typically only require you to change your Tor path. +ZEUS has support for connecting to you node entirely over the Tor network. You can refer to these guides to set up a Tor hidden service on your lnd node. The instructions are generally interchangeable and typically only require you to change your Tor path. -* [Zeus over Tor guide for RaspiBolt](https://raspibolt.org/guide/lightning/mobile-app.html) -* [Zeus over Tor guide for FreeNAS by Seth586](https://github.com/seth586/guides/blob/master/FreeNAS/wallets/zeusln.md) -* [Zeus over Tor guide for RaspiBlitz by openoms](https://github.com/openoms/bitcoin-tutorials/blob/master/Zeus_to_RaspiBlitz_through_Tor.md) +* [ZEUS over Tor guide for RaspiBolt](https://raspibolt.org/guide/lightning/mobile-app.html) +* [ZEUS over Tor guide for FreeNAS by Seth586](https://github.com/seth586/guides/blob/master/FreeNAS/wallets/zeusln.md) +* [ZEUS over Tor guide for RaspiBlitz by openoms](https://github.com/openoms/bitcoin-tutorials/blob/master/Zeus_to_RaspiBlitz_through_Tor.md) * [Tor-Only Bitcoin & Lightning Guide by Lopp](https://blog.lopp.net/tor-only-bitcoin-lightning-guide/) ## Integrations -Zeus is proud to be integrated on the following platforms: +ZEUS is proud to be integrated on the following platforms: ### Full node solutions * [nodl](https://www.nodl.it/) @@ -137,22 +137,22 @@ NOTE: When configuring a new node on Android in dev, the `Host` field must be `1 Reproducible builds are available for Android only right now. You'll need Docker installed to be able to build the app this way: -1. Clone Zeus git for the branch/tag that you want to build. For example: `git clone --depth 1 --branch v0.7.0 https://github.com/ZeusLN/zeus.git` +1. Clone ZEUS git for the branch/tag that you want to build. For example: `git clone --depth 1 --branch v0.7.0 https://github.com/ZeusLN/zeus.git` You can also remove the `--branch v0.7.0` parameter to build APKs for `master`. 2. Change to the zeus directory: `cd zeus` 3. Execute the build script: `./build.sh` 4. If everything goes well, the script will print a list of all the generated APK files and SHA256 hashes for each one of them: armv7, armv8, x86, x86_64, universal. The equivalent to the one provided in the web page is the one ending in 'universal'. You can compare SHA256 hashes with the ones provided on the [GitHub releases page](https://github.com/ZeusLN/zeus/releases) -5. Download the oficial APK from [GitHub releases page](https://github.com/ZeusLN/zeus/releases) or from the [Zeus homepage](https://zeusln.app/): `wget https://zeusln.app/zeus-v0.7.0.apk` +5. Download the oficial APK from [GitHub releases page](https://github.com/ZeusLN/zeus/releases) or from the [ZEUS homepage](https://zeusln.app/): `wget https://zeusln.app/zeus-v0.7.0.apk` 6. Compare both APKs with a suitable utility like `diffoscope`, `apksigcopier` or by running `diff --brief --recursive ./unpacked_oficial_apk ./unpacked_built_apk`. You should only get differences for the certificates used to sign the official APK -If you want to install the APK built this way onto your own smartphone, you'll need to sign it yourself (see next section). Note that the first time you install a build made using this procedure, you'll need to uninstall your current version of Zeus and then install the one built here because certificates will not match. You'll lose your connection details and you'll need to reconfigure Zeus again to connect to your nodes. +If you want to install the APK built this way onto your own smartphone, you'll need to sign it yourself (see next section). Note that the first time you install a build made using this procedure, you'll need to uninstall your current version of ZEUS and then install the one built here because certificates will not match. You'll lose your connection details and you'll need to reconfigure ZEUS again to connect to your nodes. ### Signing APKs 1. Install signing utilities: `apt-get install -y apksigner` 2. Create your certificate, if you haven't done so already. If you already have the certificate from previous builds, it's advised that you use the same one so you are able to upgrade from one APK to the next one without reinstalling first: `keytool -genkeypair -alias zeus -keystore zeus.pfx -v -storetype PKCS12 -keyalg RSA -keysize 2048 -storepass your_keystore_password -keypass your_key_password -validity 10000 -dname "cn=Unknown, ou=Unknown, o=Unknown, c=Unknown"` 3. Sign the chosen APK file using this command: `java -jar /usr/bin/apksigner sign -v --ks zeus.pfx --ks-key-alias zeus --ks-pass pass:your_keystore_password --key-pass pass:your_key_password zeus-universal.apk` -4. Copy the signed APK to your smartphone and install it by tapping over the file. If you get an error, you'll have to uninstall your currently installed version of Zeus first. Note that you'll lose your connections and you'll need to reconfigure Zeus again to connect to your node. +4. Copy the signed APK to your smartphone and install it by tapping over the file. If you get an error, you'll have to uninstall your currently installed version of ZEUS first. Note that you'll lose your connections and you'll need to reconfigure ZEUS again to connect to your node. ## Translations diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a4470b10d..266c831b0 100755 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -23,8 +23,8 @@ + + diff --git a/android/app/src/main/assets/fonts/Marlide-Display-Bold.ttf b/android/app/src/main/assets/fonts/Marlide-Display-Bold.ttf new file mode 100644 index 000000000..70beaaacb Binary files /dev/null and b/android/app/src/main/assets/fonts/Marlide-Display-Bold.ttf differ diff --git a/android/app/src/main/assets/fonts/Marlide-Display.ttf b/android/app/src/main/assets/fonts/Marlide-Display.ttf new file mode 100644 index 000000000..da06fdf33 Binary files /dev/null and b/android/app/src/main/assets/fonts/Marlide-Display.ttf differ diff --git a/android/app/src/main/ic_launcher-web.png b/android/app/src/main/ic_launcher-web.png new file mode 100644 index 000000000..443607c01 Binary files /dev/null and b/android/app/src/main/ic_launcher-web.png differ diff --git a/android/app/src/main/playstore-icon.png b/android/app/src/main/playstore-icon.png index b0fe4352b..50fb2032d 100644 Binary files a/android/app/src/main/playstore-icon.png and b/android/app/src/main/playstore-icon.png differ diff --git a/android/app/src/main/res/drawable/splash_screen.xml b/android/app/src/main/res/drawable/splash_screen.xml index 33d94fb15..51b0ff9ca 100644 --- a/android/app/src/main/res/drawable/splash_screen.xml +++ b/android/app/src/main/res/drawable/splash_screen.xml @@ -7,7 +7,7 @@ + android:src="@mipmap/ic_splash"/> diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 000000000..036d09bc5 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/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 new file mode 100644 index 000000000..036d09bc5 --- /dev/null +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 99d62c071..ae64d51f7 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..5b799a46c Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..41589e131 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_splash.png b/android/app/src/main/res/mipmap-hdpi/ic_splash.png new file mode 100644 index 000000000..99d62c071 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_splash.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 99d62c071..4b8412bc1 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..e7765b85e Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..0935cbd8b Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_splash.png b/android/app/src/main/res/mipmap-mdpi/ic_splash.png new file mode 100644 index 000000000..99d62c071 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_splash.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 99d62c071..f068a457c 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..d0eb2af62 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..f0db7007b Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_splash.png b/android/app/src/main/res/mipmap-xhdpi/ic_splash.png new file mode 100644 index 000000000..99d62c071 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_splash.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 99d62c071..cc205fd8d 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..6d1bb73e4 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..eb8c8fc1c Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_splash.png b/android/app/src/main/res/mipmap-xxhdpi/ic_splash.png new file mode 100644 index 000000000..99d62c071 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_splash.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 99d62c071..de74a9d36 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 000000000..10fee454c Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..7fe02f4f5 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_splash.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_splash.png new file mode 100644 index 000000000..99d62c071 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_splash.png differ diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 000000000..beab31f75 --- /dev/null +++ b/android/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #000000 + \ No newline at end of file diff --git a/android/app/src/main/web_hi_res_512.png b/android/app/src/main/web_hi_res_512.png deleted file mode 100644 index 21d147b72..000000000 Binary files a/android/app/src/main/web_hi_res_512.png and /dev/null differ diff --git a/android/app/src/main/web_hi_res_512_round.png b/android/app/src/main/web_hi_res_512_round.png deleted file mode 100755 index d29953444..000000000 Binary files a/android/app/src/main/web_hi_res_512_round.png and /dev/null differ diff --git a/android/gradle.properties b/android/gradle.properties index c736d85a6..cfda5d8f5 100755 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -10,12 +10,14 @@ # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. # Default value: -Xmx512m -XX:MaxMetaspaceSize=256m -org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m +org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError +org.gradle.daemon=true +org.gradle.configureondemand=true # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true +org.gradle.parallel=true # AndroidX package structure to make it clearer which packages are bundled with the # Android operating system, and which are packaged with your app's APK diff --git a/android/link-assets-manifest.json b/android/link-assets-manifest.json new file mode 100644 index 000000000..77f54ca5a --- /dev/null +++ b/android/link-assets-manifest.json @@ -0,0 +1,465 @@ +{ + "migIndex": 1, + "data": [ + { + "path": "assets/fonts/PPNeueMontreal-Medium.ttf", + "sha1": "d67fee08c79a82ce375ab9629ae5a903da8bb321" + }, + { + "path": "assets/fonts/PPNeueMontreal-Book.ttf", + "sha1": "e923c72eda5e50a87e18ff5c71e9ef4b3b6455a3" + }, + { + "path": "assets/fonts/Marlide-Display-Bold.ttf", + "sha1": "ed2c5555ef073d63910fe6f686e98867e3cde63c" + }, + { + "path": "assets/fonts/Marlide-Display.ttf", + "sha1": "04a807b744dacda4766f2f09d222cb34b86d4f5b" + }, + { + "path": "assets/images/GIF/Loading.gif", + "sha1": "b0695fc4aaa609075202bb3b732f0702f260542b" + }, + { + "path": "assets/images/GIF/Success.gif", + "sha1": "8dd99d418b8e3223ed8c8881b978aeb17f8c7ea6" + }, + { + "path": "assets/images/Launcher.png", + "sha1": "db916cdabf2cb8575e7646e26cc81ebbdc4d96d4" + }, + { + "path": "assets/images/Lottie/lightning1.json", + "sha1": "e4e9778e89455cd092b38ab91e21173bd7e7a795" + }, + { + "path": "assets/images/Lottie/lightning2.json", + "sha1": "2d001ce857a72f0e729a6a1ba5fdcd17c4ce7258" + }, + { + "path": "assets/images/Lottie/lightning3.json", + "sha1": "82aee96931c5e96d4c52ea9904b129273ac23aa7" + }, + { + "path": "assets/images/Lottie/loader.json", + "sha1": "db9db1aee58a5f3658091bf00b0b38c25c4b6999" + }, + { + "path": "assets/images/Mascot.png", + "sha1": "b4874a29eaa3aad2a857ec403a77ba9c4c5da296" + }, + { + "path": "assets/images/SPLASH copy 2.png", + "sha1": "e1f6cd5ef48885b7009712ae7d1b0a668ae9419e" + }, + { + "path": "assets/images/SPLASH copy.png", + "sha1": "7021fbab05ae61d4f7b379b87e5f51e49529befe" + }, + { + "path": "assets/images/SPLASH.png", + "sha1": "aa65f7f847a8da8ec9c054b6b376420e3e4fdd9c" + }, + { + "path": "assets/images/SVG/Add.svg", + "sha1": "b808375425fd1495b93a7f3f1a128f228956e0d8" + }, + { + "path": "assets/images/SVG/Alert.svg", + "sha1": "c5ddacf94d09e3b95717862ec269f856a98906cf" + }, + { + "path": "assets/images/SVG/Backspace.svg", + "sha1": "bbae4f69c82aaf560e135e071facc0682b70d012" + }, + { + "path": "assets/images/SVG/Bitcoin.svg", + "sha1": "86abc191b64dc5d17144c385c42d658bf934a4e0" + }, + { + "path": "assets/images/SVG/BitcoinIcon.svg", + "sha1": "0e4e16c812f7dd0095f99e167572fb3b4e5288b1" + }, + { + "path": "assets/images/SVG/Block.svg", + "sha1": "baccbd5d5913b5fbf6956cce7199a5a446104b9d" + }, + { + "path": "assets/images/SVG/Brush.svg", + "sha1": "5e4791151130cf4ec78a5093b23d07f27461dfad" + }, + { + "path": "assets/images/SVG/Caret Down.svg", + "sha1": "7874f61c1e90daca8f5c0559e95d89d3190c1853" + }, + { + "path": "assets/images/SVG/Caret Left.svg", + "sha1": "b44b478eabdef4efdd895602fb7f0cc177496220" + }, + { + "path": "assets/images/SVG/Caret Right-1.svg", + "sha1": "2833aa8ca4c92d5b7658c8aa5611696a2708a6c8" + }, + { + "path": "assets/images/SVG/Caret Right-3.svg", + "sha1": "2b78a9a3b846ea94495866e4a35c34bb46cd518f" + }, + { + "path": "assets/images/SVG/Caret Right.svg", + "sha1": "c4420cdcaddbb709987c5ae6aa55c31688d45ad8" + }, + { + "path": "assets/images/SVG/Caret Up.svg", + "sha1": "a4df241bd3151cb377b105b244f00f2a3e35cfd7" + }, + { + "path": "assets/images/SVG/Channel.svg", + "sha1": "4bacc36b25805d3c5726c79c135d7dbd9d2d9e37" + }, + { + "path": "assets/images/SVG/Channels.svg", + "sha1": "c9b401d8b683c9d8aadcfb41576c80a847b82a9a" + }, + { + "path": "assets/images/SVG/Checkmark.svg", + "sha1": "dd4277c8c5ac09d80110302ab53c562f6df6fbf1" + }, + { + "path": "assets/images/SVG/Clipboard.svg", + "sha1": "0ad18c819e47391650279bb3fb07a6d483a4c9da" + }, + { + "path": "assets/images/SVG/Clock.svg", + "sha1": "47bf29b262ea5d0fc1b83a4e32fbd31c2ecc3f2b" + }, + { + "path": "assets/images/SVG/Cloud.svg", + "sha1": "c5b2c4a9a91c7e539514159d566a785a84a2b789" + }, + { + "path": "assets/images/SVG/Coins.svg", + "sha1": "3599f2b50d0191fa130242538f15d61e20ebd1e9" + }, + { + "path": "assets/images/SVG/Contact.svg", + "sha1": "09164507bf311947980d3ae9b9a494d105502baf" + }, + { + "path": "assets/images/SVG/Copy.svg", + "sha1": "e5a7f74dcec6e11fbace65eb4d6c31f5db8dbf02" + }, + { + "path": "assets/images/SVG/Cross.svg", + "sha1": "c00a094d6852a14a30ab507e6a1009ee13d51352" + }, + { + "path": "assets/images/SVG/Currency.svg", + "sha1": "83123b0668b524f68dd8fcca5a120aa564062274" + }, + { + "path": "assets/images/SVG/Delete.svg", + "sha1": "e85cbe324ba7c6394eb955926be760d8ebb9c773" + }, + { + "path": "assets/images/SVG/Dice.svg", + "sha1": "de127e1cc3af907bf48b97b9c7c19c58a43102f0" + }, + { + "path": "assets/images/SVG/DynamicSVG/AddressSvg.tsx", + "sha1": "59a3a23aac20636a348f3dada90338db4dfe3344" + }, + { + "path": "assets/images/SVG/DynamicSVG/LightningSvg.tsx", + "sha1": "8f38594b1abd0d4877075e1621013f353180862d" + }, + { + "path": "assets/images/SVG/DynamicSVG/OnChainSvg.tsx", + "sha1": "e959c75860607b476bca2b0a9078cb3cb46eb23e" + }, + { + "path": "assets/images/SVG/DynamicSVG/ScanFrameSvg.tsx", + "sha1": "7485e1c143ccdfadb765d53dc9fc1626b251a637" + }, + { + "path": "assets/images/SVG/DynamicSVG/UnifiedSvg.tsx", + "sha1": "e61cf6ad20fb18b3919d84a47bd4db8b0ab7bc4a" + }, + { + "path": "assets/images/SVG/Edit.svg", + "sha1": "1f6acf36aa5a17040c73377b528ed5b953a48850" + }, + { + "path": "assets/images/SVG/Error.svg", + "sha1": "1bf7ab74cc3be1adca93c821e0c577374a2238de" + }, + { + "path": "assets/images/SVG/ErrorIcon.svg", + "sha1": "05da1a652815c751b35361d0433742894988be0a" + }, + { + "path": "assets/images/SVG/ExchangeBitcoin.svg", + "sha1": "ed26dc3a06b31b446d7b8d58a1446d1ff6584125" + }, + { + "path": "assets/images/SVG/ExchangeFiat.svg", + "sha1": "308dfb3ceeabeb74ead32307bdd370f41382be72" + }, + { + "path": "assets/images/SVG/Export.svg", + "sha1": "d2d30904d8d20321e0842bb5bbaabcf0f56a749d" + }, + { + "path": "assets/images/SVG/Eye Off.svg", + "sha1": "2f483794844c8460de09ee50fb42c7917572ad16" + }, + { + "path": "assets/images/SVG/Eye On.svg", + "sha1": "f73cd4fa4a5b1d681cc80f01ed6e2228e6a11cba" + }, + { + "path": "assets/images/SVG/Filter Off.svg", + "sha1": "8b03e309c5faa1a790364c103398ac314994a284" + }, + { + "path": "assets/images/SVG/Filter On.svg", + "sha1": "a431acfb7747c76b2443349619ab9a4bb79f0d31" + }, + { + "path": "assets/images/SVG/Flash Off.svg", + "sha1": "2ac9327adcc428b5aaa8ed22aba65b9620179fc2" + }, + { + "path": "assets/images/SVG/Flash On.svg", + "sha1": "3d4ad8daac2cddbd4540c67e55759e7b0f50b784" + }, + { + "path": "assets/images/SVG/Gallery.svg", + "sha1": "d412cc304689aa141f566bfd6401b7a4448453fb" + }, + { + "path": "assets/images/SVG/Globe.svg", + "sha1": "e952a3834d1ec34a7c6d0a551586136a634e6d5d" + }, + { + "path": "assets/images/SVG/Help Icon.svg", + "sha1": "0da32a38426d02ae6b42fcee6cd6537f90b5dd6d" + }, + { + "path": "assets/images/SVG/Hidden.svg", + "sha1": "f66e7f438a9407cc7d974ad3b2688a5fa8c511d2" + }, + { + "path": "assets/images/SVG/Key Security.svg", + "sha1": "10641278df5aaef43d279329d03398f8358d9a31" + }, + { + "path": "assets/images/SVG/Key.svg", + "sha1": "a5cf54329c9972768de23a95d8d817992392a243" + }, + { + "path": "assets/images/SVG/Leaving.svg", + "sha1": "99158d62a92b691277250928c33ca045ba171c14" + }, + { + "path": "assets/images/SVG/Lightning Bolt.svg", + "sha1": "ee6a28d6dfb9c981e9b2ad1eb0a8b27c0e6bb25e" + }, + { + "path": "assets/images/SVG/Lock.svg", + "sha1": "64c7a312c6ff48ce22bdb3bb9e59609bd50ef21f" + }, + { + "path": "assets/images/SVG/MailboxFlagDown.svg", + "sha1": "b2bbcf0b05a18261e9a553120f740a62e82b3871" + }, + { + "path": "assets/images/SVG/MailboxFlagUp.svg", + "sha1": "1234c0c30f2ccea138922b8d16d5e34891306e35" + }, + { + "path": "assets/images/SVG/Menu.svg", + "sha1": "08ecea9250a0a37bf85b6b521e4a036f26ff033a" + }, + { + "path": "assets/images/SVG/Mnemonic.svg", + "sha1": "9fdf0dd6fa4fa5a561bf9c15ef9ee5a554bef772" + }, + { + "path": "assets/images/SVG/NFC.svg", + "sha1": "a2dce857e44d12de95f6419c116cec062e07069a" + }, + { + "path": "assets/images/SVG/Network.svg", + "sha1": "e72d0d9a62aa40fb77487f2658cbb3028ab88e33" + }, + { + "path": "assets/images/SVG/Node Off.svg", + "sha1": "6f25ab510cf2415259a7db9ec58af7f91164694b" + }, + { + "path": "assets/images/SVG/Node On.svg", + "sha1": "48ff7f8fb7c94d8cfc218b0a3079e22e338e00f1" + }, + { + "path": "assets/images/SVG/Nostrich.svg", + "sha1": "866c5f6e9260ee90e22ea9df31258817fa27707a" + }, + { + "path": "assets/images/SVG/Olympus.svg", + "sha1": "d88863cc6fed7ac2b098ebef9373af2bc13bbd0e" + }, + { + "path": "assets/images/SVG/POS.svg", + "sha1": "5172319e19822254b87371c34e862ea4fe320b33" + }, + { + "path": "assets/images/SVG/PeersContact.svg", + "sha1": "b1afcf645adcb61c7628561a8efaa1ff1be3efc6" + }, + { + "path": "assets/images/SVG/Pen.svg", + "sha1": "0313e976f8c6c5f68210bf9884f66656bd65df99" + }, + { + "path": "assets/images/SVG/Pie.svg", + "sha1": "4aa3ce69b70c3b6c13bfc7faed578dab2bc97df3" + }, + { + "path": "assets/images/SVG/PinFilled.svg", + "sha1": "13c88dd39432c3e1bad5b587869eaa44e232c453" + }, + { + "path": "assets/images/SVG/PinHollow.svg", + "sha1": "95efff086bd2f7dba7b3f0f3588a17d64155e4fb" + }, + { + "path": "assets/images/SVG/QR.svg", + "sha1": "74cbde34da61782db454ec97da749fb7e2d096c7" + }, + { + "path": "assets/images/SVG/Question.svg", + "sha1": "e83146564d41d2ba1dde5eca1e047759f1ea1402" + }, + { + "path": "assets/images/SVG/Receive.svg", + "sha1": "3b8b7934fe17297dfe8f804ffe49ba314550d5e5" + }, + { + "path": "assets/images/SVG/Refresh.svg", + "sha1": "28d45ef696f318848142211b6f8ed952fab45fdf" + }, + { + "path": "assets/images/SVG/Routing.svg", + "sha1": "dcc0022299a0cfbdf917d675a1e382789acb2e88" + }, + { + "path": "assets/images/SVG/Save.svg", + "sha1": "0c1a0ff55c618ef676f03e1469d2e03b95c7e334" + }, + { + "path": "assets/images/SVG/Scan.svg", + "sha1": "3d7c24f875c6cc0c220a49728f11009109e8e32e" + }, + { + "path": "assets/images/SVG/Search.svg", + "sha1": "42dd718471d07ba2d16647e30cdb2592a261b7ab" + }, + { + "path": "assets/images/SVG/Send.svg", + "sha1": "c676f713fc2b7eb9f8be38bf8a66f8071ac43255" + }, + { + "path": "assets/images/SVG/Share.svg", + "sha1": "9377ff7d12976011aa61e53a7cec0e1529c251fa" + }, + { + "path": "assets/images/SVG/Skull.svg", + "sha1": "5a57cf55416a2a24a6b5a7bbd0e31b4f1ebc8731" + }, + { + "path": "assets/images/SVG/Success.svg", + "sha1": "76294dfd8e78b342f92321b79d96a3868c916302" + }, + { + "path": "assets/images/SVG/Sweep.svg", + "sha1": "54b670e961879603e958838ded5ee974d548c752" + }, + { + "path": "assets/images/SVG/Switch.svg", + "sha1": "0dbeafd08c1cc10a4f55a1aef6bb492096565b99" + }, + { + "path": "assets/images/SVG/Sync.svg", + "sha1": "5f165ef4da154e50d1b6e9d025d2ed10fa55481c" + }, + { + "path": "assets/images/SVG/Temple.svg", + "sha1": "8fbecb0af0b3274d4362dad97108119fea725eb4" + }, + { + "path": "assets/images/SVG/Verified Account.svg", + "sha1": "0c4eeceb8ce7816709647ac8d5ee370a8e5da8ad" + }, + { + "path": "assets/images/SVG/Visible.svg", + "sha1": "c8ae98f0f57fae7532a6939e4565c49d2905f0e5" + }, + { + "path": "assets/images/SVG/WORDMARK.svg", + "sha1": "3e4135caea90ab77a1a3e6c40ada89758c3b27d2" + }, + { + "path": "assets/images/SVG/Wallet.svg", + "sha1": "784c98c26959c5f15313fa88dd552eea4feacd0f" + }, + { + "path": "assets/images/SVG/Wallet2.svg", + "sha1": "27203006e06921dce9c2d754cef239cf10187e55" + }, + { + "path": "assets/images/SVG/Word Logo - no outline.svg", + "sha1": "e464c8cc57ed280aa7d1fa69b70499e32168cfd8" + }, + { + "path": "assets/images/SVG/Word Logo.svg", + "sha1": "7986cb0127380cb0222dd01ae86b787ee790fd89" + }, + { + "path": "assets/images/Untitled.png", + "sha1": "9fb18e964c88961fed7274dc648392516e2e1b16" + }, + { + "path": "assets/images/affiliates/Mempool.svg", + "sha1": "021a4b2bf1926a534169d507dccb291b2d41941b" + }, + { + "path": "assets/images/intro/1.png", + "sha1": "6b9a0d65e0d3d0586a902904792994313e18c539" + }, + { + "path": "assets/images/intro/2.png", + "sha1": "caaf76dc5a583c3ef174277bac5202ff190ac30c" + }, + { + "path": "assets/images/intro/3.png", + "sha1": "dbd40f35f191302803cb58e32521e601671791a5" + }, + { + "path": "assets/images/intro/4.png", + "sha1": "4ab92a8c0423d3472c2194cb1585fd42ed03aba2" + }, + { + "path": "assets/images/intro/splash.png", + "sha1": "c503c27ead2f63874ce878841b94f3fd6f797a88" + }, + { + "path": "assets/images/tor.png", + "sha1": "846a80b5f9b2bdfcec9f1ac86812f8b7d562993a" + }, + { + "path": "assets/images/zeus-pay.png", + "sha1": "da09f2edc838ccfb019830ac4f30c53ee8a631e5" + } + ] +} diff --git a/assets/fonts/Marlide-Display-Bold.ttf b/assets/fonts/Marlide-Display-Bold.ttf new file mode 100644 index 000000000..70beaaacb Binary files /dev/null and b/assets/fonts/Marlide-Display-Bold.ttf differ diff --git a/assets/fonts/Marlide-Display.ttf b/assets/fonts/Marlide-Display.ttf new file mode 100644 index 000000000..da06fdf33 Binary files /dev/null and b/assets/fonts/Marlide-Display.ttf differ diff --git a/assets/images/Mascot.png b/assets/images/Mascot.png index 137c042a6..d732c566a 100644 Binary files a/assets/images/Mascot.png and b/assets/images/Mascot.png differ diff --git a/assets/images/SVG/Back.svg b/assets/images/SVG/Back.svg new file mode 100644 index 000000000..039617630 --- /dev/null +++ b/assets/images/SVG/Back.svg @@ -0,0 +1,4 @@ + + + + diff --git a/assets/images/SVG/Caret Up.svg b/assets/images/SVG/Caret Up.svg index 4e11af83e..299772878 100644 --- a/assets/images/SVG/Caret Up.svg +++ b/assets/images/SVG/Caret Up.svg @@ -1,3 +1,6 @@ - - + + + + diff --git a/assets/images/SVG/Globe.svg b/assets/images/SVG/Globe.svg index 2433ba382..12ddf17c7 100644 --- a/assets/images/SVG/Globe.svg +++ b/assets/images/SVG/Globe.svg @@ -1,4 +1,4 @@ - + diff --git a/assets/images/SVG/Olympus.svg b/assets/images/SVG/Olympus.svg index 6042418ca..4919b4a9f 100644 --- a/assets/images/SVG/Olympus.svg +++ b/assets/images/SVG/Olympus.svg @@ -1,5 +1,13 @@ - - - - - + + + + + + + + + \ No newline at end of file diff --git a/assets/images/SVG/Scan.svg b/assets/images/SVG/Scan.svg index 480363c85..815a192a2 100644 --- a/assets/images/SVG/Scan.svg +++ b/assets/images/SVG/Scan.svg @@ -1,52 +1,13 @@ - - - - - - - - - - + + + + + + + + + + + + diff --git a/assets/images/SVG/TresArrows.svg b/assets/images/SVG/TresArrows.svg new file mode 100644 index 000000000..172a2b380 --- /dev/null +++ b/assets/images/SVG/TresArrows.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/images/SVG/wordmark-black.svg b/assets/images/SVG/wordmark-black.svg new file mode 100755 index 000000000..e13dd72c5 --- /dev/null +++ b/assets/images/SVG/wordmark-black.svg @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/assets/images/Untitled.png b/assets/images/Untitled.png new file mode 100644 index 000000000..b39c5b1a2 Binary files /dev/null and b/assets/images/Untitled.png differ diff --git a/assets/images/hyper.jpg b/assets/images/hyper.jpg new file mode 100644 index 000000000..a93318e63 Binary files /dev/null and b/assets/images/hyper.jpg differ diff --git a/build.sh b/build.sh index cab5ed013..6d2679ce3 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ CONTAINER_NAME="zeus_builder_container" ZEUS_PATH=/olympus/zeus docker run --rm -it --name $CONTAINER_NAME -v `pwd`:$ZEUS_PATH $BUILDER_IMAGE bash -c \ - 'echo -e "\n\n********************************\n*** Building Zeus...\n********************************\n" && \ + 'echo -e "\n\n********************************\n*** Building ZEUS...\n********************************\n" && \ cd /olympus/zeus ; yarn install --frozen-lockfile && \ cd /olympus/zeus/android ; ./gradlew app:assembleRelease && \ diff --git a/components/AmountInput.tsx b/components/AmountInput.tsx index 265087946..e07074cf2 100644 --- a/components/AmountInput.tsx +++ b/components/AmountInput.tsx @@ -138,7 +138,7 @@ export default class AmountInput extends React.Component< @@ -199,7 +199,7 @@ export default class AmountInput extends React.Component< {fiatEnabled && ( diff --git a/components/BlurGradient.tsx b/components/BlurGradient.tsx new file mode 100644 index 000000000..454511d0b --- /dev/null +++ b/components/BlurGradient.tsx @@ -0,0 +1,86 @@ +import type { ReactNode } from 'react'; +import React from 'react'; +import { Dimensions } from 'react-native'; +import { Fill, Shader, Skia } from '@shopify/react-native-skia'; + +type Value = string | number; +type Values = Value[]; + +const glsl = (source: TemplateStringsArray, ...values: Values) => { + const processed = source.flatMap((s, i) => [s, values[i]]).filter(Boolean); + return processed.join(''); +}; + +const frag = (source: TemplateStringsArray, ...values: Values) => { + const code = glsl(source, ...values); + const rt = Skia.RuntimeEffect.Make(code); + if (rt === null) { + throw new Error("Couln't Compile Shader"); + } + return rt; +}; + +// https://shaders.skia.org/?id=60604463f3a8a2eb0449541c10cac16d30772b34bb76ce7058374bb02226f9c8 +// https://www.shadertoy.com/view/4lXXWn +const source = frag` +uniform shader iImage1; +uniform shader mask; +uniform float2 iResolution; + +vec3 draw(vec2 uv) { + return iImage1.eval(uv * iResolution).rgb; +} + +float grid(float var, float size) { + return floor(var*size)/size; +} + +float rand(vec2 co){ + return fract(sin(dot(co.xy ,vec2(12.9898,78.233))) * 43758.5453); +} + +const float repeats = 60; +vec4 main(vec2 fragCoord) +{ + vec2 uv = (fragCoord / iResolution); + float bluramount = mix(0, 0.1, mask.eval(fragCoord).a); + vec3 blurred_image = vec3(0.); + for (float i = 0.; i < repeats; i++) { + vec2 q = vec2( + cos(degrees((i / repeats) * 360.)), + sin(degrees((i / repeats) * 360.))) * (rand(vec2(i, uv.x + uv.y)) + bluramount); + vec2 uv2 = uv + (q * bluramount); + blurred_image += draw(uv2) / 2.; + //One more to hide the noise. + q = vec2(cos(degrees((i / repeats) * 360.)), sin(degrees((i / repeats) * 360.))) * + (rand(vec2(i + 2., uv.x + uv.y + 24.)) + bluramount); + uv2 = uv + (q * bluramount); + blurred_image += draw(uv2) / 2.; + } + blurred_image /= repeats; + return vec4(blurred_image, 1.0); +} +`; + +interface BlurGradientProps { + children: ReactNode | ReactNode[]; + mask: ReactNode; +} + +const { width, height } = Dimensions.get('window'); + +export const BlurGradient = ({ children, mask }: BlurGradientProps) => { + return ( + + + {children} + {mask} + + + ); +}; diff --git a/components/Button.tsx b/components/Button.tsx index 0d037b9b7..5c03f69eb 100644 --- a/components/Button.tsx +++ b/components/Button.tsx @@ -49,7 +49,7 @@ function Button(props: ButtonProps) { (containerStyle && containerStyle.borderColor) || themeColor('highlight'), alignSelf: 'center', - borderRadius: 30 + borderRadius: 5 } : { ...containerStyle, @@ -57,10 +57,12 @@ function Button(props: ButtonProps) { (containerStyle && containerStyle.borderColor) || themeColor('highlight'), alignSelf: 'center', - borderRadius: 30, + borderRadius: 5, width: '90%' }; + const textColor = themeColor('buttonText') || themeColor('text'); + return ( { + const image = useSVG( + 'https://upload.wikimedia.org/wikipedia/commons/f/fd/Ghostscript_Tiger.svg' + ); + return ( + + + + + + + + + + + ); +}; diff --git a/components/Header.tsx b/components/Header.tsx index 6810786cc..c120f39aa 100644 --- a/components/Header.tsx +++ b/components/Header.tsx @@ -1,11 +1,18 @@ import React from 'react'; -import { StyleProp, TextStyle, ViewStyle } from 'react-native'; +import { + StyleProp, + TextStyle, + TouchableOpacity, + ViewStyle +} from 'react-native'; import { Header, Icon, TextProps } from 'react-native-elements'; import { IconObject } from 'react-native-elements/dist/icons/Icon'; import { localeString } from '../utils/LocaleUtils'; import { themeColor } from '../utils/ThemeUtils'; +import Back from '../assets/images/SVG/Back.svg'; + interface HeaderIcon extends IconObject { icon?: string; text?: string; @@ -30,17 +37,15 @@ interface HeaderProps { function ZeusHeader(props: HeaderProps) { const BackButton = (onBack?: () => void) => ( - { if (onBack) onBack(); props.navigation.goBack(); }} - color={themeColor('text')} - underlayColor="transparent" - size={35} accessibilityLabel={localeString('general.goBack')} - /> + > + + ); const CloseButton = (onBack?: () => void) => ( diff --git a/components/HopPicker.tsx b/components/HopPicker.tsx index 4cc075194..0982e88b0 100644 --- a/components/HopPicker.tsx +++ b/components/HopPicker.tsx @@ -258,7 +258,7 @@ export default class ChannelPicker extends React.Component< const styles = StyleSheet.create({ text: { - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, field: { paddingTop: 10, diff --git a/components/KeyValue.tsx b/components/KeyValue.tsx index ec93e80c7..d9194b36e 100644 --- a/components/KeyValue.tsx +++ b/components/KeyValue.tsx @@ -68,7 +68,7 @@ export default class KeyValue extends React.Component { {sensitive ? PrivacyUtils.sensitiveValue(value) : value} diff --git a/components/LayerBalances/LightningSwipeableRow.tsx b/components/LayerBalances/LightningSwipeableRow.tsx index c46d5b4f4..401ccfcde 100644 --- a/components/LayerBalances/LightningSwipeableRow.tsx +++ b/components/LayerBalances/LightningSwipeableRow.tsx @@ -192,7 +192,7 @@ const styles = StyleSheet.create({ backgroundColor: 'transparent', paddingTop: 10, paddingHorizontal: 4, - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, action: { flex: 1, diff --git a/components/LayerBalances/OnchainSwipeableRow.tsx b/components/LayerBalances/OnchainSwipeableRow.tsx index a45dc3d36..bdf275745 100644 --- a/components/LayerBalances/OnchainSwipeableRow.tsx +++ b/components/LayerBalances/OnchainSwipeableRow.tsx @@ -191,7 +191,7 @@ const styles = StyleSheet.create({ backgroundColor: 'transparent', paddingTop: 10, paddingHorizontal: 4, - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, action: { flex: 1, diff --git a/components/LayerBalances/index.tsx b/components/LayerBalances/index.tsx index 2cfb5eedf..d6dc7e717 100644 --- a/components/LayerBalances/index.tsx +++ b/components/LayerBalances/index.tsx @@ -18,6 +18,7 @@ import { themeColor } from './../../utils/ThemeUtils'; import OnChainSvg from '../../assets/images/SVG/DynamicSVG/OnChainSvg'; import LightningSvg from '../../assets/images/SVG/DynamicSVG/LightningSvg'; +import LinearGradient from 'react-native-linear-gradient'; interface LayerBalancesProps { BalanceStore: BalanceStore; @@ -40,22 +41,28 @@ type DataRow = { const Row = ({ item }: { item: DataRow }) => ( - {item.layer === 'On-chain' ? : } {item.layer === 'Lightning' ? localeString('general.lightning') @@ -63,8 +70,12 @@ const Row = ({ item }: { item: DataRow }) => ( - - + + ); @@ -180,7 +191,7 @@ const styles = StyleSheet.create({ flexDirection: 'row', marginLeft: 15, marginRight: 15, - borderRadius: 15 + borderRadius: 50 }, left: { flexDirection: 'row', @@ -194,6 +205,6 @@ const styles = StyleSheet.create({ layerText: { backgroundColor: 'transparent', fontSize: 15, - fontFamily: 'Lato-Bold' + fontFamily: 'PPNeueMontreal-Medium' } }); diff --git a/components/Modals/InfoModal.tsx b/components/Modals/InfoModal.tsx index 726732663..4da732378 100644 --- a/components/Modals/InfoModal.tsx +++ b/components/Modals/InfoModal.tsx @@ -62,7 +62,7 @@ export default class InfoModal extends React.Component { {typeof infoModalText === 'string' && ( { { style={{ fontSize: 17, color: themeColor('text'), - fontFamily: 'Lato-Bold', + fontFamily: 'PPNeueMontreal-Medium', margin: 10 }} > @@ -83,7 +83,7 @@ const Hop = (props: any) => { style={{ fontSize: 15, color: themeColor('background'), - fontFamily: 'Lato-Bold' + fontFamily: 'PPNeueMontreal-Medium' }} > {path.length} @@ -128,7 +128,7 @@ const ExpandedHop = (props: any) => { style={{ fontSize: 15, color: themeColor('background'), - fontFamily: 'Lato-Bold' + fontFamily: 'PPNeueMontreal-Medium' }} > {`${pathIndex + 1}`} @@ -150,7 +150,7 @@ const ExpandedHop = (props: any) => { style={{ fontSize: 15, color: themeColor('highlight'), - fontFamily: 'Lato-Bold' + fontFamily: 'PPNeueMontreal-Medium' }} > {`${ diff --git a/components/Pill.tsx b/components/Pill.tsx index ed8835639..a1e01dde1 100644 --- a/components/Pill.tsx +++ b/components/Pill.tsx @@ -28,7 +28,7 @@ function Pill(props: PillProps) { {title} diff --git a/components/PinPad.tsx b/components/PinPad.tsx index 5d81d9b17..509161d12 100644 --- a/components/PinPad.tsx +++ b/components/PinPad.tsx @@ -366,7 +366,7 @@ const styles = StyleSheet.create({ marginBottom: 10 }, pinPadNumber: { - fontFamily: 'Lato-Bold' + fontFamily: 'PPNeueMontreal-Medium' }, pad: { justifyContent: 'flex-end', diff --git a/components/QRCodeScanner.tsx b/components/QRCodeScanner.tsx index 4eea9db98..8e5b8bfa0 100644 --- a/components/QRCodeScanner.tsx +++ b/components/QRCodeScanner.tsx @@ -261,7 +261,7 @@ export default class QRCodeScanner extends React.Component { { + scrollY.value = -y; + } + }); + + return ( + + + + {false && ( + + )} + + + } + > + + + + + + {props.children} + + + ); +} diff --git a/components/SuccessErrorMessage.tsx b/components/SuccessErrorMessage.tsx index b3c456b74..f94c20da5 100644 --- a/components/SuccessErrorMessage.tsx +++ b/components/SuccessErrorMessage.tsx @@ -89,7 +89,7 @@ const ErrorMessage = ({ const styles = StyleSheet.create({ field: { - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', width: '100%', top: 10, borderRadius: 6, diff --git a/components/Text.tsx b/components/Text.tsx index feb7db5fe..c41eaf85c 100644 --- a/components/Text.tsx +++ b/components/Text.tsx @@ -28,7 +28,7 @@ export default class ZeusText extends React.Component { { diff --git a/components/text/Body.tsx b/components/text/Body.tsx index f8cb4e7e7..4c2576d84 100644 --- a/components/text/Body.tsx +++ b/components/text/Body.tsx @@ -41,7 +41,10 @@ export function Body({ ? themeColor('secondaryText') : themeColor('text'), fontSize: small ? 12 : big ? 20 : jumbo ? 40 : 16, - fontFamily: bold || jumbo ? 'Lato-Bold' : 'Lato-Regular' + fontFamily: + bold || jumbo + ? 'PPNeueMontreal-Medium' + : 'PPNeueMontreal-Book' }} accessible={accessible} accessibilityLabel={accessibilityLabel} diff --git a/docs/Bounties.md b/docs/Bounties.md index 10587956f..58ce0ea69 100644 --- a/docs/Bounties.md +++ b/docs/Bounties.md @@ -1,12 +1,12 @@ # Open Bounties -The Zeus team is putting up the tasks listed below for bounty. Working code must be merged for a user to collect the bounty. To inquire about status of a bounty, to contribute to a bounty, or to proprose a new bounty please email zeusln (at) tutanota (dot) com. Thank you. +The ZEUS team is putting up the tasks listed below for bounty. Working code must be merged for a user to collect the bounty. To inquire about status of a bounty, to contribute to a bounty, or to proprose a new bounty please email zeusln (at) tutanota (dot) com. Thank you. ## Core Lightning: Commando/lnmessage connection Payout: 6,000,000 sats (0.06 BTC) -Currently, Zeus supports remote connections to Core Lightning (CLN) through c-lightning-REST and Spark. We'd like for users to connect to CLN nodes using the [Commando](https://lightning.readthedocs.io/lightning-commando.7.html) and [lnmessage](https://github.com/aaronbarnardsound/lnmessage). We've made some pretty good progress on [this branch](https://github.com/ZeusLN/zeus/compare/master...kaloudis:zeus:lnsocket) that you can use but we are having issues getting the socket to work. lnmessage has params for `socket` and `tcpSocket` that you should be able to configure and override. +Currently, ZEUS supports remote connections to Core Lightning (CLN) through c-lightning-REST and Spark. We'd like for users to connect to CLN nodes using the [Commando](https://lightning.readthedocs.io/lightning-commando.7.html) and [lnmessage](https://github.com/aaronbarnardsound/lnmessage). We've made some pretty good progress on [this branch](https://github.com/ZeusLN/zeus/compare/master...kaloudis:zeus:lnsocket) that you can use but we are having issues getting the socket to work. lnmessage has params for `socket` and `tcpSocket` that you should be able to configure and override. Additional bounty patrons: @sathoarder, Seth For Privacy, denis2342 @@ -14,7 +14,7 @@ Additional bounty patrons: @sathoarder, Seth For Privacy, denis2342 Payout: 1,500,000 sats (0.015 BTC) -Currently, the Zeus point of sale only works in tandem with the Square terminal API. We would like to expand support to Clover terminals. Check out the docs for the [Clover REST API](https://docs.clover.com/docs/making-rest-api-calls). +Currently, the ZEUS point of sale only works in tandem with the Square terminal API. We would like to expand support to Clover terminals. Check out the docs for the [Clover REST API](https://docs.clover.com/docs/making-rest-api-calls). # Claimed Bounties @@ -25,7 +25,7 @@ Author: [fiatjaf](https://github.com/fiatjaf) Payout: 1,500,000 sats (0.015 BTC) -Currently, Zeus supports remote connections to lnd, c-lightning (through c-lightning-REST and Spark), and lndhub. We'd like for users to connect to Eclair nodes using the [Eclair REST interface](https://acinq.github.io/eclair/). +Currently, ZEUS supports remote connections to lnd, c-lightning (through c-lightning-REST and Spark), and lndhub. We'd like for users to connect to Eclair nodes using the [Eclair REST interface](https://acinq.github.io/eclair/). ## Tor on Android Author: [gabidi](https://github.com/gabidi/) and [Sifir Apps](https://sifir.io/) @@ -34,7 +34,7 @@ Author: [gabidi](https://github.com/gabidi/) and [Sifir Apps](https://sifir.io/) Payout: 21,000,000 sats (0.21 BTC) -Currently, Zeus on Android requires Orbot to connect to your node over the Tor network. We'd like for users to be able to connect to their node over Tor without the use of Orbot, similar to Samourai Wallet. The user should be able to start and stop the Tor process and get a new identity if possible. +Currently, ZEUS on Android requires Orbot to connect to your node over the Tor network. We'd like for users to be able to connect to their node over Tor without the use of Orbot, similar to Samourai Wallet. The user should be able to start and stop the Tor process and get a new identity if possible. Additional bounty patrons: [Capitalist Dog](https://github.com/capitalistdog) @@ -45,7 +45,7 @@ Author: [gabidi](https://github.com/gabidi/) and [Sifir Apps](https://sifir.io/) Payout: 22,050,000 sats (0.2205 BTC) -Currently, Zeus on iOS cannot connect over Tor. Users looking to connect remotely need a VPN configuration. We'd like for users to be able to connect their node over Tor without the use of another app. The user should be able to start and stop the Tor process and get a new identity if possible. +Currently, ZEUS on iOS cannot connect over Tor. Users looking to connect remotely need a VPN configuration. We'd like for users to be able to connect their node over Tor without the use of another app. The user should be able to start and stop the Tor process and get a new identity if possible. Additional bounty patrons: [Ben Prentice](https://twitter.com/mrcoolbp), [Capitalist Dog](https://github.com/capitalistdog), anonymous @@ -65,7 +65,7 @@ Author: [pseudozach](https://github.com/pseudozach) Payout: 1,250,000 sats (0.0125 BTC) -Currently, Zeus supports lnurl-fallback, lnurl-withdraw, and lnurl-pay but not lnurl-auth or lnurl-channel. lnurl-auth will allow users to log into lnurl-auth powered sites using their lightning node. LND doesn't support it natively but it appears Breez has found a workaround - that may be a good starting point. You'll most likely have to leverage Zeus' local database. Check out the spec [here](https://github.com/fiatjaf/lnurl-rfc/blob/master/lnurl-auth.md). +Currently, ZEUS supports lnurl-fallback, lnurl-withdraw, and lnurl-pay but not lnurl-auth or lnurl-channel. lnurl-auth will allow users to log into lnurl-auth powered sites using their lightning node. LND doesn't support it natively but it appears Breez has found a workaround - that may be a good starting point. You'll most likely have to leverage ZEUS' local database. Check out the spec [here](https://github.com/fiatjaf/lnurl-rfc/blob/master/lnurl-auth.md). ## Accessibility fixes @@ -75,4 +75,4 @@ Author: [sha-256](https://github.com/sha-265) Payout: 1,000,000 sats (0.01 BTC) -The fine folks over at the Bitcoin Design Community have detailed [an issue](https://github.com/ZeusLN/zeus/issues/1442) with our accessibility problems in Zeus. +The fine folks over at the Bitcoin Design Community have detailed [an issue](https://github.com/ZeusLN/zeus/issues/1442) with our accessibility problems in ZEUS. diff --git a/ios/Podfile.lock b/ios/Podfile.lock index b15ad40d6..8d5b4419b 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -348,6 +348,10 @@ PODS: - React-Core - react-native-safe-area-context (0.6.4): - React + - react-native-skia (0.1.213): + - React + - React-callinvoker + - React-Core - react-native-tor (0.1.8): - React - react-native-udp (4.1.7): @@ -564,6 +568,7 @@ DEPENDENCIES: - react-native-randombytes (from `../node_modules/react-native-randombytes`) - react-native-restart (from `../node_modules/react-native-restart`) - react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`) + - "react-native-skia (from `../node_modules/@shopify/react-native-skia`)" - react-native-tor (from `../node_modules/react-native-tor`) - react-native-udp (from `../node_modules/react-native-udp`) - React-NativeModulesApple (from `../node_modules/react-native/ReactCommon/react/nativemodule/core/platform/ios`) @@ -684,6 +689,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native-restart" react-native-safe-area-context: :path: "../node_modules/react-native-safe-area-context" + react-native-skia: + :path: "../node_modules/@shopify/react-native-skia" react-native-tor: :path: "../node_modules/react-native-tor" react-native-udp: @@ -796,6 +803,7 @@ SPEC CHECKSUMS: react-native-randombytes: 3638d24759d67c68f6ccba60c52a7a8a8faa6a23 react-native-restart: 7595693413fe3ca15893702f2c8306c62a708162 react-native-safe-area-context: 52342d2d80ea8faadd0ffa76d83b6051f20c5329 + react-native-skia: 4327dd69d3272313b91ea753a2d6dd5d9bebba42 react-native-tor: 3b14e9160b2eb7fa3f310921b2dee71a5171e5b7 react-native-udp: df79c3cb72c4e71240cd3ce4687bfb8a137140d5 React-NativeModulesApple: 797bc6078d566eef3fb3f74127e6e1d2e945a15f diff --git a/ios/link-assets-manifest.json b/ios/link-assets-manifest.json new file mode 100644 index 000000000..77f54ca5a --- /dev/null +++ b/ios/link-assets-manifest.json @@ -0,0 +1,465 @@ +{ + "migIndex": 1, + "data": [ + { + "path": "assets/fonts/PPNeueMontreal-Medium.ttf", + "sha1": "d67fee08c79a82ce375ab9629ae5a903da8bb321" + }, + { + "path": "assets/fonts/PPNeueMontreal-Book.ttf", + "sha1": "e923c72eda5e50a87e18ff5c71e9ef4b3b6455a3" + }, + { + "path": "assets/fonts/Marlide-Display-Bold.ttf", + "sha1": "ed2c5555ef073d63910fe6f686e98867e3cde63c" + }, + { + "path": "assets/fonts/Marlide-Display.ttf", + "sha1": "04a807b744dacda4766f2f09d222cb34b86d4f5b" + }, + { + "path": "assets/images/GIF/Loading.gif", + "sha1": "b0695fc4aaa609075202bb3b732f0702f260542b" + }, + { + "path": "assets/images/GIF/Success.gif", + "sha1": "8dd99d418b8e3223ed8c8881b978aeb17f8c7ea6" + }, + { + "path": "assets/images/Launcher.png", + "sha1": "db916cdabf2cb8575e7646e26cc81ebbdc4d96d4" + }, + { + "path": "assets/images/Lottie/lightning1.json", + "sha1": "e4e9778e89455cd092b38ab91e21173bd7e7a795" + }, + { + "path": "assets/images/Lottie/lightning2.json", + "sha1": "2d001ce857a72f0e729a6a1ba5fdcd17c4ce7258" + }, + { + "path": "assets/images/Lottie/lightning3.json", + "sha1": "82aee96931c5e96d4c52ea9904b129273ac23aa7" + }, + { + "path": "assets/images/Lottie/loader.json", + "sha1": "db9db1aee58a5f3658091bf00b0b38c25c4b6999" + }, + { + "path": "assets/images/Mascot.png", + "sha1": "b4874a29eaa3aad2a857ec403a77ba9c4c5da296" + }, + { + "path": "assets/images/SPLASH copy 2.png", + "sha1": "e1f6cd5ef48885b7009712ae7d1b0a668ae9419e" + }, + { + "path": "assets/images/SPLASH copy.png", + "sha1": "7021fbab05ae61d4f7b379b87e5f51e49529befe" + }, + { + "path": "assets/images/SPLASH.png", + "sha1": "aa65f7f847a8da8ec9c054b6b376420e3e4fdd9c" + }, + { + "path": "assets/images/SVG/Add.svg", + "sha1": "b808375425fd1495b93a7f3f1a128f228956e0d8" + }, + { + "path": "assets/images/SVG/Alert.svg", + "sha1": "c5ddacf94d09e3b95717862ec269f856a98906cf" + }, + { + "path": "assets/images/SVG/Backspace.svg", + "sha1": "bbae4f69c82aaf560e135e071facc0682b70d012" + }, + { + "path": "assets/images/SVG/Bitcoin.svg", + "sha1": "86abc191b64dc5d17144c385c42d658bf934a4e0" + }, + { + "path": "assets/images/SVG/BitcoinIcon.svg", + "sha1": "0e4e16c812f7dd0095f99e167572fb3b4e5288b1" + }, + { + "path": "assets/images/SVG/Block.svg", + "sha1": "baccbd5d5913b5fbf6956cce7199a5a446104b9d" + }, + { + "path": "assets/images/SVG/Brush.svg", + "sha1": "5e4791151130cf4ec78a5093b23d07f27461dfad" + }, + { + "path": "assets/images/SVG/Caret Down.svg", + "sha1": "7874f61c1e90daca8f5c0559e95d89d3190c1853" + }, + { + "path": "assets/images/SVG/Caret Left.svg", + "sha1": "b44b478eabdef4efdd895602fb7f0cc177496220" + }, + { + "path": "assets/images/SVG/Caret Right-1.svg", + "sha1": "2833aa8ca4c92d5b7658c8aa5611696a2708a6c8" + }, + { + "path": "assets/images/SVG/Caret Right-3.svg", + "sha1": "2b78a9a3b846ea94495866e4a35c34bb46cd518f" + }, + { + "path": "assets/images/SVG/Caret Right.svg", + "sha1": "c4420cdcaddbb709987c5ae6aa55c31688d45ad8" + }, + { + "path": "assets/images/SVG/Caret Up.svg", + "sha1": "a4df241bd3151cb377b105b244f00f2a3e35cfd7" + }, + { + "path": "assets/images/SVG/Channel.svg", + "sha1": "4bacc36b25805d3c5726c79c135d7dbd9d2d9e37" + }, + { + "path": "assets/images/SVG/Channels.svg", + "sha1": "c9b401d8b683c9d8aadcfb41576c80a847b82a9a" + }, + { + "path": "assets/images/SVG/Checkmark.svg", + "sha1": "dd4277c8c5ac09d80110302ab53c562f6df6fbf1" + }, + { + "path": "assets/images/SVG/Clipboard.svg", + "sha1": "0ad18c819e47391650279bb3fb07a6d483a4c9da" + }, + { + "path": "assets/images/SVG/Clock.svg", + "sha1": "47bf29b262ea5d0fc1b83a4e32fbd31c2ecc3f2b" + }, + { + "path": "assets/images/SVG/Cloud.svg", + "sha1": "c5b2c4a9a91c7e539514159d566a785a84a2b789" + }, + { + "path": "assets/images/SVG/Coins.svg", + "sha1": "3599f2b50d0191fa130242538f15d61e20ebd1e9" + }, + { + "path": "assets/images/SVG/Contact.svg", + "sha1": "09164507bf311947980d3ae9b9a494d105502baf" + }, + { + "path": "assets/images/SVG/Copy.svg", + "sha1": "e5a7f74dcec6e11fbace65eb4d6c31f5db8dbf02" + }, + { + "path": "assets/images/SVG/Cross.svg", + "sha1": "c00a094d6852a14a30ab507e6a1009ee13d51352" + }, + { + "path": "assets/images/SVG/Currency.svg", + "sha1": "83123b0668b524f68dd8fcca5a120aa564062274" + }, + { + "path": "assets/images/SVG/Delete.svg", + "sha1": "e85cbe324ba7c6394eb955926be760d8ebb9c773" + }, + { + "path": "assets/images/SVG/Dice.svg", + "sha1": "de127e1cc3af907bf48b97b9c7c19c58a43102f0" + }, + { + "path": "assets/images/SVG/DynamicSVG/AddressSvg.tsx", + "sha1": "59a3a23aac20636a348f3dada90338db4dfe3344" + }, + { + "path": "assets/images/SVG/DynamicSVG/LightningSvg.tsx", + "sha1": "8f38594b1abd0d4877075e1621013f353180862d" + }, + { + "path": "assets/images/SVG/DynamicSVG/OnChainSvg.tsx", + "sha1": "e959c75860607b476bca2b0a9078cb3cb46eb23e" + }, + { + "path": "assets/images/SVG/DynamicSVG/ScanFrameSvg.tsx", + "sha1": "7485e1c143ccdfadb765d53dc9fc1626b251a637" + }, + { + "path": "assets/images/SVG/DynamicSVG/UnifiedSvg.tsx", + "sha1": "e61cf6ad20fb18b3919d84a47bd4db8b0ab7bc4a" + }, + { + "path": "assets/images/SVG/Edit.svg", + "sha1": "1f6acf36aa5a17040c73377b528ed5b953a48850" + }, + { + "path": "assets/images/SVG/Error.svg", + "sha1": "1bf7ab74cc3be1adca93c821e0c577374a2238de" + }, + { + "path": "assets/images/SVG/ErrorIcon.svg", + "sha1": "05da1a652815c751b35361d0433742894988be0a" + }, + { + "path": "assets/images/SVG/ExchangeBitcoin.svg", + "sha1": "ed26dc3a06b31b446d7b8d58a1446d1ff6584125" + }, + { + "path": "assets/images/SVG/ExchangeFiat.svg", + "sha1": "308dfb3ceeabeb74ead32307bdd370f41382be72" + }, + { + "path": "assets/images/SVG/Export.svg", + "sha1": "d2d30904d8d20321e0842bb5bbaabcf0f56a749d" + }, + { + "path": "assets/images/SVG/Eye Off.svg", + "sha1": "2f483794844c8460de09ee50fb42c7917572ad16" + }, + { + "path": "assets/images/SVG/Eye On.svg", + "sha1": "f73cd4fa4a5b1d681cc80f01ed6e2228e6a11cba" + }, + { + "path": "assets/images/SVG/Filter Off.svg", + "sha1": "8b03e309c5faa1a790364c103398ac314994a284" + }, + { + "path": "assets/images/SVG/Filter On.svg", + "sha1": "a431acfb7747c76b2443349619ab9a4bb79f0d31" + }, + { + "path": "assets/images/SVG/Flash Off.svg", + "sha1": "2ac9327adcc428b5aaa8ed22aba65b9620179fc2" + }, + { + "path": "assets/images/SVG/Flash On.svg", + "sha1": "3d4ad8daac2cddbd4540c67e55759e7b0f50b784" + }, + { + "path": "assets/images/SVG/Gallery.svg", + "sha1": "d412cc304689aa141f566bfd6401b7a4448453fb" + }, + { + "path": "assets/images/SVG/Globe.svg", + "sha1": "e952a3834d1ec34a7c6d0a551586136a634e6d5d" + }, + { + "path": "assets/images/SVG/Help Icon.svg", + "sha1": "0da32a38426d02ae6b42fcee6cd6537f90b5dd6d" + }, + { + "path": "assets/images/SVG/Hidden.svg", + "sha1": "f66e7f438a9407cc7d974ad3b2688a5fa8c511d2" + }, + { + "path": "assets/images/SVG/Key Security.svg", + "sha1": "10641278df5aaef43d279329d03398f8358d9a31" + }, + { + "path": "assets/images/SVG/Key.svg", + "sha1": "a5cf54329c9972768de23a95d8d817992392a243" + }, + { + "path": "assets/images/SVG/Leaving.svg", + "sha1": "99158d62a92b691277250928c33ca045ba171c14" + }, + { + "path": "assets/images/SVG/Lightning Bolt.svg", + "sha1": "ee6a28d6dfb9c981e9b2ad1eb0a8b27c0e6bb25e" + }, + { + "path": "assets/images/SVG/Lock.svg", + "sha1": "64c7a312c6ff48ce22bdb3bb9e59609bd50ef21f" + }, + { + "path": "assets/images/SVG/MailboxFlagDown.svg", + "sha1": "b2bbcf0b05a18261e9a553120f740a62e82b3871" + }, + { + "path": "assets/images/SVG/MailboxFlagUp.svg", + "sha1": "1234c0c30f2ccea138922b8d16d5e34891306e35" + }, + { + "path": "assets/images/SVG/Menu.svg", + "sha1": "08ecea9250a0a37bf85b6b521e4a036f26ff033a" + }, + { + "path": "assets/images/SVG/Mnemonic.svg", + "sha1": "9fdf0dd6fa4fa5a561bf9c15ef9ee5a554bef772" + }, + { + "path": "assets/images/SVG/NFC.svg", + "sha1": "a2dce857e44d12de95f6419c116cec062e07069a" + }, + { + "path": "assets/images/SVG/Network.svg", + "sha1": "e72d0d9a62aa40fb77487f2658cbb3028ab88e33" + }, + { + "path": "assets/images/SVG/Node Off.svg", + "sha1": "6f25ab510cf2415259a7db9ec58af7f91164694b" + }, + { + "path": "assets/images/SVG/Node On.svg", + "sha1": "48ff7f8fb7c94d8cfc218b0a3079e22e338e00f1" + }, + { + "path": "assets/images/SVG/Nostrich.svg", + "sha1": "866c5f6e9260ee90e22ea9df31258817fa27707a" + }, + { + "path": "assets/images/SVG/Olympus.svg", + "sha1": "d88863cc6fed7ac2b098ebef9373af2bc13bbd0e" + }, + { + "path": "assets/images/SVG/POS.svg", + "sha1": "5172319e19822254b87371c34e862ea4fe320b33" + }, + { + "path": "assets/images/SVG/PeersContact.svg", + "sha1": "b1afcf645adcb61c7628561a8efaa1ff1be3efc6" + }, + { + "path": "assets/images/SVG/Pen.svg", + "sha1": "0313e976f8c6c5f68210bf9884f66656bd65df99" + }, + { + "path": "assets/images/SVG/Pie.svg", + "sha1": "4aa3ce69b70c3b6c13bfc7faed578dab2bc97df3" + }, + { + "path": "assets/images/SVG/PinFilled.svg", + "sha1": "13c88dd39432c3e1bad5b587869eaa44e232c453" + }, + { + "path": "assets/images/SVG/PinHollow.svg", + "sha1": "95efff086bd2f7dba7b3f0f3588a17d64155e4fb" + }, + { + "path": "assets/images/SVG/QR.svg", + "sha1": "74cbde34da61782db454ec97da749fb7e2d096c7" + }, + { + "path": "assets/images/SVG/Question.svg", + "sha1": "e83146564d41d2ba1dde5eca1e047759f1ea1402" + }, + { + "path": "assets/images/SVG/Receive.svg", + "sha1": "3b8b7934fe17297dfe8f804ffe49ba314550d5e5" + }, + { + "path": "assets/images/SVG/Refresh.svg", + "sha1": "28d45ef696f318848142211b6f8ed952fab45fdf" + }, + { + "path": "assets/images/SVG/Routing.svg", + "sha1": "dcc0022299a0cfbdf917d675a1e382789acb2e88" + }, + { + "path": "assets/images/SVG/Save.svg", + "sha1": "0c1a0ff55c618ef676f03e1469d2e03b95c7e334" + }, + { + "path": "assets/images/SVG/Scan.svg", + "sha1": "3d7c24f875c6cc0c220a49728f11009109e8e32e" + }, + { + "path": "assets/images/SVG/Search.svg", + "sha1": "42dd718471d07ba2d16647e30cdb2592a261b7ab" + }, + { + "path": "assets/images/SVG/Send.svg", + "sha1": "c676f713fc2b7eb9f8be38bf8a66f8071ac43255" + }, + { + "path": "assets/images/SVG/Share.svg", + "sha1": "9377ff7d12976011aa61e53a7cec0e1529c251fa" + }, + { + "path": "assets/images/SVG/Skull.svg", + "sha1": "5a57cf55416a2a24a6b5a7bbd0e31b4f1ebc8731" + }, + { + "path": "assets/images/SVG/Success.svg", + "sha1": "76294dfd8e78b342f92321b79d96a3868c916302" + }, + { + "path": "assets/images/SVG/Sweep.svg", + "sha1": "54b670e961879603e958838ded5ee974d548c752" + }, + { + "path": "assets/images/SVG/Switch.svg", + "sha1": "0dbeafd08c1cc10a4f55a1aef6bb492096565b99" + }, + { + "path": "assets/images/SVG/Sync.svg", + "sha1": "5f165ef4da154e50d1b6e9d025d2ed10fa55481c" + }, + { + "path": "assets/images/SVG/Temple.svg", + "sha1": "8fbecb0af0b3274d4362dad97108119fea725eb4" + }, + { + "path": "assets/images/SVG/Verified Account.svg", + "sha1": "0c4eeceb8ce7816709647ac8d5ee370a8e5da8ad" + }, + { + "path": "assets/images/SVG/Visible.svg", + "sha1": "c8ae98f0f57fae7532a6939e4565c49d2905f0e5" + }, + { + "path": "assets/images/SVG/WORDMARK.svg", + "sha1": "3e4135caea90ab77a1a3e6c40ada89758c3b27d2" + }, + { + "path": "assets/images/SVG/Wallet.svg", + "sha1": "784c98c26959c5f15313fa88dd552eea4feacd0f" + }, + { + "path": "assets/images/SVG/Wallet2.svg", + "sha1": "27203006e06921dce9c2d754cef239cf10187e55" + }, + { + "path": "assets/images/SVG/Word Logo - no outline.svg", + "sha1": "e464c8cc57ed280aa7d1fa69b70499e32168cfd8" + }, + { + "path": "assets/images/SVG/Word Logo.svg", + "sha1": "7986cb0127380cb0222dd01ae86b787ee790fd89" + }, + { + "path": "assets/images/Untitled.png", + "sha1": "9fb18e964c88961fed7274dc648392516e2e1b16" + }, + { + "path": "assets/images/affiliates/Mempool.svg", + "sha1": "021a4b2bf1926a534169d507dccb291b2d41941b" + }, + { + "path": "assets/images/intro/1.png", + "sha1": "6b9a0d65e0d3d0586a902904792994313e18c539" + }, + { + "path": "assets/images/intro/2.png", + "sha1": "caaf76dc5a583c3ef174277bac5202ff190ac30c" + }, + { + "path": "assets/images/intro/3.png", + "sha1": "dbd40f35f191302803cb58e32521e601671791a5" + }, + { + "path": "assets/images/intro/4.png", + "sha1": "4ab92a8c0423d3472c2194cb1585fd42ed03aba2" + }, + { + "path": "assets/images/intro/splash.png", + "sha1": "c503c27ead2f63874ce878841b94f3fd6f797a88" + }, + { + "path": "assets/images/tor.png", + "sha1": "846a80b5f9b2bdfcec9f1ac86812f8b7d562993a" + }, + { + "path": "assets/images/zeus-pay.png", + "sha1": "da09f2edc838ccfb019830ac4f30c53ee8a631e5" + } + ] +} diff --git a/ios/ppneuemontreal-bold.otf b/ios/ppneuemontreal-bold.otf new file mode 100644 index 000000000..6019f6097 Binary files /dev/null and b/ios/ppneuemontreal-bold.otf differ diff --git a/ios/ppneuemontreal-book.otf b/ios/ppneuemontreal-book.otf new file mode 100644 index 000000000..113298c32 Binary files /dev/null and b/ios/ppneuemontreal-book.otf differ diff --git a/ios/ppneuemontreal-medium.otf b/ios/ppneuemontreal-medium.otf new file mode 100644 index 000000000..315ac6019 Binary files /dev/null and b/ios/ppneuemontreal-medium.otf differ diff --git a/ios/zeus.xcodeproj/project.pbxproj b/ios/zeus.xcodeproj/project.pbxproj index 2900159c6..09bd80f5b 100644 --- a/ios/zeus.xcodeproj/project.pbxproj +++ b/ios/zeus.xcodeproj/project.pbxproj @@ -9,18 +9,23 @@ /* Begin PBXBuildFile section */ 005E25528DB94022ABAFE58E /* Caret Right-3.svg in Resources */ = {isa = PBXBuildFile; fileRef = FB2BF1C8E61649A58A6E1A61 /* Caret Right-3.svg */; }; 00E356F31AD99517003FC87E /* zeusTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* zeusTests.m */; }; + 0649A4AEF26A4CEEAE114396 /* Launcher.png in Resources */ = {isa = PBXBuildFile; fileRef = E9CA42E45FF64512B2D7C632 /* Launcher.png */; }; 0A7D9EFFF994475C9E89AD34 /* Lock.svg in Resources */ = {isa = PBXBuildFile; fileRef = 65EBEDD6824B433F875FF553 /* Lock.svg */; }; 0D0C9325D9514324BC10BE73 /* Word Logo.svg in Resources */ = {isa = PBXBuildFile; fileRef = 454EDE72420A4964823DF6F2 /* Word Logo.svg */; }; + 0D6056C7AD2B42AE97EF31CA /* Mnemonic.svg in Resources */ = {isa = PBXBuildFile; fileRef = 8F39D8AB5C2348B699E16A96 /* Mnemonic.svg */; }; 0E5CAE8C45F0483BB8C8020C /* Eye On.svg in Resources */ = {isa = PBXBuildFile; fileRef = AC03A7A4319C4366A52D94FE /* Eye On.svg */; }; 0EB04476647C460EA1358028 /* Switch.svg in Resources */ = {isa = PBXBuildFile; fileRef = 647B3F8EC6A6487CB6606AD9 /* Switch.svg */; }; + 0F5FEEC1B1B74A099CDED741 /* Share.svg in Resources */ = {isa = PBXBuildFile; fileRef = 0A66F4C9560343FA99B24029 /* Share.svg */; }; 120C1A21E0566E9107515C30 /* libPods-zeus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CB2C2DBF18852D2E65ABC434 /* libPods-zeus.a */; }; - 1316C039CEF7429B88ABE9E2 /* Lato-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 025DDDDD0022456CB347E97B /* Lato-Regular.ttf */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 1D498675CD1F48BBBA31EFD4 /* Alert.svg in Resources */ = {isa = PBXBuildFile; fileRef = 1F20C8EE28BE46F6B99E5ED3 /* Alert.svg */; }; + 1E2D6C276B2449BEB48D0EFA /* Export.svg in Resources */ = {isa = PBXBuildFile; fileRef = 4A6B733324794E60B618DACE /* Export.svg */; }; 22D2AE20933A4FB8BC47A730 /* Eye Off.svg in Resources */ = {isa = PBXBuildFile; fileRef = 28FAC11AA8E5479C81BE8DDA /* Eye Off.svg */; }; + 2399885DFDAB4C90B7232496 /* lightning1.json in Resources */ = {isa = PBXBuildFile; fileRef = 44AA4B9E77FB4B7E92D6E495 /* lightning1.json */; }; + 243243DF5818489D84FBD3DA /* Search.svg in Resources */ = {isa = PBXBuildFile; fileRef = 03529F2B35584738B9EFDE77 /* Search.svg */; }; 2733AFC787DA44D3B7B5D502 /* Success.gif in Resources */ = {isa = PBXBuildFile; fileRef = DDCBB2DF7F86404A96FCE2C6 /* Success.gif */; }; 2B701B9D101047A89EC4CDB6 /* 4.png in Resources */ = {isa = PBXBuildFile; fileRef = 6F3CEE7DB9174923BAB26C47 /* 4.png */; }; 2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; @@ -36,20 +41,36 @@ 2DCD954D1E0B4F2C00145EB5 /* zeusTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* zeusTests.m */; }; 2E994829C4BA49738466EA86 /* PinFilled.svg in Resources */ = {isa = PBXBuildFile; fileRef = 01471298AE544A2F89251D67 /* PinFilled.svg */; }; 2F59AB02206B4761AB921130 /* Mempool.svg in Resources */ = {isa = PBXBuildFile; fileRef = 97D9A8F5652E4AC580E97DEF /* Mempool.svg */; }; + 338A1C5490BD4AD8A3355DDB /* Lightning Bolt.svg in Resources */ = {isa = PBXBuildFile; fileRef = 18E41ED7967D4EC7B6CCC6C4 /* Lightning Bolt.svg */; }; + 339B3FF0F9D846B7AFA96C70 /* Sync.svg in Resources */ = {isa = PBXBuildFile; fileRef = DFA342136699448EA20DE82D /* Sync.svg */; }; 364E53F72FBA457F91578D06 /* Pen.svg in Resources */ = {isa = PBXBuildFile; fileRef = A0A40034EBFA40CF87A744A6 /* Pen.svg */; }; 395880B8BA0647E3908DBD6A /* Wallet2.svg in Resources */ = {isa = PBXBuildFile; fileRef = D7E370054BBF42359E7A5112 /* Wallet2.svg */; }; + 39D956D93D0846AF909F38DA /* Add.svg in Resources */ = {isa = PBXBuildFile; fileRef = 956E2E16008F4EA0B54DF09B /* Add.svg */; }; + 3AD7EB797D8E4070B46FB7CE /* MailboxFlagDown.svg in Resources */ = {isa = PBXBuildFile; fileRef = 41B36F82E42440E0AD72FC42 /* MailboxFlagDown.svg */; }; 40ABC332E9C74327B118D50A /* QR.svg in Resources */ = {isa = PBXBuildFile; fileRef = 80E6686C049240CE9887FA2C /* QR.svg */; }; + 40C4AE0236564EDD8B689992 /* Cloud.svg in Resources */ = {isa = PBXBuildFile; fileRef = C689AF9C5EFD42E891A1FFD3 /* Cloud.svg */; }; + 4132F00F76CB488AAA77C848 /* ScanFrameSvg.tsx in Resources */ = {isa = PBXBuildFile; fileRef = AC3DB90B22364D909A09B3E0 /* ScanFrameSvg.tsx */; }; + 42261FC8680748CB8F34DD98 /* MailboxFlagUp.svg in Resources */ = {isa = PBXBuildFile; fileRef = 8E405B6CB7D64A44907B0DB0 /* MailboxFlagUp.svg */; }; 43264510AFC64A6E89EC9BDA /* Menu.svg in Resources */ = {isa = PBXBuildFile; fileRef = 226FAAEEA94A478A945F9A57 /* Menu.svg */; }; + 44DF6141999C471D9F26E104 /* zeus-pay.png in Resources */ = {isa = PBXBuildFile; fileRef = 913EA077718B4284A6998780 /* zeus-pay.png */; }; 452DE3B3EC174D45A6007ACD /* Brush.svg in Resources */ = {isa = PBXBuildFile; fileRef = 5CC0E65B8E6447A38BD1EE91 /* Brush.svg */; }; + 46E5F71A7C0C4114922F6ED0 /* LightningSvg.tsx in Resources */ = {isa = PBXBuildFile; fileRef = 84817A27B5CC4C869EA8ABF3 /* LightningSvg.tsx */; }; 47ECEA24A11A4DCFB6640276 /* Clock.svg in Resources */ = {isa = PBXBuildFile; fileRef = 0739DA7692B644DEBC3BAFFC /* Clock.svg */; }; 4EE81C6E19444556B31C4756 /* splash.png in Resources */ = {isa = PBXBuildFile; fileRef = 107D5D19C89849838D993B6C /* splash.png */; }; 5373AAA9A29A4603B7C121F6 /* Globe.svg in Resources */ = {isa = PBXBuildFile; fileRef = 058EC85AAE364CEBB5C88C12 /* Globe.svg */; }; + 5851F5898AED446FA5EF41FB /* Edit.svg in Resources */ = {isa = PBXBuildFile; fileRef = 3C817E9DD0504569B85A84F1 /* Edit.svg */; }; + 593DA4FEB1FE4C1CA721DDB1 /* Sweep.svg in Resources */ = {isa = PBXBuildFile; fileRef = 259C6F30DC5D40FF9E5DF839 /* Sweep.svg */; }; + 596BD565F15B4738AEC5F283 /* Key Security.svg in Resources */ = {isa = PBXBuildFile; fileRef = E21D3D5587114764BC296D83 /* Key Security.svg */; }; 5BC6B338F0044B6CA0D45C97 /* Help Icon.svg in Resources */ = {isa = PBXBuildFile; fileRef = 77EC666A91C04742A050DEF4 /* Help Icon.svg */; }; 5ECDD76F848B4802B0B5D3C1 /* Loading.gif in Resources */ = {isa = PBXBuildFile; fileRef = 2D6AFC110FCE4DB693ABCF13 /* Loading.gif */; }; 5ED36312F2F94778BE7418C2 /* Backspace.svg in Resources */ = {isa = PBXBuildFile; fileRef = C8B74E7F5FE74AB1B75DD331 /* Backspace.svg */; }; + 6027AA29AEA34E7290034736 /* ExchangeBitcoin.svg in Resources */ = {isa = PBXBuildFile; fileRef = B4C39762C9B748E39BFDA90F /* ExchangeBitcoin.svg */; }; + 615320DD69744BC4A8D3E80E /* Visible.svg in Resources */ = {isa = PBXBuildFile; fileRef = D27437A6874C42CDB9C5662B /* Visible.svg */; }; 659C049013BD4A618AA4275C /* Temple.svg in Resources */ = {isa = PBXBuildFile; fileRef = 259ED6E1C36A4BB38A5BFB8B /* Temple.svg */; }; 692A2B7E895144DDB6D5813C /* PeersContact.svg in Resources */ = {isa = PBXBuildFile; fileRef = 299B155651FE4C3CB3D558D1 /* PeersContact.svg */; }; 6ACB3216EC1B40A190B0A268 /* Channels.svg in Resources */ = {isa = PBXBuildFile; fileRef = 289689C09C974491A933737A /* Channels.svg */; }; + 6E1874218F2145A891E74677 /* loader.json in Resources */ = {isa = PBXBuildFile; fileRef = E30C8201B5B64E99A22BBCE0 /* loader.json */; }; + 70F9098AB09C49D6860BB45E /* Mascot.png in Resources */ = {isa = PBXBuildFile; fileRef = 9C94FFE5DB3C4080AB711D66 /* Mascot.png */; }; 745388442A54C2B6000927CE /* lightning.pb.swift in Sources */ = {isa = PBXBuildFile; fileRef = 745388382A54C2B6000927CE /* lightning.pb.swift */; }; 745388452A54C2B6000927CE /* LndMobileScheduledSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 745388392A54C2B6000927CE /* LndMobileScheduledSync.swift */; }; 745388462A54C2B6000927CE /* LndMobile.m in Sources */ = {isa = PBXBuildFile; fileRef = 7453883A2A54C2B6000927CE /* LndMobile.m */; }; @@ -60,28 +81,55 @@ 7453884B2A54C2B6000927CE /* Lnd.swift in Sources */ = {isa = PBXBuildFile; fileRef = 745388402A54C2B6000927CE /* Lnd.swift */; }; 7453884C2A54C2B6000927CE /* LndMobileTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = 745388412A54C2B6000927CE /* LndMobileTools.swift */; }; 745E06AA295CB0E500597EE8 /* Caret Down.svg in Resources */ = {isa = PBXBuildFile; fileRef = 745E06A9295CB0E500597EE8 /* Caret Down.svg */; }; + 74668A542AE3CA570023695A /* Marlide-Display.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 74668A502AE3CA570023695A /* Marlide-Display.ttf */; }; + 74668A552AE3CA570023695A /* Marlide-Display-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 74668A532AE3CA570023695A /* Marlide-Display-Bold.ttf */; }; + 74668A582AE3CBB90023695A /* Marlide-Display-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 74668A562AE3CBB90023695A /* Marlide-Display-Bold.ttf */; }; + 74668A592AE3CBB90023695A /* Marlide-Display.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 74668A572AE3CBB90023695A /* Marlide-Display.ttf */; }; 74B637822A5A350B00750202 /* LncModule.mm in Sources */ = {isa = PBXBuildFile; fileRef = 74B637792A5A350A00750202 /* LncModule.mm */; }; 74B637832A5A350B00750202 /* StreamingCallback.mm in Sources */ = {isa = PBXBuildFile; fileRef = 74B6377A2A5A350A00750202 /* StreamingCallback.mm */; }; 74B637842A5A350B00750202 /* Callback.mm in Sources */ = {isa = PBXBuildFile; fileRef = 74B6377C2A5A350A00750202 /* Callback.mm */; }; 74B637872A5A35B600750202 /* Lndmobile.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 74B637862A5A35B600750202 /* Lndmobile.xcframework */; }; + 74F9D7F22AF33324007D44BF /* ppneuemontreal-medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = 74F9D7EF2AF33324007D44BF /* ppneuemontreal-medium.otf */; }; + 7598B75F1F64426CAF420155 /* UnifiedSvg.tsx in Resources */ = {isa = PBXBuildFile; fileRef = C7FBAA85E56C4D5D92F74F11 /* UnifiedSvg.tsx */; }; + 7605A9F30F13492692B1AB4E /* Flash On.svg in Resources */ = {isa = PBXBuildFile; fileRef = DD1A9F0B9EF0475C81C53C8D /* Flash On.svg */; }; 78FB5414F55B4D94804920B7 /* Caret Right-1.svg in Resources */ = {isa = PBXBuildFile; fileRef = 34845404A9F04B35ADA34F80 /* Caret Right-1.svg */; }; + 79831EB47D6D4FFB90985E0F /* Channel.svg in Resources */ = {isa = PBXBuildFile; fileRef = 3AB032A5D2204613B50EB1AA /* Channel.svg */; }; 7C9A1A0DC41A4B56BC555750 /* Node On.svg in Resources */ = {isa = PBXBuildFile; fileRef = 62458EE70D8546B7AE7F87DF /* Node On.svg */; }; 7D5F7108F3164222AE36A242 /* Filter Off.svg in Resources */ = {isa = PBXBuildFile; fileRef = 2EC02052907E453CB15DBADA /* Filter Off.svg */; }; + 7DDC8A1B32DC415DA3A3123B /* Nostrich.svg in Resources */ = {isa = PBXBuildFile; fileRef = A7D097DE19314D50ABD77607 /* Nostrich.svg */; }; 824E335CCF474E769966E342 /* Routing.svg in Resources */ = {isa = PBXBuildFile; fileRef = B36D434AE9B14EE7AD5E6BCE /* Routing.svg */; }; 830A2C4CEE3F4349832AC893 /* Success.svg in Resources */ = {isa = PBXBuildFile; fileRef = DAB0850D6CA542288A565578 /* Success.svg */; }; + 84DD7E2C561F444780607E4E /* Olympus.svg in Resources */ = {isa = PBXBuildFile; fileRef = C3D9B9B4D130410A8B146CE4 /* Olympus.svg */; }; 85477FC6256D5D3400A4EAD1 /* dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85477FC5256D5D3400A4EAD1 /* dummy.swift */; }; 85477FC7256D5D3400A4EAD1 /* dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 85477FC5256D5D3400A4EAD1 /* dummy.swift */; }; 8F14873EE5A54A2EBEC7D0A3 /* Checkmark.svg in Resources */ = {isa = PBXBuildFile; fileRef = F049B384F839491FBB33BBA4 /* Checkmark.svg */; }; + 92542E72F705458EBD582CC8 /* BitcoinIcon.svg in Resources */ = {isa = PBXBuildFile; fileRef = 3BD89BEBA89A4B678A29E094 /* BitcoinIcon.svg */; }; + 93C795DB3CDC46D8862C3393 /* ExchangeFiat.svg in Resources */ = {isa = PBXBuildFile; fileRef = 6C81853A9EA0452B9999E58D /* ExchangeFiat.svg */; }; 97D6EBB726C487DC002ADC8C /* ioslauncher.png in Resources */ = {isa = PBXBuildFile; fileRef = 97D6EB5926C47CF5002ADC8C /* ioslauncher.png */; }; + 9A4C556D9C324870BE6E441F /* lightning3.json in Resources */ = {isa = PBXBuildFile; fileRef = D7C5B50BC6594569B19AE135 /* lightning3.json */; }; + 9A72311BC6F347239EB6AFAA /* lightning2.json in Resources */ = {isa = PBXBuildFile; fileRef = 6971DB04094F4130B4741426 /* lightning2.json */; }; 9A781A49AA6E411DA6371028 /* Delete.svg in Resources */ = {isa = PBXBuildFile; fileRef = 67621A6F1F0042C7ACE3E84F /* Delete.svg */; }; + 9E2B346F72A34EA3807BC843 /* Copy.svg in Resources */ = {isa = PBXBuildFile; fileRef = 7ABECF711E9D4F5AB912E1C0 /* Copy.svg */; }; A09AF727D5F84779808B2B53 /* Receive.svg in Resources */ = {isa = PBXBuildFile; fileRef = EF00F35A868F4C26B9288D74 /* Receive.svg */; }; A2AAB31AF9804954A6AD6625 /* Node Off.svg in Resources */ = {isa = PBXBuildFile; fileRef = 8046E6CEF39C45D4A0731EBA /* Node Off.svg */; }; + A52E1E9CF5CE42EA9F808362 /* OnChainSvg.tsx in Resources */ = {isa = PBXBuildFile; fileRef = A3B07984672041189059C4E0 /* OnChainSvg.tsx */; }; A79D6320396A4D6AA420E33C /* Send.svg in Resources */ = {isa = PBXBuildFile; fileRef = 095808991E764378BE2D3052 /* Send.svg */; }; + AD4FA10D0AD74C48A492F993 /* Network.svg in Resources */ = {isa = PBXBuildFile; fileRef = 788BB1C90868496CA6F03853 /* Network.svg */; }; + AE22239BC4074BADBFCAA228 /* Key.svg in Resources */ = {isa = PBXBuildFile; fileRef = 1D960E4F840145B3BB114CC5 /* Key.svg */; }; + B20A92EA4E82493CB6D1A2F0 /* NFC.svg in Resources */ = {isa = PBXBuildFile; fileRef = 3C37D42473A54AD981B549B4 /* NFC.svg */; }; + B7B3D0A8E3C8499892224242 /* Block.svg in Resources */ = {isa = PBXBuildFile; fileRef = B10811B91C8044358B7EBE82 /* Block.svg */; }; + B8067346D38044A7B3100972 /* Verified Account.svg in Resources */ = {isa = PBXBuildFile; fileRef = 8F531F57A66C4D86B3D226D7 /* Verified Account.svg */; }; + B82926F8C93A40B38A3F7B1C /* Gallery.svg in Resources */ = {isa = PBXBuildFile; fileRef = 34F2E3639E1D4C878EA1CC22 /* Gallery.svg */; }; BC43A928A3C3466390D20200 /* Pie.svg in Resources */ = {isa = PBXBuildFile; fileRef = 662F3CE13986425FAECE00A8 /* Pie.svg */; }; BC7117BDDCFB483CB2345DDB /* Bitcoin.svg in Resources */ = {isa = PBXBuildFile; fileRef = 291FF6091426421DB569BEC4 /* Bitcoin.svg */; }; + BECCE8BEED334E9E86730C95 /* AddressSvg.tsx in Resources */ = {isa = PBXBuildFile; fileRef = 7E518DD5239E4B02AD264302 /* AddressSvg.tsx */; }; BFEB12685B664218922995B1 /* Scan.svg in Resources */ = {isa = PBXBuildFile; fileRef = 29E002EDCBDC4FB59A29BA2E /* Scan.svg */; }; + C192B71058804DFF8F1EAE88 /* Hidden.svg in Resources */ = {isa = PBXBuildFile; fileRef = 565C3A5DD94B417EB83A30FE /* Hidden.svg */; }; + C617C53C9731441DB9E9E8DD /* POS.svg in Resources */ = {isa = PBXBuildFile; fileRef = 3814F0A0F1A84AD1AFD7C587 /* POS.svg */; }; C941FD1729484DBB8E375B20 /* 3.png in Resources */ = {isa = PBXBuildFile; fileRef = DEE698AC647848D9B6DB13F6 /* 3.png */; }; CAB3D33C810A481CBDB5D3FE /* 2.png in Resources */ = {isa = PBXBuildFile; fileRef = 794C8E7556B54F62BEAD1975 /* 2.png */; }; + CD17533A6E834DC3982FD216 /* Clipboard.svg in Resources */ = {isa = PBXBuildFile; fileRef = E475512AC9944749B58EEAC1 /* Clipboard.svg */; }; + CDAF6A80899D4DF981EE8632 /* Flash Off.svg in Resources */ = {isa = PBXBuildFile; fileRef = 8A37760CFE5741E3AD73A485 /* Flash Off.svg */; }; D0057DE9933649AF87CE361C /* Cross.svg in Resources */ = {isa = PBXBuildFile; fileRef = BA49AD114EF94750B63C2C94 /* Cross.svg */; }; D1EBD1023E904A66B05DEE97 /* Contact.svg in Resources */ = {isa = PBXBuildFile; fileRef = C2058B1AED6D4B97A6650200 /* Contact.svg */; }; D1F6E94001C348F4BF7300D7 /* Caret Right.svg in Resources */ = {isa = PBXBuildFile; fileRef = 89366F98367041A3AD6768BD /* Caret Right.svg */; }; @@ -91,16 +139,21 @@ D568F3B438EB4A808C0FDF80 /* Currency.svg in Resources */ = {isa = PBXBuildFile; fileRef = 8E58364B7EB64F938378D743 /* Currency.svg */; }; D66A263DF39F48088A0F8784 /* tor.png in Resources */ = {isa = PBXBuildFile; fileRef = C79E350A2A9640088B2E0231 /* tor.png */; }; D939E2C93F2B4F279F9923FD /* 1.png in Resources */ = {isa = PBXBuildFile; fileRef = F2D9FC1C959D40C29AA07FD5 /* 1.png */; }; + DC6A3F2DC6F943708353E330 /* Leaving.svg in Resources */ = {isa = PBXBuildFile; fileRef = 3D193586DE804DF89F2C9EC4 /* Leaving.svg */; }; DECF80F7FBFA4D17BB0238D9 /* ErrorIcon.svg in Resources */ = {isa = PBXBuildFile; fileRef = B23A03CFAFEF40D790A7B4E6 /* ErrorIcon.svg */; }; DEFE5B1336674812BAE3E366 /* Coins.svg in Resources */ = {isa = PBXBuildFile; fileRef = 8F0CAEBF09CC44E0A55DFB2A /* Coins.svg */; }; E248E368B08141929FF4B67F /* Caret Up.svg in Resources */ = {isa = PBXBuildFile; fileRef = F3F9827E17844DA7AC951B88 /* Caret Up.svg */; }; - E24CC9BAF7FF4BA6BCC7F17B /* Lato-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C099E154C6C8479188E39851 /* Lato-Bold.ttf */; }; + E2A87233B6EE487090D3FE9F /* Untitled.png in Resources */ = {isa = PBXBuildFile; fileRef = 5BF5971FD22D4660A5240C68 /* Untitled.png */; }; E457D12FB1D26D19F91B52B9 /* libPods-zeus-zeusTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C9B32E9846A8346A32A3BDC6 /* libPods-zeus-zeusTests.a */; }; E493C650358D49E193BC19D8 /* PinHollow.svg in Resources */ = {isa = PBXBuildFile; fileRef = AA4B9185A0E64EC68F5F0628 /* PinHollow.svg */; }; + E691022067D14B198BFF83DB /* Dice.svg in Resources */ = {isa = PBXBuildFile; fileRef = CE4931FF962B4189AC3F3EEB /* Dice.svg */; }; ECAC6EABDA3B4277AE5D6B7C /* Word Logo - no outline.svg in Resources */ = {isa = PBXBuildFile; fileRef = 904B772D015A42D58EF60A9A /* Word Logo - no outline.svg */; }; ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; }; + EE7264005C294AE58E30C834 /* Error.svg in Resources */ = {isa = PBXBuildFile; fileRef = DD470243A7FC45D882EF1B0D /* Error.svg */; }; + F15BCD255F194C84973AB51D /* Skull.svg in Resources */ = {isa = PBXBuildFile; fileRef = B813A99762CC4756A18E0C20 /* Skull.svg */; }; F64C923F939245A284E8D5E2 /* Refresh.svg in Resources */ = {isa = PBXBuildFile; fileRef = 58468A869AB24054A313D38E /* Refresh.svg */; }; F6BA97FE98FB4D8890855BEC /* Wallet.svg in Resources */ = {isa = PBXBuildFile; fileRef = CCFEAC399BB842A091ADB042 /* Wallet.svg */; }; + F9767258AD2F4256A0668218 /* Save.svg in Resources */ = {isa = PBXBuildFile; fileRef = 6934A0BCDAD94002BA8F840A /* Save.svg */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -284,11 +337,12 @@ 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* zeusTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = zeusTests.m; sourceTree = ""; }; 01471298AE544A2F89251D67 /* PinFilled.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = PinFilled.svg; path = ../assets/images/SVG/PinFilled.svg; sourceTree = ""; }; - 025DDDDD0022456CB347E97B /* Lato-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Lato-Regular.ttf"; path = "../assets/fonts/Lato-Regular.ttf"; sourceTree = ""; }; + 03529F2B35584738B9EFDE77 /* Search.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Search.svg; path = ../assets/images/SVG/Search.svg; sourceTree = ""; }; 04FCBC4A7845073E39FACA73 /* Pods-zeus.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-zeus.release.xcconfig"; path = "Target Support Files/Pods-zeus/Pods-zeus.release.xcconfig"; sourceTree = ""; }; 058EC85AAE364CEBB5C88C12 /* Globe.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Globe.svg; path = ../assets/images/SVG/Globe.svg; sourceTree = ""; }; 0739DA7692B644DEBC3BAFFC /* Clock.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Clock.svg; path = ../assets/images/SVG/Clock.svg; sourceTree = ""; }; 095808991E764378BE2D3052 /* Send.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Send.svg; path = ../assets/images/SVG/Send.svg; sourceTree = ""; }; + 0A66F4C9560343FA99B24029 /* Share.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Share.svg; path = ../assets/images/SVG/Share.svg; sourceTree = ""; }; 0DB55EB3FF0F9245280FEA6C /* Pods-zeus-zeusTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-zeus-zeusTests.release.xcconfig"; path = "Target Support Files/Pods-zeus-zeusTests/Pods-zeus-zeusTests.release.xcconfig"; sourceTree = ""; }; 107D5D19C89849838D993B6C /* splash.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = splash.png; path = ../assets/images/intro/splash.png; sourceTree = ""; }; 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = ""; }; @@ -302,10 +356,13 @@ 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = zeus/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = zeus/main.m; sourceTree = ""; }; 18B00F64CC5A4074AB595A5C /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = ""; }; + 18E41ED7967D4EC7B6CCC6C4 /* Lightning Bolt.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Lightning Bolt.svg"; path = "../assets/images/SVG/Lightning Bolt.svg"; sourceTree = ""; }; 19F1DF8577E64E24B856F202 /* Question.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Question.svg; path = ../assets/images/SVG/Question.svg; sourceTree = ""; }; 1AD743129802428BA25522C5 /* libReactNativePermissions.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libReactNativePermissions.a; sourceTree = ""; }; + 1D960E4F840145B3BB114CC5 /* Key.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Key.svg; path = ../assets/images/SVG/Key.svg; sourceTree = ""; }; 1F20C8EE28BE46F6B99E5ED3 /* Alert.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Alert.svg; path = ../assets/images/SVG/Alert.svg; sourceTree = ""; }; 226FAAEEA94A478A945F9A57 /* Menu.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Menu.svg; path = ../assets/images/SVG/Menu.svg; sourceTree = ""; }; + 259C6F30DC5D40FF9E5DF839 /* Sweep.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Sweep.svg; path = ../assets/images/SVG/Sweep.svg; sourceTree = ""; }; 259ED6E1C36A4BB38A5BFB8B /* Temple.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Temple.svg; path = ../assets/images/SVG/Temple.svg; sourceTree = ""; }; 289689C09C974491A933737A /* Channels.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Channels.svg; path = ../assets/images/SVG/Channels.svg; sourceTree = ""; }; 28FAC11AA8E5479C81BE8DDA /* Eye Off.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Eye Off.svg"; path = "../assets/images/SVG/Eye Off.svg"; sourceTree = ""; }; @@ -319,12 +376,24 @@ 2D6AFC110FCE4DB693ABCF13 /* Loading.gif */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Loading.gif; path = ../assets/images/GIF/Loading.gif; sourceTree = ""; }; 2EC02052907E453CB15DBADA /* Filter Off.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Filter Off.svg"; path = "../assets/images/SVG/Filter Off.svg"; sourceTree = ""; }; 34845404A9F04B35ADA34F80 /* Caret Right-1.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Caret Right-1.svg"; path = "../assets/images/SVG/Caret Right-1.svg"; sourceTree = ""; }; + 34F2E3639E1D4C878EA1CC22 /* Gallery.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Gallery.svg; path = ../assets/images/SVG/Gallery.svg; sourceTree = ""; }; + 3814F0A0F1A84AD1AFD7C587 /* POS.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = POS.svg; path = ../assets/images/SVG/POS.svg; sourceTree = ""; }; + 3AB032A5D2204613B50EB1AA /* Channel.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Channel.svg; path = ../assets/images/SVG/Channel.svg; sourceTree = ""; }; + 3BD89BEBA89A4B678A29E094 /* BitcoinIcon.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = BitcoinIcon.svg; path = ../assets/images/SVG/BitcoinIcon.svg; sourceTree = ""; }; + 3C37D42473A54AD981B549B4 /* NFC.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = NFC.svg; path = ../assets/images/SVG/NFC.svg; sourceTree = ""; }; + 3C817E9DD0504569B85A84F1 /* Edit.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Edit.svg; path = ../assets/images/SVG/Edit.svg; sourceTree = ""; }; + 3D193586DE804DF89F2C9EC4 /* Leaving.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Leaving.svg; path = ../assets/images/SVG/Leaving.svg; sourceTree = ""; }; + 41B36F82E42440E0AD72FC42 /* MailboxFlagDown.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MailboxFlagDown.svg; path = ../assets/images/SVG/MailboxFlagDown.svg; sourceTree = ""; }; + 44AA4B9E77FB4B7E92D6E495 /* lightning1.json */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = lightning1.json; path = ../assets/images/Lottie/lightning1.json; sourceTree = ""; }; 454EDE72420A4964823DF6F2 /* Word Logo.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Word Logo.svg"; path = "../assets/images/SVG/Word Logo.svg"; sourceTree = ""; }; 49BD28A15F4B4FECA6EE0CDE /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; }; + 4A6B733324794E60B618DACE /* Export.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Export.svg; path = ../assets/images/SVG/Export.svg; sourceTree = ""; }; 4C8C38BFCA8A45C99AA6FF28 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; }; 4D6C56355DAE4697AB55E762 /* Feather.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = ""; }; + 565C3A5DD94B417EB83A30FE /* Hidden.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Hidden.svg; path = ../assets/images/SVG/Hidden.svg; sourceTree = ""; }; 571E23F345EB49B99F8150D2 /* Caret Left.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Caret Left.svg"; path = "../assets/images/SVG/Caret Left.svg"; sourceTree = ""; }; 58468A869AB24054A313D38E /* Refresh.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Refresh.svg; path = ../assets/images/SVG/Refresh.svg; sourceTree = ""; }; + 5BF5971FD22D4660A5240C68 /* Untitled.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Untitled.png; path = ../assets/images/Untitled.png; sourceTree = ""; }; 5CC0E65B8E6447A38BD1EE91 /* Brush.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Brush.svg; path = ../assets/images/SVG/Brush.svg; sourceTree = ""; }; 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; }; 62458EE70D8546B7AE7F87DF /* Node On.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Node On.svg"; path = "../assets/images/SVG/Node On.svg"; sourceTree = ""; }; @@ -332,6 +401,9 @@ 65EBEDD6824B433F875FF553 /* Lock.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Lock.svg; path = ../assets/images/SVG/Lock.svg; sourceTree = ""; }; 662F3CE13986425FAECE00A8 /* Pie.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Pie.svg; path = ../assets/images/SVG/Pie.svg; sourceTree = ""; }; 67621A6F1F0042C7ACE3E84F /* Delete.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Delete.svg; path = ../assets/images/SVG/Delete.svg; sourceTree = ""; }; + 6934A0BCDAD94002BA8F840A /* Save.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Save.svg; path = ../assets/images/SVG/Save.svg; sourceTree = ""; }; + 6971DB04094F4130B4741426 /* lightning2.json */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = lightning2.json; path = ../assets/images/Lottie/lightning2.json; sourceTree = ""; }; + 6C81853A9EA0452B9999E58D /* ExchangeFiat.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = ExchangeFiat.svg; path = ../assets/images/SVG/ExchangeFiat.svg; sourceTree = ""; }; 6EA51D451E9C4637BBA7ADDB /* Fontisto.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Fontisto.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf"; sourceTree = ""; }; 6F3CEE7DB9174923BAB26C47 /* 4.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = 4.png; path = ../assets/images/intro/4.png; sourceTree = ""; }; 6F7490ECB1F7403FB5236410 /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Solid.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = ""; }; @@ -347,6 +419,10 @@ 745388402A54C2B6000927CE /* Lnd.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Lnd.swift; sourceTree = ""; }; 745388412A54C2B6000927CE /* LndMobileTools.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LndMobileTools.swift; sourceTree = ""; }; 745E06A9295CB0E500597EE8 /* Caret Down.svg */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "Caret Down.svg"; path = "../assets/images/SVG/Caret Down.svg"; sourceTree = ""; }; + 74668A502AE3CA570023695A /* Marlide-Display.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Marlide-Display.ttf"; path = "../../../assets/fonts/Marlide-Display.ttf"; sourceTree = ""; }; + 74668A532AE3CA570023695A /* Marlide-Display-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Marlide-Display-Bold.ttf"; path = "../../../assets/fonts/Marlide-Display-Bold.ttf"; sourceTree = ""; }; + 74668A562AE3CBB90023695A /* Marlide-Display-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Marlide-Display-Bold.ttf"; path = "../assets/fonts/Marlide-Display-Bold.ttf"; sourceTree = ""; }; + 74668A572AE3CBB90023695A /* Marlide-Display.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Marlide-Display.ttf"; path = "../assets/fonts/Marlide-Display.ttf"; sourceTree = ""; }; 74A116702A55DEE600F7078C /* libresolv.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libresolv.tbd; path = usr/lib/libresolv.tbd; sourceTree = SDKROOT; }; 74B637792A5A350A00750202 /* LncModule.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = LncModule.mm; sourceTree = ""; }; 74B6377A2A5A350A00750202 /* StreamingCallback.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = StreamingCallback.mm; sourceTree = ""; }; @@ -355,19 +431,31 @@ 74B6377E2A5A350A00750202 /* Callback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Callback.h; sourceTree = ""; }; 74B6377F2A5A350A00750202 /* LncModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LncModule.h; sourceTree = ""; }; 74B637862A5A35B600750202 /* Lndmobile.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Lndmobile.xcframework; path = LncMobile/Lndmobile.xcframework; sourceTree = ""; }; + 74F9D7E92AF33137007D44BF /* ppneuemontreal-medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ppneuemontreal-medium.otf"; path = "../../../../../ZeusLN/zeus/assets/fonts/ppneuemontreal-medium.otf"; sourceTree = ""; }; + 74F9D7EF2AF33324007D44BF /* ppneuemontreal-medium.otf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "ppneuemontreal-medium.otf"; path = "../../../ZeusLN/zeus/assets/fonts/ppneuemontreal-medium.otf"; sourceTree = ""; }; 77EC666A91C04742A050DEF4 /* Help Icon.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Help Icon.svg"; path = "../assets/images/SVG/Help Icon.svg"; sourceTree = ""; }; + 788BB1C90868496CA6F03853 /* Network.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Network.svg; path = ../assets/images/SVG/Network.svg; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 794C8E7556B54F62BEAD1975 /* 2.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = 2.png; path = ../assets/images/intro/2.png; sourceTree = ""; }; + 7ABECF711E9D4F5AB912E1C0 /* Copy.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Copy.svg; path = ../assets/images/SVG/Copy.svg; sourceTree = ""; }; + 7E518DD5239E4B02AD264302 /* AddressSvg.tsx */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = AddressSvg.tsx; path = ../assets/images/SVG/DynamicSVG/AddressSvg.tsx; sourceTree = ""; }; 7FE4DFA6CD064723B106677B /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; }; 8046E6CEF39C45D4A0731EBA /* Node Off.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Node Off.svg"; path = "../assets/images/SVG/Node Off.svg"; sourceTree = ""; }; 80E6686C049240CE9887FA2C /* QR.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = QR.svg; path = ../assets/images/SVG/QR.svg; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; + 84817A27B5CC4C869EA8ABF3 /* LightningSvg.tsx */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = LightningSvg.tsx; path = ../assets/images/SVG/DynamicSVG/LightningSvg.tsx; sourceTree = ""; }; 85477FC3256D5D3400A4EAD1 /* zeus-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "zeus-Bridging-Header.h"; sourceTree = ""; }; 85477FC5256D5D3400A4EAD1 /* dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = dummy.swift; sourceTree = ""; }; 89366F98367041A3AD6768BD /* Caret Right.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Caret Right.svg"; path = "../assets/images/SVG/Caret Right.svg"; sourceTree = ""; }; + 8A37760CFE5741E3AD73A485 /* Flash Off.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Flash Off.svg"; path = "../assets/images/SVG/Flash Off.svg"; sourceTree = ""; }; + 8E405B6CB7D64A44907B0DB0 /* MailboxFlagUp.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MailboxFlagUp.svg; path = ../assets/images/SVG/MailboxFlagUp.svg; sourceTree = ""; }; 8E58364B7EB64F938378D743 /* Currency.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Currency.svg; path = ../assets/images/SVG/Currency.svg; sourceTree = ""; }; 8F0CAEBF09CC44E0A55DFB2A /* Coins.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Coins.svg; path = ../assets/images/SVG/Coins.svg; sourceTree = ""; }; + 8F39D8AB5C2348B699E16A96 /* Mnemonic.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Mnemonic.svg; path = ../assets/images/SVG/Mnemonic.svg; sourceTree = ""; }; + 8F531F57A66C4D86B3D226D7 /* Verified Account.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Verified Account.svg"; path = "../assets/images/SVG/Verified Account.svg"; sourceTree = ""; }; 904B772D015A42D58EF60A9A /* Word Logo - no outline.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Word Logo - no outline.svg"; path = "../assets/images/SVG/Word Logo - no outline.svg"; sourceTree = ""; }; + 913EA077718B4284A6998780 /* zeus-pay.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "zeus-pay.png"; path = "../assets/images/zeus-pay.png"; sourceTree = ""; }; + 956E2E16008F4EA0B54DF09B /* Add.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Add.svg; path = ../assets/images/SVG/Add.svg; sourceTree = ""; }; 970050862460D71500AA6E33 /* RNRandomBytes.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNRandomBytes.xcodeproj; path = "../node_modules/react-native-randombytes/RNRandomBytes.xcodeproj"; sourceTree = ""; }; 97D6EB5926C47CF5002ADC8C /* ioslauncher.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ioslauncher.png; sourceTree = ""; }; 97D9A8F5652E4AC580E97DEF /* Mempool.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Mempool.svg; path = ../assets/images/affiliates/Mempool.svg; sourceTree = ""; }; @@ -387,33 +475,52 @@ 97F6D47622054E640030F13B /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = SimpleLineIcons.ttf; sourceTree = ""; }; 97F6D47722054E640030F13B /* MaterialIcons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = MaterialIcons.ttf; sourceTree = ""; }; 9888056290564C60BD300E91 /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; }; + 9C94FFE5DB3C4080AB711D66 /* Mascot.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Mascot.png; path = ../assets/images/Mascot.png; sourceTree = ""; }; 9D7BECF54A9B4DA78AF0F25F /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = ""; }; A0A40034EBFA40CF87A744A6 /* Pen.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Pen.svg; path = ../assets/images/SVG/Pen.svg; sourceTree = ""; }; + A3B07984672041189059C4E0 /* OnChainSvg.tsx */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = OnChainSvg.tsx; path = ../assets/images/SVG/DynamicSVG/OnChainSvg.tsx; sourceTree = ""; }; A5BC3ADC78784B888F34B25B /* libRNCamera.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNCamera.a; sourceTree = ""; }; + A7D097DE19314D50ABD77607 /* Nostrich.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Nostrich.svg; path = ../assets/images/SVG/Nostrich.svg; sourceTree = ""; }; AA4B9185A0E64EC68F5F0628 /* PinHollow.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = PinHollow.svg; path = ../assets/images/SVG/PinHollow.svg; sourceTree = ""; }; AC03A7A4319C4366A52D94FE /* Eye On.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Eye On.svg"; path = "../assets/images/SVG/Eye On.svg"; sourceTree = ""; }; + AC3DB90B22364D909A09B3E0 /* ScanFrameSvg.tsx */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = ScanFrameSvg.tsx; path = ../assets/images/SVG/DynamicSVG/ScanFrameSvg.tsx; sourceTree = ""; }; ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = ""; }; + B10811B91C8044358B7EBE82 /* Block.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Block.svg; path = ../assets/images/SVG/Block.svg; sourceTree = ""; }; B23A03CFAFEF40D790A7B4E6 /* ErrorIcon.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = ErrorIcon.svg; path = ../assets/images/SVG/ErrorIcon.svg; sourceTree = ""; }; B36D434AE9B14EE7AD5E6BCE /* Routing.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Routing.svg; path = ../assets/images/SVG/Routing.svg; sourceTree = ""; }; + B4C39762C9B748E39BFDA90F /* ExchangeBitcoin.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = ExchangeBitcoin.svg; path = ../assets/images/SVG/ExchangeBitcoin.svg; sourceTree = ""; }; + B813A99762CC4756A18E0C20 /* Skull.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Skull.svg; path = ../assets/images/SVG/Skull.svg; sourceTree = ""; }; BA49AD114EF94750B63C2C94 /* Cross.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Cross.svg; path = ../assets/images/SVG/Cross.svg; sourceTree = ""; }; BB0EF52AEE1F4724A178B73A /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; }; - C099E154C6C8479188E39851 /* Lato-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Lato-Bold.ttf"; path = "../assets/fonts/Lato-Bold.ttf"; sourceTree = ""; }; C2058B1AED6D4B97A6650200 /* Contact.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Contact.svg; path = ../assets/images/SVG/Contact.svg; sourceTree = ""; }; + C3D9B9B4D130410A8B146CE4 /* Olympus.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Olympus.svg; path = ../assets/images/SVG/Olympus.svg; sourceTree = ""; }; C44BB3F9DBFD465EBEEED83E /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = ""; }; + C689AF9C5EFD42E891A1FFD3 /* Cloud.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Cloud.svg; path = ../assets/images/SVG/Cloud.svg; sourceTree = ""; }; C79E350A2A9640088B2E0231 /* tor.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = tor.png; path = ../assets/images/tor.png; sourceTree = ""; }; + C7FBAA85E56C4D5D92F74F11 /* UnifiedSvg.tsx */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = UnifiedSvg.tsx; path = ../assets/images/SVG/DynamicSVG/UnifiedSvg.tsx; sourceTree = ""; }; C8B74E7F5FE74AB1B75DD331 /* Backspace.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Backspace.svg; path = ../assets/images/SVG/Backspace.svg; sourceTree = ""; }; C9B32E9846A8346A32A3BDC6 /* libPods-zeus-zeusTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-zeus-zeusTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; CB2C2DBF18852D2E65ABC434 /* libPods-zeus.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-zeus.a"; sourceTree = BUILT_PRODUCTS_DIR; }; CBA0591D71884F909710032D /* Filter On.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Filter On.svg"; path = "../assets/images/SVG/Filter On.svg"; sourceTree = ""; }; CCFEAC399BB842A091ADB042 /* Wallet.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Wallet.svg; path = ../assets/images/SVG/Wallet.svg; sourceTree = ""; }; CDEDFA98A11BF239AB39E264 /* Pods-zeus.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-zeus.debug.xcconfig"; path = "Target Support Files/Pods-zeus/Pods-zeus.debug.xcconfig"; sourceTree = ""; }; + CE4931FF962B4189AC3F3EEB /* Dice.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Dice.svg; path = ../assets/images/SVG/Dice.svg; sourceTree = ""; }; CE60F60AE34649628EB4D675 /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Regular.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = ""; }; + D27437A6874C42CDB9C5662B /* Visible.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Visible.svg; path = ../assets/images/SVG/Visible.svg; sourceTree = ""; }; D2F679C59D7B4D258A382330 /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Brands.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = ""; }; + D7C5B50BC6594569B19AE135 /* lightning3.json */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = lightning3.json; path = ../assets/images/Lottie/lightning3.json; sourceTree = ""; }; D7D27BFD5D11478D80A6F85E /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; }; D7E370054BBF42359E7A5112 /* Wallet2.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Wallet2.svg; path = ../assets/images/SVG/Wallet2.svg; sourceTree = ""; }; DAB0850D6CA542288A565578 /* Success.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Success.svg; path = ../assets/images/SVG/Success.svg; sourceTree = ""; }; + DD1A9F0B9EF0475C81C53C8D /* Flash On.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Flash On.svg"; path = "../assets/images/SVG/Flash On.svg"; sourceTree = ""; }; + DD470243A7FC45D882EF1B0D /* Error.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Error.svg; path = ../assets/images/SVG/Error.svg; sourceTree = ""; }; DDCBB2DF7F86404A96FCE2C6 /* Success.gif */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Success.gif; path = ../assets/images/GIF/Success.gif; sourceTree = ""; }; DEE698AC647848D9B6DB13F6 /* 3.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = 3.png; path = ../assets/images/intro/3.png; sourceTree = ""; }; + DFA342136699448EA20DE82D /* Sync.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Sync.svg; path = ../assets/images/SVG/Sync.svg; sourceTree = ""; }; + E21D3D5587114764BC296D83 /* Key Security.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Key Security.svg"; path = "../assets/images/SVG/Key Security.svg"; sourceTree = ""; }; + E30C8201B5B64E99A22BBCE0 /* loader.json */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = loader.json; path = ../assets/images/Lottie/loader.json; sourceTree = ""; }; + E475512AC9944749B58EEAC1 /* Clipboard.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Clipboard.svg; path = ../assets/images/SVG/Clipboard.svg; sourceTree = ""; }; + E9CA42E45FF64512B2D7C632 /* Launcher.png */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Launcher.png; path = ../assets/images/Launcher.png; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; EF00F35A868F4C26B9288D74 /* Receive.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Receive.svg; path = ../assets/images/SVG/Receive.svg; sourceTree = ""; }; F049B384F839491FBB33BBA4 /* Checkmark.svg */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Checkmark.svg; path = ../assets/images/SVG/Checkmark.svg; sourceTree = ""; }; @@ -707,6 +814,9 @@ 97F6D46822054E640030F13B /* Fonts */ = { isa = PBXGroup; children = ( + 74F9D7E92AF33137007D44BF /* ppneuemontreal-medium.otf */, + 74668A532AE3CA570023695A /* Marlide-Display-Bold.ttf */, + 74668A502AE3CA570023695A /* Marlide-Display.ttf */, 97F6D46922054E640030F13B /* Octicons.ttf */, 97F6D46A22054E640030F13B /* Feather.ttf */, 97F6D46B22054E640030F13B /* Entypo.ttf */, @@ -755,6 +865,9 @@ 49BD28A15F4B4FECA6EE0CDE /* SimpleLineIcons.ttf */, BB0EF52AEE1F4724A178B73A /* Zocial.ttf */, 6EA51D451E9C4637BBA7ADDB /* Fontisto.ttf */, + 74668A562AE3CBB90023695A /* Marlide-Display-Bold.ttf */, + 74668A572AE3CBB90023695A /* Marlide-Display.ttf */, + 74F9D7EF2AF33324007D44BF /* ppneuemontreal-medium.otf */, 97D9A8F5652E4AC580E97DEF /* Mempool.svg */, 2D6AFC110FCE4DB693ABCF13 /* Loading.gif */, DDCBB2DF7F86404A96FCE2C6 /* Success.gif */, @@ -808,12 +921,60 @@ 904B772D015A42D58EF60A9A /* Word Logo - no outline.svg */, 454EDE72420A4964823DF6F2 /* Word Logo.svg */, C79E350A2A9640088B2E0231 /* tor.png */, - 025DDDDD0022456CB347E97B /* Lato-Regular.ttf */, - C099E154C6C8479188E39851 /* Lato-Bold.ttf */, 01471298AE544A2F89251D67 /* PinFilled.svg */, AA4B9185A0E64EC68F5F0628 /* PinHollow.svg */, DAB0850D6CA542288A565578 /* Success.svg */, 8E58364B7EB64F938378D743 /* Currency.svg */, + E9CA42E45FF64512B2D7C632 /* Launcher.png */, + 44AA4B9E77FB4B7E92D6E495 /* lightning1.json */, + 6971DB04094F4130B4741426 /* lightning2.json */, + D7C5B50BC6594569B19AE135 /* lightning3.json */, + E30C8201B5B64E99A22BBCE0 /* loader.json */, + 9C94FFE5DB3C4080AB711D66 /* Mascot.png */, + 956E2E16008F4EA0B54DF09B /* Add.svg */, + 3BD89BEBA89A4B678A29E094 /* BitcoinIcon.svg */, + B10811B91C8044358B7EBE82 /* Block.svg */, + 3AB032A5D2204613B50EB1AA /* Channel.svg */, + E475512AC9944749B58EEAC1 /* Clipboard.svg */, + C689AF9C5EFD42E891A1FFD3 /* Cloud.svg */, + 7ABECF711E9D4F5AB912E1C0 /* Copy.svg */, + CE4931FF962B4189AC3F3EEB /* Dice.svg */, + 7E518DD5239E4B02AD264302 /* AddressSvg.tsx */, + 84817A27B5CC4C869EA8ABF3 /* LightningSvg.tsx */, + A3B07984672041189059C4E0 /* OnChainSvg.tsx */, + AC3DB90B22364D909A09B3E0 /* ScanFrameSvg.tsx */, + C7FBAA85E56C4D5D92F74F11 /* UnifiedSvg.tsx */, + 3C817E9DD0504569B85A84F1 /* Edit.svg */, + DD470243A7FC45D882EF1B0D /* Error.svg */, + B4C39762C9B748E39BFDA90F /* ExchangeBitcoin.svg */, + 6C81853A9EA0452B9999E58D /* ExchangeFiat.svg */, + 4A6B733324794E60B618DACE /* Export.svg */, + 8A37760CFE5741E3AD73A485 /* Flash Off.svg */, + DD1A9F0B9EF0475C81C53C8D /* Flash On.svg */, + 34F2E3639E1D4C878EA1CC22 /* Gallery.svg */, + 565C3A5DD94B417EB83A30FE /* Hidden.svg */, + E21D3D5587114764BC296D83 /* Key Security.svg */, + 1D960E4F840145B3BB114CC5 /* Key.svg */, + 3D193586DE804DF89F2C9EC4 /* Leaving.svg */, + 18E41ED7967D4EC7B6CCC6C4 /* Lightning Bolt.svg */, + 41B36F82E42440E0AD72FC42 /* MailboxFlagDown.svg */, + 8E405B6CB7D64A44907B0DB0 /* MailboxFlagUp.svg */, + 8F39D8AB5C2348B699E16A96 /* Mnemonic.svg */, + 3C37D42473A54AD981B549B4 /* NFC.svg */, + 788BB1C90868496CA6F03853 /* Network.svg */, + A7D097DE19314D50ABD77607 /* Nostrich.svg */, + C3D9B9B4D130410A8B146CE4 /* Olympus.svg */, + 3814F0A0F1A84AD1AFD7C587 /* POS.svg */, + 6934A0BCDAD94002BA8F840A /* Save.svg */, + 03529F2B35584738B9EFDE77 /* Search.svg */, + 0A66F4C9560343FA99B24029 /* Share.svg */, + B813A99762CC4756A18E0C20 /* Skull.svg */, + 259C6F30DC5D40FF9E5DF839 /* Sweep.svg */, + DFA342136699448EA20DE82D /* Sync.svg */, + 8F531F57A66C4D86B3D226D7 /* Verified Account.svg */, + D27437A6874C42CDB9C5662B /* Visible.svg */, + 5BF5971FD22D4660A5240C68 /* Untitled.png */, + 913EA077718B4284A6998780 /* zeus-pay.png */, ); name = Resources; sourceTree = ""; @@ -1169,6 +1330,8 @@ 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 97D6EBB726C487DC002ADC8C /* ioslauncher.png in Resources */, 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, + 74668A552AE3CA570023695A /* Marlide-Display-Bold.ttf in Resources */, + 74F9D7F22AF33324007D44BF /* ppneuemontreal-medium.otf in Resources */, 2F59AB02206B4761AB921130 /* Mempool.svg in Resources */, 5ECDD76F848B4802B0B5D3C1 /* Loading.gif in Resources */, 2733AFC787DA44D3B7B5D502 /* Success.gif in Resources */, @@ -1201,6 +1364,7 @@ 5373AAA9A29A4603B7C121F6 /* Globe.svg in Resources */, 5BC6B338F0044B6CA0D45C97 /* Help Icon.svg in Resources */, 0A7D9EFFF994475C9E89AD34 /* Lock.svg in Resources */, + 74668A582AE3CBB90023695A /* Marlide-Display-Bold.ttf in Resources */, 43264510AFC64A6E89EC9BDA /* Menu.svg in Resources */, A2AAB31AF9804954A6AD6625 /* Node Off.svg in Resources */, 7C9A1A0DC41A4B56BC555750 /* Node On.svg in Resources */, @@ -1212,22 +1376,72 @@ A09AF727D5F84779808B2B53 /* Receive.svg in Resources */, F64C923F939245A284E8D5E2 /* Refresh.svg in Resources */, 824E335CCF474E769966E342 /* Routing.svg in Resources */, + 74668A592AE3CBB90023695A /* Marlide-Display.ttf in Resources */, BFEB12685B664218922995B1 /* Scan.svg in Resources */, A79D6320396A4D6AA420E33C /* Send.svg in Resources */, 0EB04476647C460EA1358028 /* Switch.svg in Resources */, 745E06AA295CB0E500597EE8 /* Caret Down.svg in Resources */, 659C049013BD4A618AA4275C /* Temple.svg in Resources */, + 74668A542AE3CA570023695A /* Marlide-Display.ttf in Resources */, F6BA97FE98FB4D8890855BEC /* Wallet.svg in Resources */, 395880B8BA0647E3908DBD6A /* Wallet2.svg in Resources */, ECAC6EABDA3B4277AE5D6B7C /* Word Logo - no outline.svg in Resources */, 0D0C9325D9514324BC10BE73 /* Word Logo.svg in Resources */, D66A263DF39F48088A0F8784 /* tor.png in Resources */, - 1316C039CEF7429B88ABE9E2 /* Lato-Regular.ttf in Resources */, - E24CC9BAF7FF4BA6BCC7F17B /* Lato-Bold.ttf in Resources */, 2E994829C4BA49738466EA86 /* PinFilled.svg in Resources */, E493C650358D49E193BC19D8 /* PinHollow.svg in Resources */, 830A2C4CEE3F4349832AC893 /* Success.svg in Resources */, D568F3B438EB4A808C0FDF80 /* Currency.svg in Resources */, + 0649A4AEF26A4CEEAE114396 /* Launcher.png in Resources */, + 2399885DFDAB4C90B7232496 /* lightning1.json in Resources */, + 9A72311BC6F347239EB6AFAA /* lightning2.json in Resources */, + 9A4C556D9C324870BE6E441F /* lightning3.json in Resources */, + 6E1874218F2145A891E74677 /* loader.json in Resources */, + 70F9098AB09C49D6860BB45E /* Mascot.png in Resources */, + 39D956D93D0846AF909F38DA /* Add.svg in Resources */, + 92542E72F705458EBD582CC8 /* BitcoinIcon.svg in Resources */, + B7B3D0A8E3C8499892224242 /* Block.svg in Resources */, + 79831EB47D6D4FFB90985E0F /* Channel.svg in Resources */, + CD17533A6E834DC3982FD216 /* Clipboard.svg in Resources */, + 40C4AE0236564EDD8B689992 /* Cloud.svg in Resources */, + 9E2B346F72A34EA3807BC843 /* Copy.svg in Resources */, + E691022067D14B198BFF83DB /* Dice.svg in Resources */, + BECCE8BEED334E9E86730C95 /* AddressSvg.tsx in Resources */, + 46E5F71A7C0C4114922F6ED0 /* LightningSvg.tsx in Resources */, + A52E1E9CF5CE42EA9F808362 /* OnChainSvg.tsx in Resources */, + 4132F00F76CB488AAA77C848 /* ScanFrameSvg.tsx in Resources */, + 7598B75F1F64426CAF420155 /* UnifiedSvg.tsx in Resources */, + 5851F5898AED446FA5EF41FB /* Edit.svg in Resources */, + EE7264005C294AE58E30C834 /* Error.svg in Resources */, + 6027AA29AEA34E7290034736 /* ExchangeBitcoin.svg in Resources */, + 93C795DB3CDC46D8862C3393 /* ExchangeFiat.svg in Resources */, + 1E2D6C276B2449BEB48D0EFA /* Export.svg in Resources */, + CDAF6A80899D4DF981EE8632 /* Flash Off.svg in Resources */, + 7605A9F30F13492692B1AB4E /* Flash On.svg in Resources */, + B82926F8C93A40B38A3F7B1C /* Gallery.svg in Resources */, + C192B71058804DFF8F1EAE88 /* Hidden.svg in Resources */, + 596BD565F15B4738AEC5F283 /* Key Security.svg in Resources */, + AE22239BC4074BADBFCAA228 /* Key.svg in Resources */, + DC6A3F2DC6F943708353E330 /* Leaving.svg in Resources */, + 338A1C5490BD4AD8A3355DDB /* Lightning Bolt.svg in Resources */, + 3AD7EB797D8E4070B46FB7CE /* MailboxFlagDown.svg in Resources */, + 42261FC8680748CB8F34DD98 /* MailboxFlagUp.svg in Resources */, + 0D6056C7AD2B42AE97EF31CA /* Mnemonic.svg in Resources */, + B20A92EA4E82493CB6D1A2F0 /* NFC.svg in Resources */, + AD4FA10D0AD74C48A492F993 /* Network.svg in Resources */, + 7DDC8A1B32DC415DA3A3123B /* Nostrich.svg in Resources */, + 84DD7E2C561F444780607E4E /* Olympus.svg in Resources */, + C617C53C9731441DB9E9E8DD /* POS.svg in Resources */, + F9767258AD2F4256A0668218 /* Save.svg in Resources */, + 243243DF5818489D84FBD3DA /* Search.svg in Resources */, + 0F5FEEC1B1B74A099CDED741 /* Share.svg in Resources */, + F15BCD255F194C84973AB51D /* Skull.svg in Resources */, + 593DA4FEB1FE4C1CA721DDB1 /* Sweep.svg in Resources */, + 339B3FF0F9D846B7AFA96C70 /* Sync.svg in Resources */, + B8067346D38044A7B3100972 /* Verified Account.svg in Resources */, + 615320DD69744BC4A8D3E80E /* Visible.svg in Resources */, + E2A87233B6EE487090D3FE9F /* Untitled.png in Resources */, + 44DF6141999C471D9F26E104 /* zeus-pay.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/ios/zeus/Images.xcassets/AppIcon.appiconset/1024.png b/ios/zeus/Images.xcassets/AppIcon.appiconset/1024.png new file mode 100644 index 000000000..8307bba6a Binary files /dev/null and b/ios/zeus/Images.xcassets/AppIcon.appiconset/1024.png differ diff --git a/ios/zeus/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/zeus/Images.xcassets/AppIcon.appiconset/Contents.json index 44ac9cc28..cff1680b3 100644 --- a/ios/zeus/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/zeus/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "appstore.png", + "filename" : "1024.png", "idiom" : "universal", "platform" : "ios", "size" : "1024x1024" diff --git a/ios/zeus/Images.xcassets/AppIcon.appiconset/appstore.png b/ios/zeus/Images.xcassets/AppIcon.appiconset/appstore.png deleted file mode 100644 index a65ecdea0..000000000 Binary files a/ios/zeus/Images.xcassets/AppIcon.appiconset/appstore.png and /dev/null differ diff --git a/ios/zeus/Info.plist b/ios/zeus/Info.plist index 5c648357a..2d7e75ee9 100644 --- a/ios/zeus/Info.plist +++ b/ios/zeus/Info.plist @@ -2,12 +2,10 @@ - NSFaceIDUsageDescription - FaceID is used to login to Zeus CFBundleDevelopmentRegion en CFBundleDisplayName - Zeus + ZEUS CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier @@ -45,10 +43,14 @@ CFBundleVersion $(CURRENT_PROJECT_VERSION) + LSApplicationQueriesSchemes + + mailto + LSRequiresIPhoneOS NFCReaderUsageDescription - Zeus would like permission to use NFC to supplement QR code scanning + ZEUS would like permission to use NFC to supplement QR code scanning NSAppTransportSecurity NSAllowsArbitraryLoads @@ -71,7 +73,9 @@ NSCalendarsUsageDescription Not Used NSCameraUsageDescription - Zeus would like permission to use your camera to scan QR codes + ZEUS would like permission to use your camera to scan QR codes + NSFaceIDUsageDescription + FaceID is used to login to ZEUS NSLocationAlwaysDescription Not Used NSLocationWhenInUseUsageDescription @@ -81,11 +85,13 @@ NSPhotoLibraryAddUsageDescription Not Used NSPhotoLibraryUsageDescription - Zeus would like permission to use load QR codes from your photo library + ZEUS would like permission to use load QR codes from your photo library NSSpeechRecognitionUsageDescription Not Used UIAppFonts + Marlide-Display.ttf + Marlide-Display-Bold.ttf AntDesign.ttf Entypo.ttf EvilIcons.ttf @@ -102,8 +108,7 @@ SimpleLineIcons.ttf Zocial.ttf Fontisto.ttf - Lato-Regular.ttf - Lato-Bold.ttf + ppneuemontreal-medium.otf UILaunchStoryboardName LaunchScreen @@ -124,10 +129,5 @@ UIViewControllerBasedStatusBarAppearance - LSApplicationQueriesSchemes - - mailto - - diff --git a/package.json b/package.json index 612301b4d..578ce9225 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "@react-navigation/bottom-tabs": "5.11.11", "@react-navigation/native": "6.0.16", "@remobile/react-native-qrcode-local-image": "github:BlueWallet/react-native-qrcode-local-image#31b0113", + "@shopify/react-native-skia": "^0.1.213", "@tradle/react-native-http": "2.0.1", "@types/dateformat": "5.0.0", "@types/react-native-snap-carousel": "3.8.5", diff --git a/stores/SettingsStore.ts b/stores/SettingsStore.ts index 1f686821a..e7eb23088 100644 --- a/stores/SettingsStore.ts +++ b/stores/SettingsStore.ts @@ -545,6 +545,7 @@ export const CURRENCY_KEYS = [ ]; export const THEME_KEYS = [ + { key: 'Kyriaki', value: 'kyriaki' }, { key: 'Dark', translateKey: 'views.Settings.Theme.dark', value: 'dark' }, { key: 'Light', @@ -649,7 +650,7 @@ export const DEFAULT_VIEW_KEYS = [ } ]; -export const DEFAULT_THEME = 'dark'; +export const DEFAULT_THEME = 'kyriaki'; export const DEFAULT_FIAT = 'USD'; export const DEFAULT_FIAT_RATES_SOURCE = 'Zeus'; export const DEFAULT_LOCALE = 'English'; diff --git a/utils/ThemeUtils.ts b/utils/ThemeUtils.ts index 70704a9ee..7f5d96c93 100644 --- a/utils/ThemeUtils.ts +++ b/utils/ThemeUtils.ts @@ -4,6 +4,30 @@ export function themeColor(themeString: string): any { const { settings } = stores.settingsStore; const theme = settings.display && settings.display.theme; + const Kyriaki: { [key: string]: any } = { + generalStyle: 'dark', + background: '#1E2022', + secondary: '#31363F', + text: 'white', + secondaryText: '#A7A9AC', + highlight: '#FFA900', + error: '#992600', + separator: '#31363F', + outbound: '#FFD93F', + inbound: '#FFF0CA', + success: '#46BE43', + warning: '#E14C4C', + bitcoin: '#FFB040', + delete: '#992600', + qrFrame: '#FFD93F', + bolt: '#FFF', + chain: '#FFF', + disabled: '#767577', + buttonBackground: '#FFA900', + buttonGradient: ['#FF9000', '#FFA900'], + buttonText: '#000000' + }; + const Light: { [key: string]: any } = { generalStyle: 'light', background: '#fff', @@ -268,6 +292,8 @@ export function themeColor(themeString: string): any { }; switch (theme) { + case 'kyriaki': + return Kyriaki[themeString] || Dark[themeString]; case 'light': return Light[themeString] || Dark[themeString]; case 'junkie': diff --git a/views/Activity/Activity.tsx b/views/Activity/Activity.tsx index 0b0e5082a..ea123cb97 100644 --- a/views/Activity/Activity.tsx +++ b/views/Activity/Activity.tsx @@ -226,7 +226,7 @@ export default class Activity extends React.PureComponent< text: localeString('general.activity'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} rightComponent={ @@ -394,7 +394,8 @@ export default class Activity extends React.PureComponent< : themeColor( 'text' ), - fontFamily: 'Lato-Regular' + fontFamily: + 'PPNeueMontreal-Book' }} > {displayName} @@ -411,7 +412,8 @@ export default class Activity extends React.PureComponent< : themeColor( 'secondaryText' ), - fontFamily: 'Lato-Regular' + fontFamily: + 'PPNeueMontreal-Book' }} > {subTitle} @@ -458,7 +460,8 @@ export default class Activity extends React.PureComponent< color: themeColor( 'secondaryText' ), - fontFamily: 'Lato-Regular' + fontFamily: + 'PPNeueMontreal-Book' }} > {order @@ -494,7 +497,7 @@ export default class Activity extends React.PureComponent< }} titleStyle={{ color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }} /> )} diff --git a/views/Activity/ActivityFilter.tsx b/views/Activity/ActivityFilter.tsx index c596eb90c..6bad6bc8f 100644 --- a/views/Activity/ActivityFilter.tsx +++ b/views/Activity/ActivityFilter.tsx @@ -88,7 +88,7 @@ export default class ActivityFilter extends React.Component< > {item.label} diff --git a/views/AddNotes.tsx b/views/AddNotes.tsx index 424680b7a..037e32866 100644 --- a/views/AddNotes.tsx +++ b/views/AddNotes.tsx @@ -107,7 +107,7 @@ export default class AddNotes extends React.Component< ), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', fontSize: 20 } }} diff --git a/views/BumpFee.tsx b/views/BumpFee.tsx index 6dfcb788d..2c4491d24 100644 --- a/views/BumpFee.tsx +++ b/views/BumpFee.tsx @@ -83,7 +83,7 @@ export default class BumpFee extends React.PureComponent< const feeRateButton = () => ( ( @@ -237,7 +237,7 @@ export default class ChannelView extends React.Component< @@ -600,11 +600,11 @@ export default class ChannelView extends React.Component< const styles = StyleSheet.create({ text: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, secondaryText: { color: themeColor('secondaryText'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, content: { paddingLeft: 20, @@ -614,7 +614,7 @@ const styles = StyleSheet.create({ alignItems: 'center' }, status: { - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', color: themeColor('text'), alignSelf: 'center', marginBottom: 10 diff --git a/views/Channels/ChannelsPane.tsx b/views/Channels/ChannelsPane.tsx index ea5c8eb65..ea91853e7 100644 --- a/views/Channels/ChannelsPane.tsx +++ b/views/Channels/ChannelsPane.tsx @@ -292,7 +292,7 @@ export default class ChannelsPane extends React.PureComponent { value={search} inputStyle={{ color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }} placeholderTextColor={themeColor( 'secondaryText' diff --git a/views/ContactDetails.tsx b/views/ContactDetails.tsx index d5fb9fcbb..76605cfdd 100644 --- a/views/ContactDetails.tsx +++ b/views/ContactDetails.tsx @@ -489,7 +489,7 @@ export default class ContactDetails extends React.Component< const styles = StyleSheet.create({ text: { - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, button: { paddingTop: 10, diff --git a/views/Explanations/LspExplanationFees.tsx b/views/Explanations/LspExplanationFees.tsx index 1465510cb..01236fa50 100644 --- a/views/Explanations/LspExplanationFees.tsx +++ b/views/Explanations/LspExplanationFees.tsx @@ -31,7 +31,7 @@ export default class LspExplanation extends React.PureComponent< text: localeString('views.LspExplanation.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -40,7 +40,7 @@ export default class LspExplanation extends React.PureComponent< = (props) => { style={{ fontSize: 23, color: themeColor('text'), - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', alignSelf: 'center', paddingTop: 10 }} @@ -101,7 +101,7 @@ const Intro: React.FC = (props) => { style={{ fontSize: 20, color: themeColor('secondaryText'), - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', alignSelf: 'center', padding: 10 }} @@ -256,7 +256,7 @@ const Intro: React.FC = (props) => { { private backPressSubscription: NativeEventSubscription; - state = { creatingWallet: false, - error: false + error: false, + modalBlur: 90 }; componentDidMount() { @@ -75,18 +76,15 @@ export default class IntroSplash extends React.Component< } render() { - const { navigation } = this.props; + const { navigation, SettingsStore } = this.props; + const { settings } = SettingsStore; + const locale = settings.locale || ''; - const LanguageButton = () => ( - navigation.navigate('Language')} - accessibilityLabel={localeString( - 'views.Settings.Language.title' - )} - > - - + const localeItem: any = LOCALE_KEYS.filter((item: any) => + item.key.includes(locale) ); + let localeName; + if (localeItem[0]) localeName = localeItem[0].value; if (this.state.creatingWallet) { return ( @@ -99,16 +97,20 @@ export default class IntroSplash extends React.Component< top: 10 }} > - + > + + -
- - - - - - {this.state.error && ( - - )} - <> - - - - - - ); diff --git a/views/Invoice.tsx b/views/Invoice.tsx index 71db812c3..ef89bd3ac 100644 --- a/views/Invoice.tsx +++ b/views/Invoice.tsx @@ -93,7 +93,7 @@ export default class InvoiceView extends React.Component { text: localeString('views.Invoice.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} rightComponent={ diff --git a/views/LnurlAuth.tsx b/views/LnurlAuth.tsx index 5242876c5..eb1140019 100644 --- a/views/LnurlAuth.tsx +++ b/views/LnurlAuth.tsx @@ -259,7 +259,7 @@ export default class LnurlAuth extends React.Component< text: localeString('views.LnurlAuth.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -270,7 +270,7 @@ export default class LnurlAuth extends React.Component< padding: 20, fontSize: 22, color: themeColor('text'), - fontFamily: 'Lato-Bold', + fontFamily: 'PPNeueMontreal-Medium', textAlign: 'center' }} > diff --git a/views/LnurlChannel.tsx b/views/LnurlChannel.tsx index 4dc59c944..beae71b64 100644 --- a/views/LnurlChannel.tsx +++ b/views/LnurlChannel.tsx @@ -190,7 +190,7 @@ export default class LnurlChannel extends React.Component< text: localeString('views.LnurlChannel.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -201,7 +201,7 @@ export default class LnurlChannel extends React.Component< padding: 20, fontSize: 22, color: themeColor('text'), - fontFamily: 'Lato-Bold' + fontFamily: 'PPNeueMontreal-Medium' }} > {domain} @@ -211,7 +211,7 @@ export default class LnurlChannel extends React.Component< {localeString('views.LnurlChannel.uri')} @@ -220,7 +220,7 @@ export default class LnurlChannel extends React.Component< {lnurl.uri} @@ -232,7 +232,7 @@ export default class LnurlChannel extends React.Component< style={{ top: 10, color: themeColor('secondaryText'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }} > {localeString('views.OpenChannel.private')} @@ -280,7 +280,7 @@ export default class LnurlChannel extends React.Component< {localeString('views.OpenChannel.peerSuccess')} @@ -290,7 +290,7 @@ export default class LnurlChannel extends React.Component< {localeString('views.LnurlChannel.success')} @@ -302,7 +302,7 @@ export default class LnurlChannel extends React.Component< {this.state.errorMsgPeer || diff --git a/views/LnurlPay/Historical.tsx b/views/LnurlPay/Historical.tsx index 6fe9611b5..f7b87e543 100644 --- a/views/LnurlPay/Historical.tsx +++ b/views/LnurlPay/Historical.tsx @@ -42,7 +42,7 @@ export default class LnurlPayHistorical extends React.Component< diff --git a/views/LnurlPay/LnurlPay.tsx b/views/LnurlPay/LnurlPay.tsx index 299ae9c48..e1b5942a0 100644 --- a/views/LnurlPay/LnurlPay.tsx +++ b/views/LnurlPay/LnurlPay.tsx @@ -186,7 +186,7 @@ export default class LnurlPay extends React.Component< text: localeString('general.send'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -331,7 +331,7 @@ export default class LnurlPay extends React.Component< const styles = StyleSheet.create({ text: { - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, textInput: { paddingVertical: 10 }, content: { paddingHorizontal: 20 }, diff --git a/views/LnurlPay/Metadata.tsx b/views/LnurlPay/Metadata.tsx index 65022c989..afd76ad33 100644 --- a/views/LnurlPay/Metadata.tsx +++ b/views/LnurlPay/Metadata.tsx @@ -47,7 +47,7 @@ export default class LnurlPayMetadata extends React.Component {text} diff --git a/views/LnurlPay/Success.tsx b/views/LnurlPay/Success.tsx index 66833dc73..70ad34ea9 100644 --- a/views/LnurlPay/Success.tsx +++ b/views/LnurlPay/Success.tsx @@ -42,7 +42,7 @@ export default class LnurlPaySuccess extends React.Component this.URLClicked()}> diff --git a/views/Lockscreen.tsx b/views/Lockscreen.tsx index 1eef80e34..b9f6d918f 100644 --- a/views/Lockscreen.tsx +++ b/views/Lockscreen.tsx @@ -344,7 +344,7 @@ export default class Lockscreen extends React.Component< {localeString('views.Lockscreen.passphrase')} @@ -483,7 +483,7 @@ const styles = StyleSheet.create({ textAlign: 'center' }, mainText: { - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', fontSize: 20, textAlign: 'center' } diff --git a/views/NetworkInfo.tsx b/views/NetworkInfo.tsx index 702b38cce..fc3a2a957 100644 --- a/views/NetworkInfo.tsx +++ b/views/NetworkInfo.tsx @@ -63,7 +63,7 @@ export default class NetworkInfo extends React.Component { text: localeString('views.NetworkInfo.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -96,6 +96,6 @@ const styles = StyleSheet.create({ error: { paddingBottom: 5, color: 'red', - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }); diff --git a/views/NodeInfo.tsx b/views/NodeInfo.tsx index c7976e746..94ae0615d 100644 --- a/views/NodeInfo.tsx +++ b/views/NodeInfo.tsx @@ -80,7 +80,9 @@ export default class NodeInfo extends React.Component { {nodeInfo.version && ( )} @@ -150,7 +152,7 @@ export default class NodeInfo extends React.Component { text: localeString('views.NodeInfo.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} diff --git a/views/OpenChannel.tsx b/views/OpenChannel.tsx index 34ecfad81..8b77986d2 100644 --- a/views/OpenChannel.tsx +++ b/views/OpenChannel.tsx @@ -759,11 +759,11 @@ export default class OpenChannel extends React.Component< const styles = StyleSheet.create({ text: { - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, textWhite: { color: 'white', - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, content: { paddingTop: 20, diff --git a/views/Order.tsx b/views/Order.tsx index 1fd0e2dda..a2a3628cd 100644 --- a/views/Order.tsx +++ b/views/Order.tsx @@ -124,7 +124,7 @@ export default class OrderView extends React.Component { const twentyPercentButton = () => ( { const twentyFivePercentButton = () => ( { const thirtyPercentButton = () => ( { const customButton = () => ( { text: localeString('general.order'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} diff --git a/views/Payment.tsx b/views/Payment.tsx index 6dd86e4c3..c98ffb4cf 100644 --- a/views/Payment.tsx +++ b/views/Payment.tsx @@ -108,7 +108,7 @@ export default class PaymentView extends React.Component { : localeString('views.Payment.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} rightComponent={} @@ -151,7 +151,8 @@ export default class PaymentView extends React.Component { {getFeePercentage && ( @@ -220,7 +221,7 @@ export default class PaymentView extends React.Component { {enhancedPath.length > 1 diff --git a/views/PaymentPaths.tsx b/views/PaymentPaths.tsx index 81808b6e6..b06e449b2 100644 --- a/views/PaymentPaths.tsx +++ b/views/PaymentPaths.tsx @@ -33,7 +33,7 @@ export default class PaymentPathsView extends React.Component} @@ -1099,7 +1099,7 @@ export default class PaymentRequest extends React.Component< <> { {localeString('general.unified')} @@ -1021,7 +1021,7 @@ export default class Receive extends React.Component< selectedIndex === 1 ? themeColor('background') : themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }} > {localeString('general.lightning')} @@ -1038,7 +1038,7 @@ export default class Receive extends React.Component< selectedIndex === 2 ? themeColor('background') : themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }} > {localeString('general.onchain')} @@ -1055,7 +1055,7 @@ export default class Receive extends React.Component< selectedIndex === 3 ? themeColor('background') : themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }} > {localeString('general.lightningAddressCondensed')} @@ -1144,7 +1144,7 @@ export default class Receive extends React.Component< : localeString('views.Receive.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} rightComponent={ @@ -1297,7 +1297,8 @@ export default class Receive extends React.Component< > ( ( ( ( ( ( {localeString( diff --git a/views/Routing/SetFees.tsx b/views/Routing/SetFees.tsx index 259c68105..68016d2d3 100644 --- a/views/Routing/SetFees.tsx +++ b/views/Routing/SetFees.tsx @@ -81,7 +81,7 @@ export default class SetFees extends React.PureComponent { : localeString('views.Routing.SetFees'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} diff --git a/views/Send.tsx b/views/Send.tsx index d4056ded3..b48ef04fe 100644 --- a/views/Send.tsx +++ b/views/Send.tsx @@ -437,7 +437,7 @@ export default class Send extends React.Component { text: localeString('views.Send.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} rightComponent={ @@ -993,10 +993,10 @@ export default class Send extends React.Component { const styles = StyleSheet.create({ text: { - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, secondaryText: { - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, content: { padding: 20 @@ -1015,7 +1015,7 @@ const styles = StyleSheet.create({ alignItems: 'center' }, label: { - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', paddingTop: 5 } }); diff --git a/views/SendingLightning.tsx b/views/SendingLightning.tsx index a58e4f328..1d2faf167 100644 --- a/views/SendingLightning.tsx +++ b/views/SendingLightning.tsx @@ -3,6 +3,7 @@ import EncryptedStorage from 'react-native-encrypted-storage'; import { BackHandler, + Dimensions, Image, NativeEventSubscription, ScrollView, @@ -27,7 +28,7 @@ import { themeColor } from '../utils/ThemeUtils'; import Clock from '../assets/images/SVG/Clock.svg'; import Error from '../assets/images/SVG/Error.svg'; import Success from '../assets/images/GIF/Success.gif'; -import WordLogo from '../assets/images/SVG/Word Logo.svg'; +import Wordmark from '../assets/images/SVG/wordmark-black.svg'; import CopyBox from '../components/CopyBox'; interface SendingLightningProps { @@ -140,19 +141,25 @@ export default class SendingLightning extends React.Component< {localeString('views.SendingLightning.sending')} )} {!loading && (!!success || !!inTransit) && !error && ( - + > + + )} {!loading && !!success && !error && ( <> @@ -185,7 +192,7 @@ export default class SendingLightning extends React.Component< @@ -243,7 +250,7 @@ export default class SendingLightning extends React.Component< - + > + + @@ -242,7 +261,7 @@ export default class SendingOnChain extends React.Component< const styles = StyleSheet.create({ text: { - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, container: { flex: 1 diff --git a/views/Settings/AddContact.tsx b/views/Settings/AddContact.tsx index 0b82ffd75..82857201d 100644 --- a/views/Settings/AddContact.tsx +++ b/views/Settings/AddContact.tsx @@ -1209,7 +1209,7 @@ const styles = StyleSheet.create({ textInput: { fontSize: 20, width: '100%', - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', top: 5, color: themeColor('text') }, diff --git a/views/Settings/CertInstallInstructions.tsx b/views/Settings/CertInstallInstructions.tsx index b02eaeb64..987dd88c3 100644 --- a/views/Settings/CertInstallInstructions.tsx +++ b/views/Settings/CertInstallInstructions.tsx @@ -35,7 +35,7 @@ export default class CertInstallInstructions extends React.Component< ), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} diff --git a/views/Settings/Contacts.tsx b/views/Settings/Contacts.tsx index 38bb4854a..96b26f69a 100644 --- a/views/Settings/Contacts.tsx +++ b/views/Settings/Contacts.tsx @@ -418,7 +418,14 @@ export default class Contacts extends React.Component< size: 25, color: themeColor('text') }} - iconOnly + buttonStyle={{ + backgroundColor: 'transparent', + borderRadius: 30 + }} + titleStyle={{ + color: themeColor('text'), + fontFamily: 'PPNeueMontreal-Book' + }} /> ) )} diff --git a/views/Settings/Currency.tsx b/views/Settings/Currency.tsx index bce12160c..4bf9896bf 100644 --- a/views/Settings/Currency.tsx +++ b/views/Settings/Currency.tsx @@ -88,7 +88,7 @@ export default class Currency extends React.Component< text: localeString('views.Settings.Currency.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -102,7 +102,7 @@ export default class Currency extends React.Component< {localeString('views.Settings.Currency.enabled')} @@ -170,7 +170,7 @@ export default class Currency extends React.Component< {localeString( diff --git a/views/Settings/Display.tsx b/views/Settings/Display.tsx index c9a84c786..01c0ed233 100644 --- a/views/Settings/Display.tsx +++ b/views/Settings/Display.tsx @@ -89,7 +89,7 @@ export default class Display extends React.Component< text: localeString('views.Settings.Display.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -149,7 +149,7 @@ export default class Display extends React.Component< @@ -193,7 +193,7 @@ export default class Display extends React.Component< @@ -237,7 +237,7 @@ export default class Display extends React.Component< diff --git a/views/Settings/EmbeddedNode/DisasterRecovery.tsx b/views/Settings/EmbeddedNode/DisasterRecovery.tsx index cae9f7805..0f07c4475 100644 --- a/views/Settings/EmbeddedNode/DisasterRecovery.tsx +++ b/views/Settings/EmbeddedNode/DisasterRecovery.tsx @@ -130,7 +130,7 @@ export default class DisasterRecovery extends React.Component< ), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -175,7 +175,7 @@ export default class DisasterRecovery extends React.Component< {localeString( diff --git a/views/Settings/EmbeddedNode/DisasterRecoveryAdvanced.tsx b/views/Settings/EmbeddedNode/DisasterRecoveryAdvanced.tsx index c2372b580..e8d575d9e 100644 --- a/views/Settings/EmbeddedNode/DisasterRecoveryAdvanced.tsx +++ b/views/Settings/EmbeddedNode/DisasterRecoveryAdvanced.tsx @@ -61,7 +61,7 @@ export default class DisasterRecoveryAdvanced extends React.Component< ), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -71,7 +71,7 @@ export default class DisasterRecoveryAdvanced extends React.Component< {!loading && error && ( {localeString( @@ -138,7 +138,7 @@ export default class ExpressGraphSync extends React.Component< {localeString( @@ -194,7 +194,7 @@ export default class ExpressGraphSync extends React.Component< {localeString( diff --git a/views/Settings/EmbeddedNode/LNDLogs.tsx b/views/Settings/EmbeddedNode/LNDLogs.tsx index b403ef927..210fbb716 100644 --- a/views/Settings/EmbeddedNode/LNDLogs.tsx +++ b/views/Settings/EmbeddedNode/LNDLogs.tsx @@ -76,7 +76,7 @@ export default class LNDLogs extends React.Component< ), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} diff --git a/views/Settings/EmbeddedNode/Pathfinding.tsx b/views/Settings/EmbeddedNode/Pathfinding.tsx index 83a027f40..e738d9ec2 100644 --- a/views/Settings/EmbeddedNode/Pathfinding.tsx +++ b/views/Settings/EmbeddedNode/Pathfinding.tsx @@ -61,7 +61,7 @@ export default class Pathfinding extends React.Component< ), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -77,7 +77,7 @@ export default class Pathfinding extends React.Component< {localeString( diff --git a/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx b/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx index 461f61df7..4c3cea7ae 100644 --- a/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx +++ b/views/Settings/EmbeddedNode/Peers/NeutrinoPeers.tsx @@ -74,7 +74,7 @@ export default class NeutrinoPeers extends React.Component< ), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -107,7 +107,7 @@ export default class NeutrinoPeers extends React.Component< {localeString( diff --git a/views/Settings/EmbeddedNode/Peers/ZeroConfPeers.tsx b/views/Settings/EmbeddedNode/Peers/ZeroConfPeers.tsx index fba0efdc8..a051b0673 100644 --- a/views/Settings/EmbeddedNode/Peers/ZeroConfPeers.tsx +++ b/views/Settings/EmbeddedNode/Peers/ZeroConfPeers.tsx @@ -66,7 +66,7 @@ export default class ZeroConfPeers extends React.Component< ), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} diff --git a/views/Settings/EmbeddedNode/Peers/index.tsx b/views/Settings/EmbeddedNode/Peers/index.tsx index bdff80a5e..410c5e5e9 100644 --- a/views/Settings/EmbeddedNode/Peers/index.tsx +++ b/views/Settings/EmbeddedNode/Peers/index.tsx @@ -36,7 +36,7 @@ export default class Peers extends React.Component { ).slice(1)}`, style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -52,7 +52,7 @@ export default class Peers extends React.Component { {localeString( @@ -62,7 +62,7 @@ export default class Peers extends React.Component { {neutrinoPeers && neutrinoPeers.length > 0 @@ -121,7 +121,7 @@ export default class Peers extends React.Component { {localeString( @@ -131,7 +131,7 @@ export default class Peers extends React.Component { {zeroConfPeers && zeroConfPeers.length > 0 diff --git a/views/Settings/EmbeddedNode/index.tsx b/views/Settings/EmbeddedNode/index.tsx index 8ef00c50b..dde7c2c1f 100644 --- a/views/Settings/EmbeddedNode/index.tsx +++ b/views/Settings/EmbeddedNode/index.tsx @@ -66,7 +66,7 @@ export default class EmbeddedNode extends React.Component< ), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -84,7 +84,7 @@ export default class EmbeddedNode extends React.Component< {localeString( @@ -94,7 +94,7 @@ export default class EmbeddedNode extends React.Component< {localeString( @@ -126,7 +126,7 @@ export default class EmbeddedNode extends React.Component< {localeString( @@ -136,7 +136,7 @@ export default class EmbeddedNode extends React.Component< {expressGraphSync @@ -173,7 +173,7 @@ export default class EmbeddedNode extends React.Component< {localeString( @@ -183,7 +183,7 @@ export default class EmbeddedNode extends React.Component< {bimodalPathfinding @@ -210,7 +210,7 @@ export default class EmbeddedNode extends React.Component< {localeString( @@ -234,7 +234,7 @@ export default class EmbeddedNode extends React.Component< {localeString( @@ -257,7 +257,7 @@ export default class EmbeddedNode extends React.Component< {localeString( @@ -312,7 +312,7 @@ export default class EmbeddedNode extends React.Component< {localeString( diff --git a/views/Settings/Gods.tsx b/views/Settings/Gods.tsx index 275dc36bf..7408d23e1 100644 --- a/views/Settings/Gods.tsx +++ b/views/Settings/Gods.tsx @@ -38,7 +38,7 @@ export default class Gods extends React.Component { text: localeString('views.Gods.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} diff --git a/views/Settings/Help.tsx b/views/Settings/Help.tsx index 4616ace79..36f089a4b 100644 --- a/views/Settings/Help.tsx +++ b/views/Settings/Help.tsx @@ -48,7 +48,7 @@ function Help(props: HelpProps) { text: localeString('general.help'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -79,7 +79,7 @@ function Help(props: HelpProps) { {item.label} diff --git a/views/Settings/InvoicesSettings.tsx b/views/Settings/InvoicesSettings.tsx index 9458ab6ef..b9a38afc0 100644 --- a/views/Settings/InvoicesSettings.tsx +++ b/views/Settings/InvoicesSettings.tsx @@ -139,7 +139,7 @@ export default class InvoicesSettings extends React.Component< text: localeString('views.Settings.Invoices.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} rightComponent={ @@ -400,6 +400,6 @@ export default class InvoicesSettings extends React.Component< const styles = StyleSheet.create({ secondaryText: { - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }); diff --git a/views/Settings/LSP.tsx b/views/Settings/LSP.tsx index c6314fb17..1a584cb14 100644 --- a/views/Settings/LSP.tsx +++ b/views/Settings/LSP.tsx @@ -64,7 +64,7 @@ export default class LSP extends React.Component { text: localeString('general.lsp'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -78,7 +78,7 @@ export default class LSP extends React.Component { {localeString('views.Settings.LSP.enableLSP')} @@ -128,7 +128,7 @@ export default class LSP extends React.Component { > @@ -163,7 +163,7 @@ export default class LSP extends React.Component { > @@ -193,7 +193,7 @@ export default class LSP extends React.Component { {localeString( diff --git a/views/Settings/LightningAddress/Attestation.tsx b/views/Settings/LightningAddress/Attestation.tsx index ae5f1d95c..f26e48919 100644 --- a/views/Settings/LightningAddress/Attestation.tsx +++ b/views/Settings/LightningAddress/Attestation.tsx @@ -35,7 +35,7 @@ export default function Attestation(props: AttestationProps) { text: localeString('views.Settings.Attestation.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} diff --git a/views/Settings/LightningAddress/Attestations.tsx b/views/Settings/LightningAddress/Attestations.tsx index 793cb943b..456a1a90f 100644 --- a/views/Settings/LightningAddress/Attestations.tsx +++ b/views/Settings/LightningAddress/Attestations.tsx @@ -27,7 +27,7 @@ export default function Attestation(props: AttestationProps) { text: localeString('views.Settings.Attestations.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} diff --git a/views/Settings/LightningAddress/ChangeAddress.tsx b/views/Settings/LightningAddress/ChangeAddress.tsx index ea8fe6dbe..029ee5f70 100644 --- a/views/Settings/LightningAddress/ChangeAddress.tsx +++ b/views/Settings/LightningAddress/ChangeAddress.tsx @@ -62,7 +62,7 @@ export default class ChangeAddress extends React.Component< ), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -152,7 +152,7 @@ export default class ChangeAddress extends React.Component< const styles = StyleSheet.create({ text: { - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', color: themeColor('text') }, wrapper: { diff --git a/views/Settings/LightningAddress/LightningAddressInfo.tsx b/views/Settings/LightningAddress/LightningAddressInfo.tsx index 10ceea018..8c8b8e700 100644 --- a/views/Settings/LightningAddress/LightningAddressInfo.tsx +++ b/views/Settings/LightningAddress/LightningAddressInfo.tsx @@ -60,7 +60,7 @@ export default class LightningAddressInfo extends React.Component< ), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} diff --git a/views/Settings/LightningAddress/LightningAddressSettings.tsx b/views/Settings/LightningAddress/LightningAddressSettings.tsx index 508e77d19..38a1e9979 100644 --- a/views/Settings/LightningAddress/LightningAddressSettings.tsx +++ b/views/Settings/LightningAddress/LightningAddressSettings.tsx @@ -109,7 +109,7 @@ export default class LightningAddressSettings extends React.Component< ), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} rightComponent={ @@ -125,7 +125,7 @@ export default class LightningAddressSettings extends React.Component< @@ -209,7 +209,7 @@ export default class LightningAddressSettings extends React.Component< @@ -412,7 +412,7 @@ export default class LightningAddressSettings extends React.Component< {localeString('nostr.keys')} @@ -433,7 +433,7 @@ export default class LightningAddressSettings extends React.Component< {`${localeString( @@ -456,7 +456,7 @@ export default class LightningAddressSettings extends React.Component< {localeString( diff --git a/views/Settings/LightningAddress/NostrKeys.tsx b/views/Settings/LightningAddress/NostrKeys.tsx index cb2d9888d..5c1d613ce 100644 --- a/views/Settings/LightningAddress/NostrKeys.tsx +++ b/views/Settings/LightningAddress/NostrKeys.tsx @@ -183,7 +183,7 @@ export default class NostrKey extends React.Component< : localeString('nostr.keys'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} rightComponent={ @@ -382,7 +382,7 @@ export default class NostrKey extends React.Component< const styles = StyleSheet.create({ text: { - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', color: themeColor('text') }, wrapper: { diff --git a/views/Settings/LightningAddress/NostrRelays.tsx b/views/Settings/LightningAddress/NostrRelays.tsx index 7b3ea620a..92daa1727 100644 --- a/views/Settings/LightningAddress/NostrRelays.tsx +++ b/views/Settings/LightningAddress/NostrRelays.tsx @@ -110,7 +110,7 @@ export default class NostrRelays extends React.Component< text: localeString('views.Settings.Nostr.relays'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} rightComponent={ diff --git a/views/Settings/LightningAddress/index.tsx b/views/Settings/LightningAddress/index.tsx index d98f076ba..5ddffbccd 100644 --- a/views/Settings/LightningAddress/index.tsx +++ b/views/Settings/LightningAddress/index.tsx @@ -228,7 +228,7 @@ export default class LightningAddress extends React.Component< const openOrdersButton = () => ( ( {localeString( @@ -505,7 +506,7 @@ export default class LightningAddress extends React.Component< 'text' ), fontFamily: - 'Lato-Regular' + 'PPNeueMontreal-Book' }} > {`${localeString( @@ -587,7 +588,8 @@ export default class LightningAddress extends React.Component< > { text: localeString('views.Mortals.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} diff --git a/views/Settings/NodeConfiguration.tsx b/views/Settings/NodeConfiguration.tsx index bf2695e23..71c8f7b18 100644 --- a/views/Settings/NodeConfiguration.tsx +++ b/views/Settings/NodeConfiguration.tsx @@ -1671,15 +1671,15 @@ export default class NodeConfiguration extends React.Component< const styles = StyleSheet.create({ text: { - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, whiteText: { color: 'white', - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, blackText: { color: 'black', - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, form: { paddingTop: 20, diff --git a/views/Settings/Nodes.tsx b/views/Settings/Nodes.tsx index 4fc72d061..72f963460 100644 --- a/views/Settings/Nodes.tsx +++ b/views/Settings/Nodes.tsx @@ -136,7 +136,7 @@ export default class Nodes extends React.Component { text: localeString('views.Settings.Nodes.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} rightComponent={} @@ -205,7 +205,8 @@ export default class Nodes extends React.Component { {NodeTitle(item, 32)} @@ -215,7 +216,8 @@ export default class Nodes extends React.Component { color: themeColor( 'secondaryText' ), - fontFamily: 'Lato-Regular' + fontFamily: + 'PPNeueMontreal-Book' }} > {nodeSubtitle} diff --git a/views/Settings/Olympians.tsx b/views/Settings/Olympians.tsx index ba7d0eaea..8ebf84e89 100644 --- a/views/Settings/Olympians.tsx +++ b/views/Settings/Olympians.tsx @@ -38,7 +38,7 @@ export default class Olympians extends React.Component { text: localeString('views.Olympians.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} diff --git a/views/Settings/PaymentsSettings.tsx b/views/Settings/PaymentsSettings.tsx index 3dbca67f2..0152707ee 100644 --- a/views/Settings/PaymentsSettings.tsx +++ b/views/Settings/PaymentsSettings.tsx @@ -91,7 +91,7 @@ export default class PaymentsSettings extends React.Component< text: localeString('views.Settings.Payments.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -106,7 +106,7 @@ export default class PaymentsSettings extends React.Component< <> diff --git a/views/Settings/PointOfSale.tsx b/views/Settings/PointOfSale.tsx index e25de6c4e..7252dcf4e 100644 --- a/views/Settings/PointOfSale.tsx +++ b/views/Settings/PointOfSale.tsx @@ -109,7 +109,7 @@ export default class PointOfSale extends React.Component< text: localeString('general.pos'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -151,7 +151,7 @@ export default class PointOfSale extends React.Component< @@ -194,7 +194,7 @@ export default class PointOfSale extends React.Component< {localeString( @@ -225,7 +225,7 @@ export default class PointOfSale extends React.Component< {localeString( @@ -256,7 +256,7 @@ export default class PointOfSale extends React.Component< {localeString( @@ -323,7 +323,8 @@ export default class PointOfSale extends React.Component< color: themeColor( 'secondaryText' ), - fontFamily: 'Lato-Regular', + fontFamily: + 'PPNeueMontreal-Book', left: -10 }} > @@ -374,7 +375,8 @@ export default class PointOfSale extends React.Component< color: themeColor( 'secondaryText' ), - fontFamily: 'Lato-Regular', + fontFamily: + 'PPNeueMontreal-Book', left: -10 }} > @@ -433,7 +435,8 @@ export default class PointOfSale extends React.Component< {item.label} diff --git a/views/Settings/PointOfSaleRecon.tsx b/views/Settings/PointOfSaleRecon.tsx index 5572a0be3..6810e17d5 100644 --- a/views/Settings/PointOfSaleRecon.tsx +++ b/views/Settings/PointOfSaleRecon.tsx @@ -134,7 +134,7 @@ export default class PointOfSaleRecon extends React.PureComponent< const oneDButton = () => ( ( ( ( ( ( {amount} diff --git a/views/Settings/Privacy.tsx b/views/Settings/Privacy.tsx index 46fcc6f7d..ac4d40cd3 100644 --- a/views/Settings/Privacy.tsx +++ b/views/Settings/Privacy.tsx @@ -94,7 +94,7 @@ export default class Privacy extends React.Component< text: localeString('views.Settings.Privacy.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -130,7 +130,7 @@ export default class Privacy extends React.Component< {localeString( @@ -168,7 +168,7 @@ export default class Privacy extends React.Component< style={{ color: themeColor('secondaryText'), fontSize: 17, - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', left: -10 }} infoText={localeString( @@ -213,7 +213,7 @@ export default class Privacy extends React.Component< style={{ color: themeColor('secondaryText'), fontSize: 17, - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', left: -10 }} infoText={[ @@ -262,7 +262,7 @@ export default class Privacy extends React.Component< diff --git a/views/Settings/Security.tsx b/views/Settings/Security.tsx index f3218fe8f..17ca29513 100644 --- a/views/Settings/Security.tsx +++ b/views/Settings/Security.tsx @@ -200,7 +200,7 @@ export default class Security extends React.Component< {localeString(item.translateKey)} @@ -234,7 +234,7 @@ export default class Security extends React.Component< text: localeString('views.Settings.Security.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -258,7 +258,7 @@ export default class Security extends React.Component< {localeString( @@ -285,7 +285,7 @@ export default class Security extends React.Component< {localeString( @@ -316,7 +316,7 @@ export default class Security extends React.Component< {localeString( diff --git a/views/Settings/Seed.tsx b/views/Settings/Seed.tsx index d4557093d..17b746761 100644 --- a/views/Settings/Seed.tsx +++ b/views/Settings/Seed.tsx @@ -54,7 +54,7 @@ const MnemonicWord = ({ index, word }) => { { { text: localeString('views.Settings.Seed.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} rightComponent={ @@ -208,7 +208,7 @@ export default class Seed extends React.PureComponent { { { { { const styles = StyleSheet.create({ text: { - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, whiteText: { color: 'white', - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, blackText: { color: 'black', - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, button: { paddingTop: 10, diff --git a/views/Settings/SelectCurrency.tsx b/views/Settings/SelectCurrency.tsx index 910efdfa4..cc48bb73c 100644 --- a/views/Settings/SelectCurrency.tsx +++ b/views/Settings/SelectCurrency.tsx @@ -89,7 +89,7 @@ export default class SelectCurrency extends React.Component< ), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -100,7 +100,7 @@ export default class SelectCurrency extends React.Component< value={search} inputStyle={{ color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }} placeholderTextColor={themeColor('secondaryText')} containerStyle={{ @@ -148,7 +148,7 @@ export default class SelectCurrency extends React.Component< item.value === DEFAULT_FIAT) ? themeColor('highlight') : themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }} > {item.key} diff --git a/views/Settings/SetDuressPassword.tsx b/views/Settings/SetDuressPassword.tsx index fc814a81d..5ce20a233 100644 --- a/views/Settings/SetDuressPassword.tsx +++ b/views/Settings/SetDuressPassword.tsx @@ -122,7 +122,7 @@ export default class SetDuressPassphrase extends React.Component< ), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -245,6 +245,6 @@ export default class SetDuressPassphrase extends React.Component< const styles = StyleSheet.create({ text: { - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }); diff --git a/views/Settings/SetDuressPin.tsx b/views/Settings/SetDuressPin.tsx index 120707171..c49ad41b9 100644 --- a/views/Settings/SetDuressPin.tsx +++ b/views/Settings/SetDuressPin.tsx @@ -230,13 +230,13 @@ export default class SetDuressPin extends React.Component< const styles = StyleSheet.create({ mainText: { - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', fontSize: 20, textAlign: 'center', marginTop: 50 }, secondaryText: { - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', textAlign: 'center' } }); diff --git a/views/Settings/SetPassword.tsx b/views/Settings/SetPassword.tsx index deaf2577f..b915da1db 100644 --- a/views/Settings/SetPassword.tsx +++ b/views/Settings/SetPassword.tsx @@ -126,7 +126,7 @@ export default class SetPassphrase extends React.Component< text: localeString('views.Settings.SetPassword.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -240,6 +240,6 @@ export default class SetPassphrase extends React.Component< const styles = StyleSheet.create({ text: { - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }); diff --git a/views/Settings/SetPin.tsx b/views/Settings/SetPin.tsx index 8163f16eb..6b5da52e6 100644 --- a/views/Settings/SetPin.tsx +++ b/views/Settings/SetPin.tsx @@ -231,13 +231,13 @@ export default class SetPin extends React.Component { const styles = StyleSheet.create({ mainText: { - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', fontSize: 20, textAlign: 'center', marginTop: 10 }, secondaryText: { - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', textAlign: 'center' } }); diff --git a/views/Settings/Settings.tsx b/views/Settings/Settings.tsx index 9f92e8652..84bc15489 100644 --- a/views/Settings/Settings.tsx +++ b/views/Settings/Settings.tsx @@ -116,9 +116,7 @@ export default class Settings extends React.Component< onPress={() => UrlUtils.goToUrl('https://olympusln.com')} accessibilityLabel={localeString('views.Settings.olympus')} > - - - + ); @@ -141,7 +139,7 @@ export default class Settings extends React.Component< text: localeString('views.Settings.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} rightComponent={OlympusButton} @@ -189,7 +187,7 @@ export default class Settings extends React.Component< fontSize: 20, color: themeColor('text'), paddingLeft: 20, - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }} > {selectedNode @@ -216,7 +214,7 @@ export default class Settings extends React.Component< opacity: 0.6, top: -10, paddingLeft: 85, - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }} > {nodeSubtitle} @@ -1079,12 +1077,12 @@ export default class Settings extends React.Component< fontSize: 16, color: '#A7A9AC', alignSelf: 'center', - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', marginTop: 5, marginBottom: 20 }} > - {`Zeus v${version}`} + {`ZEUS v${version}`} @@ -1106,7 +1104,7 @@ const styles = StyleSheet.create({ marginLeft: -55, paddingTop: 5, flex: 1, - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, separationLine: { left: 100, diff --git a/views/Settings/SignVerifyMessage.tsx b/views/Settings/SignVerifyMessage.tsx index 8e00f9e51..a98b7cbd8 100644 --- a/views/Settings/SignVerifyMessage.tsx +++ b/views/Settings/SignVerifyMessage.tsx @@ -132,7 +132,7 @@ export default class SignVerifyMessage extends React.Component< text: localeString('views.Settings.SignMessage.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -369,7 +369,7 @@ const styles = StyleSheet.create({ paddingRight: 5 }, text: { - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, textInput: { fontSize: 20, diff --git a/views/Settings/Sponsors.tsx b/views/Settings/Sponsors.tsx index 041dcd48e..a39246d39 100644 --- a/views/Settings/Sponsors.tsx +++ b/views/Settings/Sponsors.tsx @@ -38,7 +38,7 @@ function Sponsors(props: SponsorsProps) { text: localeString('views.Sponsors.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -57,7 +57,7 @@ function Sponsors(props: SponsorsProps) { {item.label} diff --git a/views/Settings/Support.tsx b/views/Settings/Support.tsx index c31924ed5..7e4e2dd1a 100644 --- a/views/Settings/Support.tsx +++ b/views/Settings/Support.tsx @@ -45,7 +45,7 @@ function Support(props: SupportProps) { text: localeString('views.Settings.Support.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -67,7 +67,7 @@ function Support(props: SupportProps) { {item.label} diff --git a/views/Sweep.tsx b/views/Sweep.tsx index 711b1d437..8ca551c45 100644 --- a/views/Sweep.tsx +++ b/views/Sweep.tsx @@ -166,7 +166,7 @@ export default class Sweep extends React.Component { text: localeString('views.Sweep.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} rightComponent={ @@ -236,7 +236,7 @@ export default class Sweep extends React.Component { <> @@ -257,7 +257,7 @@ export default class Sweep extends React.Component { <> @@ -318,10 +318,10 @@ export default class Sweep extends React.Component { const styles = StyleSheet.create({ text: { - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, secondaryText: { - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }, content: { padding: 20 @@ -340,7 +340,7 @@ const styles = StyleSheet.create({ alignItems: 'center' }, label: { - fontFamily: 'Lato-Regular', + fontFamily: 'PPNeueMontreal-Book', paddingTop: 5 } }); diff --git a/views/Sync.tsx b/views/Sync.tsx index 418a6be8f..c67b2dd50 100644 --- a/views/Sync.tsx +++ b/views/Sync.tsx @@ -34,7 +34,7 @@ export default class Sync extends React.PureComponent { text: localeString('views.Sync.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} diff --git a/views/Transaction.tsx b/views/Transaction.tsx index 2d3a2e9f3..ffc0b93db 100644 --- a/views/Transaction.tsx +++ b/views/Transaction.tsx @@ -138,7 +138,7 @@ export default class TransactionView extends React.Component { text: localeString('views.Transaction.title'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} rightComponent={EditNotesButton} @@ -175,7 +175,8 @@ export default class TransactionView extends React.Component { {getFeePercentage && ( @@ -362,6 +363,6 @@ const styles = StyleSheet.create({ }, valueWithLink: { paddingBottom: 5, - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }); diff --git a/views/UTXOs/CoinControl.tsx b/views/UTXOs/CoinControl.tsx index caee4ca77..15d7a0315 100644 --- a/views/UTXOs/CoinControl.tsx +++ b/views/UTXOs/CoinControl.tsx @@ -57,7 +57,7 @@ export default class CoinControl extends React.Component { : localeString('general.coins'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -132,7 +132,7 @@ export default class CoinControl extends React.Component { }} titleStyle={{ color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' }} /> )} diff --git a/views/UTXOs/UTXO.tsx b/views/UTXOs/UTXO.tsx index 041077dd6..7c181c426 100644 --- a/views/UTXOs/UTXO.tsx +++ b/views/UTXOs/UTXO.tsx @@ -47,7 +47,7 @@ export default class UTXO extends React.Component { text: localeString('general.utxo'), style: { color: themeColor('text'), - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }} navigation={navigation} @@ -150,6 +150,6 @@ const styles = StyleSheet.create({ }, valueWithLink: { paddingBottom: 5, - fontFamily: 'Lato-Regular' + fontFamily: 'PPNeueMontreal-Book' } }); diff --git a/views/Wallet/BalancePane.tsx b/views/Wallet/BalancePane.tsx index 32d571634..85fc9980f 100644 --- a/views/Wallet/BalancePane.tsx +++ b/views/Wallet/BalancePane.tsx @@ -181,7 +181,7 @@ export default class BalancePane extends React.PureComponent< > @@ -191,7 +191,7 @@ export default class BalancePane extends React.PureComponent< @@ -290,7 +292,8 @@ export default class BalancePane extends React.PureComponent< {FiatStore.numberWithCommas(amount)} @@ -409,8 +409,7 @@ export default class KeypadPane extends React.PureComponent< icon={{ name: 'pencil', type: 'font-awesome', - size: 20, - color: themeColor('text') + size: 20 }} quinary noUppercase diff --git a/views/Wallet/PosPane.tsx b/views/Wallet/PosPane.tsx index 7d7d5fd22..6d8e9cc92 100644 --- a/views/Wallet/PosPane.tsx +++ b/views/Wallet/PosPane.tsx @@ -222,7 +222,7 @@ export default class PosPane extends React.PureComponent< const openOrdersButton = () => ( ( { top: 10 }} > - + > + +