diff --git a/CHANGELOG.md b/CHANGELOG.md index bf594d1bc0e..8126149e024 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,7 +10,17 @@ - added: (Zcash) Add NU6 support -## 4.17.0 +## 4.18.0 + +- added: Support for LLD & LLM transaction history +- added: Close button (X) for `EdgeModals,` specifically if a desktop platform is detected. +- changed: Auto-enable required tokens when navigating to `Stake*` scenes +- fixed: Incorrect `SwapInput` amounts on `SwapCreateScene` after changing wallet. +- fixed: Backing up a light account while on the `FiatPluginEnterAmountScene` retains light account-related quote errors +- fixed: Various `EarnScene` display bugs +- fixed: `EarnScene` missing wallet creation option in "Discover" view + +## 4.17.0 (2024-11-12) - added: Add TON - added: Log swap errors to Sentry. @@ -18,7 +28,12 @@ - added: Add TON support to Banxa, Moonpay, Paybis, and Simplex fiat plugins - added: Add OSMO support to Moonpay fiat plugin - added: New post-install survey option for "BTCTKVR Magazine". +- changed: Redesign `StakingReturnsCard,` specifically for `StakeOverviewScene` +- changed: `EarnScene` shows all possible stake options, instead of only those for enabled wallets +- changed: `EarnScene` shows one card per stake option if multiple wallets have stake positions on that stake option +- changed: `EarnScene` only intializes stake options once, regardless of re-navigation to the scene - changed: `FiatProviderError` messages now include `FiatProviderQuoteError` info. +- changed: (Android) Add prompt for user to change battery optimization setting - changed: Add explicit gas limit for Kiln staking. - changed: Various strings updated to UK compliance spec - changed: Track array of errors or AggregateErrors separately with a common tag @@ -26,12 +41,14 @@ - changed: Verbiage for login request scene for QR login has been updated to remove ambiguity. - changed: Wording in light account persistent notification - changed: (Android) Allow exporting multiple files +- fixed: Replace deprecated Unstoppable Domains fetch call with SDK - fixed: Correctly report ETH Kiln balances - fixed: Fix error massaging in trackError - fixed: Normalized error messages for tracking; removing localization from error messages. - fixed: Remove Kado deposit details for "Sell" orders. - fixed: Sentry tagging and metadata data wasn't formed properly and caused some loss of tracked errors. - fixed: Use Sentry context for logging metadata in `EdgeCrashEvent` +- fixed: Fix `currencyWallets` object reference in deep link paths that support wallet creation - removed: Bank Wire Transfer Buy for Florida - removed: Paypal Sell for Canada - removed: Moonpay, Simplex, and Paybis for UK @@ -63,7 +80,7 @@ - fixed: ACH sell option for Florida visible with no accepted currencies - fixed: Slow `TransactionDetailsScene` navigation on slow networks -## 4.15.1 (2024-10-18) +## 4.15.1 (2024-10-21) - fixed: "Apple Pay" title per latest branding requirements diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 1827f9ecfb7..bcc67262c55 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -17,13 +17,13 @@ PODS: - DoubleConversion (1.1.6) - edge-core-js (2.20.1): - React-Core - - edge-currency-accountbased (4.27.1): + - edge-currency-accountbased (4.28.0): - React-Core - edge-currency-plugins (3.4.4): - React-Core - - edge-exchange-plugins (2.13.0): + - edge-exchange-plugins (2.14.0): - React-Core - - edge-login-ui-rn (3.23.0): + - edge-login-ui-rn (3.24.0): - React-Core - EXApplication (5.1.1): - ExpoModulesCore @@ -534,7 +534,7 @@ PODS: - React-Core - RNDateTimePicker (7.2.0): - React-Core - - RNDeviceInfo (10.11.0): + - RNDeviceInfo (13.2.0): - React-Core - RNFastImage (8.5.11): - React-Core @@ -1079,12 +1079,12 @@ SPEC CHECKSUMS: CNIOLinux: 62e3505f50de558c393dc2f273dde71dcce518da CNIOWindows: 3047f2d8165848a3936a0a755fee27c6b5ee479b disklet: e7ed3e673ccad9d175a1675f9f3589ffbf69a5fd - DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 + DoubleConversion: 76ab83afb40bddeeee456813d9c04f67f78771b5 edge-core-js: 9264309f29f398da3b714dc5e80702f102f9db2d - edge-currency-accountbased: 3ed33409d304a969392c9e205d115521aab49b8a + edge-currency-accountbased: 298a981da054f4d3a1c3600641c150526560db96 edge-currency-plugins: 95577a282061148263207fad9befe11bb07a57c1 - edge-exchange-plugins: 896eb55d2a03140bae7b45321efa9e9ac3d3bbe6 - edge-login-ui-rn: 58ee453724222a7feac090500587db8cbf2dd083 + edge-exchange-plugins: 2883457575c970671c5e63e547907dd40234a323 + edge-login-ui-rn: 70f8057108ae213e43583a0b3876c88c500c27bc EXApplication: d8f53a7eee90a870a75656280e8d4b85726ea903 EXConstants: f348da07e21b23d2b085e270d7b74f282df1a7d9 EXFileSystem: 844e86ca9b5375486ecc4ef06d3838d5597d895d @@ -1101,7 +1101,7 @@ SPEC CHECKSUMS: FirebaseInstallations: 766dabca09fd94aef922538aaf144cc4a6fb6869 FirebaseMessaging: 585984d0a1df120617eb10b44cad8968b859815e fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b + glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15 gRPC-Swift: 74adcaaa62ac5e0a018938840328cb1fdfb09e7b @@ -1162,7 +1162,7 @@ SPEC CHECKSUMS: RNCClipboard: 0a720adef5ec193aa0e3de24c3977222c7e52a37 RNCPicker: 6d5d64e7b90c240c779ee0938ec433c11e2dd758 RNDateTimePicker: 3942382593f104af226ad9c56e16166960c7ae30 - RNDeviceInfo: bf8a32acbcb875f568217285d1793b0e8588c974 + RNDeviceInfo: 29e01d5ae94bdb5a0f6c11a4c438132545b4df80 RNFastImage: 1f2cab428712a4baaf78d6169eaec7f622556dd7 RNFBApp: 9acbe359ef3559d6f8ca5c350db471f2b352f98a RNFBMessaging: b82ef70d252500d3ad104284c0c7f8e1cd22b51e diff --git a/jestSetup.js b/jestSetup.js index 6c2626e2531..d56ef11dc76 100644 --- a/jestSetup.js +++ b/jestSetup.js @@ -245,3 +245,17 @@ jest.mock('use-context-selector', () => { } } }) + +jest.mock('react-native-device-info', () => { + return { + getDeviceType: jest.fn(), + hasNotch: jest.fn(), + getBuildNumber: jest.fn(), + getVersion: jest.fn() + } +}) + +jest.mock('react-native-reorderable-list', () => ({ + ...jest.requireActual('react-native-reorderable-list'), + useReorderableDrag: () => jest.fn() +})) diff --git a/package.json b/package.json index 1dd336a848c..c5964143ffb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "edge-react-gui", - "version": "4.17.2", + "version": "4.18.0", "private": true, "description": "Edge Wallet React GUI", "homepage": "https://edge.app", @@ -81,6 +81,7 @@ "@react-navigation/stack": "^6.3.12", "@sentry/react-native": "^5.33.1", "@types/jsrsasign": "^10.5.13", + "@unstoppabledomains/resolution": "^9.3.0", "@walletconnect/react-native-compat": "^2.11.0", "@walletconnect/web3wallet": "^1.10.1", "assert": "^2.0.0", @@ -98,12 +99,12 @@ "detect-bundler": "^1.1.0", "disklet": "^0.5.2", "edge-core-js": "^2.20.1", - "edge-currency-accountbased": "^4.27.1", + "edge-currency-accountbased": "^4.28.0", "edge-currency-monero": "^1.3.1", "edge-currency-plugins": "^3.4.4", - "edge-exchange-plugins": "^2.13.0", + "edge-exchange-plugins": "^2.14.0", "edge-info-server": "^3.0.1", - "edge-login-ui-rn": "^3.23.0", + "edge-login-ui-rn": "^3.24.0", "ethers": "^5.7.2", "expo": "^48.0.0", "jsrsasign": "^11.1.0", @@ -115,13 +116,13 @@ "react": "18.2.0", "react-native": "0.71.15", "react-native-airship": "^0.2.12", + "react-native-battery-optimization-check": "^1.0.8", "react-native-bootsplash": "^4.7.4", "react-native-camera": "^1.13.1", "react-native-confetti-cannon": "^1.5.2", "react-native-contacts": "^7.0.4", "react-native-custom-tabs": "https://github.com/adminphoeniixx/react-native-custom-tabs#develop", - "react-native-device-info": "^10.11.0", - "react-native-draggable-flatlist": "^4.0.1", + "react-native-device-info": "^13.2.0", "react-native-email-link": "^1.14.5", "react-native-fast-image": "^8.5.11", "react-native-fast-shadow": "^0.1.0", @@ -142,8 +143,8 @@ "react-native-patina": "^0.1.6", "react-native-permissions": "^4.1.5", "react-native-piratechain": "^0.5.5", - "react-native-power-saving-mode": "^0.1.1", "react-native-reanimated": "^3.14.0", + "react-native-reorderable-list": "^0.5.0", "react-native-safari-view": "^2.1.0", "react-native-safe-area-context": "^4.10.1", "react-native-screens": "^3.31.1", diff --git a/patches/react-native-power-saving-mode+0.1.1.patch b/patches/react-native-power-saving-mode+0.1.1.patch deleted file mode 100644 index d9eee9361d9..00000000000 --- a/patches/react-native-power-saving-mode+0.1.1.patch +++ /dev/null @@ -1,3735 +0,0 @@ -diff --git a/node_modules/react-native-power-saving-mode/android/build.gradle b/node_modules/react-native-power-saving-mode/android/build.gradle -index cbb99af..dfdfbdf 100644 ---- a/node_modules/react-native-power-saving-mode/android/build.gradle -+++ b/node_modules/react-native-power-saving-mode/android/build.gradle -@@ -1,23 +1,22 @@ -- - buildscript { - repositories { -+ google() - jcenter() - } -- - dependencies { -- classpath "com.android.tools.build:gradle:1.3.1" -+ classpath 'com.android.tools.build:gradle:4.2.2' - } - } - --apply plugin: "com.android.library" -+apply plugin: 'com.android.library' - - android { -- compileSdkVersion 23 -- buildToolsVersion "23.0.1" -+ compileSdkVersion 31 -+ buildToolsVersion '31.0.0' - - defaultConfig { - minSdkVersion 16 -- targetSdkVersion 22 -+ targetSdkVersion 31 - versionCode 1 - versionName "0.1.0" - } -@@ -27,10 +26,11 @@ android { - } - - repositories { -+ google() -+ jcenter() - mavenCentral() - } - - dependencies { -- compile "com.facebook.react:react-native:+" -+ implementation 'com.facebook.react:react-native:+' - } -- -\ No newline at end of file -diff --git a/node_modules/react-native-power-saving-mode/android/build/.transforms/03616ef66df03dc7059430a9527f0f15/results.bin b/node_modules/react-native-power-saving-mode/android/build/.transforms/03616ef66df03dc7059430a9527f0f15/results.bin -new file mode 100644 -index 0000000..28bb879 ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/.transforms/03616ef66df03dc7059430a9527f0f15/results.bin -@@ -0,0 +1 @@ -+o/classes.jar -diff --git a/node_modules/react-native-power-saving-mode/android/build/.transforms/03616ef66df03dc7059430a9527f0f15/transformed/classes.jar b/node_modules/react-native-power-saving-mode/android/build/.transforms/03616ef66df03dc7059430a9527f0f15/transformed/classes.jar -new file mode 100644 -index 0000000..85404ed -Binary files /dev/null and b/node_modules/react-native-power-saving-mode/android/build/.transforms/03616ef66df03dc7059430a9527f0f15/transformed/classes.jar differ -diff --git a/node_modules/react-native-power-saving-mode/android/build/.transforms/e755c38410478335c247a66a1a297e34/results.bin b/node_modules/react-native-power-saving-mode/android/build/.transforms/e755c38410478335c247a66a1a297e34/results.bin -new file mode 100644 -index 0000000..0d259dd ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/.transforms/e755c38410478335c247a66a1a297e34/results.bin -@@ -0,0 +1 @@ -+o/classes -diff --git a/node_modules/react-native-power-saving-mode/android/build/.transforms/e755c38410478335c247a66a1a297e34/transformed/classes/classes.dex b/node_modules/react-native-power-saving-mode/android/build/.transforms/e755c38410478335c247a66a1a297e34/transformed/classes/classes.dex -new file mode 100644 -index 0000000..c56b9cf -Binary files /dev/null and b/node_modules/react-native-power-saving-mode/android/build/.transforms/e755c38410478335c247a66a1a297e34/transformed/classes/classes.dex differ -diff --git a/node_modules/react-native-power-saving-mode/android/build/generated/source/buildConfig/debug/io/powerSavingMode/BuildConfig.java b/node_modules/react-native-power-saving-mode/android/build/generated/source/buildConfig/debug/io/powerSavingMode/BuildConfig.java -new file mode 100644 -index 0000000..2106a7b ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/generated/source/buildConfig/debug/io/powerSavingMode/BuildConfig.java -@@ -0,0 +1,10 @@ -+/** -+ * Automatically generated file. DO NOT MODIFY -+ */ -+package io.powerSavingMode; -+ -+public final class BuildConfig { -+ public static final boolean DEBUG = Boolean.parseBoolean("true"); -+ public static final String LIBRARY_PACKAGE_NAME = "io.powerSavingMode"; -+ public static final String BUILD_TYPE = "debug"; -+} -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml b/node_modules/react-native-power-saving-mode/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml -new file mode 100644 -index 0000000..e127624 ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml -@@ -0,0 +1,7 @@ -+ -+ -+ -+ -+ -+ -\ No newline at end of file -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json b/node_modules/react-native-power-saving-mode/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json -new file mode 100644 -index 0000000..ea26998 ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json -@@ -0,0 +1,18 @@ -+{ -+ "version": 3, -+ "artifactType": { -+ "type": "AAPT_FRIENDLY_MERGED_MANIFESTS", -+ "kind": "Directory" -+ }, -+ "applicationId": "io.powerSavingMode", -+ "variantName": "debug", -+ "elements": [ -+ { -+ "type": "SINGLE", -+ "filters": [], -+ "attributes": [], -+ "outputFile": "AndroidManifest.xml" -+ } -+ ], -+ "elementType": "File" -+} -\ No newline at end of file -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/aar_metadata/debug/aar-metadata.properties b/node_modules/react-native-power-saving-mode/android/build/intermediates/aar_metadata/debug/aar-metadata.properties -new file mode 100644 -index 0000000..776557e ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/aar_metadata/debug/aar-metadata.properties -@@ -0,0 +1,5 @@ -+aarFormatVersion=1.0 -+aarMetadataVersion=1.0 -+minCompileSdk=1 -+minCompileSdkExtension=0 -+minAndroidGradlePluginVersion=1.0.0 -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/annotation_processor_list/debug/annotationProcessors.json b/node_modules/react-native-power-saving-mode/android/build/intermediates/annotation_processor_list/debug/annotationProcessors.json -new file mode 100644 -index 0000000..9e26dfe ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/annotation_processor_list/debug/annotationProcessors.json -@@ -0,0 +1 @@ -+{} -\ No newline at end of file -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/compile_library_classes_jar/debug/classes.jar b/node_modules/react-native-power-saving-mode/android/build/intermediates/compile_library_classes_jar/debug/classes.jar -new file mode 100644 -index 0000000..c0ef78e -Binary files /dev/null and b/node_modules/react-native-power-saving-mode/android/build/intermediates/compile_library_classes_jar/debug/classes.jar differ -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/compile_r_class_jar/debug/R.jar b/node_modules/react-native-power-saving-mode/android/build/intermediates/compile_r_class_jar/debug/R.jar -new file mode 100644 -index 0000000..9f2fd82 -Binary files /dev/null and b/node_modules/react-native-power-saving-mode/android/build/intermediates/compile_r_class_jar/debug/R.jar differ -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/compile_symbol_list/debug/R.txt b/node_modules/react-native-power-saving-mode/android/build/intermediates/compile_symbol_list/debug/R.txt -new file mode 100644 -index 0000000..7c9d30e ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/compile_symbol_list/debug/R.txt -@@ -0,0 +1,1953 @@ -+int anim abc_fade_in 0x0 -+int anim abc_fade_out 0x0 -+int anim abc_grow_fade_in_from_bottom 0x0 -+int anim abc_popup_enter 0x0 -+int anim abc_popup_exit 0x0 -+int anim abc_shrink_fade_out_from_bottom 0x0 -+int anim abc_slide_in_bottom 0x0 -+int anim abc_slide_in_top 0x0 -+int anim abc_slide_out_bottom 0x0 -+int anim abc_slide_out_top 0x0 -+int anim abc_tooltip_enter 0x0 -+int anim abc_tooltip_exit 0x0 -+int anim btn_checkbox_to_checked_box_inner_merged_animation 0x0 -+int anim btn_checkbox_to_checked_box_outer_merged_animation 0x0 -+int anim btn_checkbox_to_checked_icon_null_animation 0x0 -+int anim btn_checkbox_to_unchecked_box_inner_merged_animation 0x0 -+int anim btn_checkbox_to_unchecked_check_path_merged_animation 0x0 -+int anim btn_checkbox_to_unchecked_icon_null_animation 0x0 -+int anim btn_radio_to_off_mtrl_dot_group_animation 0x0 -+int anim btn_radio_to_off_mtrl_ring_outer_animation 0x0 -+int anim btn_radio_to_off_mtrl_ring_outer_path_animation 0x0 -+int anim btn_radio_to_on_mtrl_dot_group_animation 0x0 -+int anim btn_radio_to_on_mtrl_ring_outer_animation 0x0 -+int anim btn_radio_to_on_mtrl_ring_outer_path_animation 0x0 -+int anim catalyst_fade_in 0x0 -+int anim catalyst_fade_out 0x0 -+int anim catalyst_push_up_in 0x0 -+int anim catalyst_push_up_out 0x0 -+int anim catalyst_slide_down 0x0 -+int anim catalyst_slide_up 0x0 -+int anim fragment_fast_out_extra_slow_in 0x0 -+int animator fragment_close_enter 0x0 -+int animator fragment_close_exit 0x0 -+int animator fragment_fade_enter 0x0 -+int animator fragment_fade_exit 0x0 -+int animator fragment_open_enter 0x0 -+int animator fragment_open_exit 0x0 -+int attr actionBarDivider 0x0 -+int attr actionBarItemBackground 0x0 -+int attr actionBarPopupTheme 0x0 -+int attr actionBarSize 0x0 -+int attr actionBarSplitStyle 0x0 -+int attr actionBarStyle 0x0 -+int attr actionBarTabBarStyle 0x0 -+int attr actionBarTabStyle 0x0 -+int attr actionBarTabTextStyle 0x0 -+int attr actionBarTheme 0x0 -+int attr actionBarWidgetTheme 0x0 -+int attr actionButtonStyle 0x0 -+int attr actionDropDownStyle 0x0 -+int attr actionLayout 0x0 -+int attr actionMenuTextAppearance 0x0 -+int attr actionMenuTextColor 0x0 -+int attr actionModeBackground 0x0 -+int attr actionModeCloseButtonStyle 0x0 -+int attr actionModeCloseContentDescription 0x0 -+int attr actionModeCloseDrawable 0x0 -+int attr actionModeCopyDrawable 0x0 -+int attr actionModeCutDrawable 0x0 -+int attr actionModeFindDrawable 0x0 -+int attr actionModePasteDrawable 0x0 -+int attr actionModePopupWindowStyle 0x0 -+int attr actionModeSelectAllDrawable 0x0 -+int attr actionModeShareDrawable 0x0 -+int attr actionModeSplitBackground 0x0 -+int attr actionModeStyle 0x0 -+int attr actionModeTheme 0x0 -+int attr actionModeWebSearchDrawable 0x0 -+int attr actionOverflowButtonStyle 0x0 -+int attr actionOverflowMenuStyle 0x0 -+int attr actionProviderClass 0x0 -+int attr actionViewClass 0x0 -+int attr activityChooserViewStyle 0x0 -+int attr actualImageResource 0x0 -+int attr actualImageScaleType 0x0 -+int attr actualImageUri 0x0 -+int attr alertDialogButtonGroupStyle 0x0 -+int attr alertDialogCenterButtons 0x0 -+int attr alertDialogStyle 0x0 -+int attr alertDialogTheme 0x0 -+int attr allowStacking 0x0 -+int attr alpha 0x0 -+int attr alphabeticModifiers 0x0 -+int attr arrowHeadLength 0x0 -+int attr arrowShaftLength 0x0 -+int attr autoCompleteTextViewStyle 0x0 -+int attr autoSizeMaxTextSize 0x0 -+int attr autoSizeMinTextSize 0x0 -+int attr autoSizePresetSizes 0x0 -+int attr autoSizeStepGranularity 0x0 -+int attr autoSizeTextType 0x0 -+int attr autofillInlineSuggestionChip 0x0 -+int attr autofillInlineSuggestionEndIconStyle 0x0 -+int attr autofillInlineSuggestionStartIconStyle 0x0 -+int attr autofillInlineSuggestionSubtitle 0x0 -+int attr autofillInlineSuggestionTitle 0x0 -+int attr background 0x0 -+int attr backgroundImage 0x0 -+int attr backgroundSplit 0x0 -+int attr backgroundStacked 0x0 -+int attr backgroundTint 0x0 -+int attr backgroundTintMode 0x0 -+int attr barLength 0x0 -+int attr borderlessButtonStyle 0x0 -+int attr buttonBarButtonStyle 0x0 -+int attr buttonBarNegativeButtonStyle 0x0 -+int attr buttonBarNeutralButtonStyle 0x0 -+int attr buttonBarPositiveButtonStyle 0x0 -+int attr buttonBarStyle 0x0 -+int attr buttonCompat 0x0 -+int attr buttonGravity 0x0 -+int attr buttonIconDimen 0x0 -+int attr buttonPanelSideLayout 0x0 -+int attr buttonStyle 0x0 -+int attr buttonStyleSmall 0x0 -+int attr buttonTint 0x0 -+int attr buttonTintMode 0x0 -+int attr checkMarkCompat 0x0 -+int attr checkMarkTint 0x0 -+int attr checkMarkTintMode 0x0 -+int attr checkboxStyle 0x0 -+int attr checkedTextViewStyle 0x0 -+int attr closeIcon 0x0 -+int attr closeItemLayout 0x0 -+int attr collapseContentDescription 0x0 -+int attr collapseIcon 0x0 -+int attr color 0x0 -+int attr colorAccent 0x0 -+int attr colorBackgroundFloating 0x0 -+int attr colorButtonNormal 0x0 -+int attr colorControlActivated 0x0 -+int attr colorControlHighlight 0x0 -+int attr colorControlNormal 0x0 -+int attr colorError 0x0 -+int attr colorPrimary 0x0 -+int attr colorPrimaryDark 0x0 -+int attr colorSwitchThumbNormal 0x0 -+int attr commitIcon 0x0 -+int attr contentDescription 0x0 -+int attr contentInsetEnd 0x0 -+int attr contentInsetEndWithActions 0x0 -+int attr contentInsetLeft 0x0 -+int attr contentInsetRight 0x0 -+int attr contentInsetStart 0x0 -+int attr contentInsetStartWithNavigation 0x0 -+int attr controlBackground 0x0 -+int attr customNavigationLayout 0x0 -+int attr defaultQueryHint 0x0 -+int attr dialogCornerRadius 0x0 -+int attr dialogPreferredPadding 0x0 -+int attr dialogTheme 0x0 -+int attr displayOptions 0x0 -+int attr divider 0x0 -+int attr dividerHorizontal 0x0 -+int attr dividerPadding 0x0 -+int attr dividerVertical 0x0 -+int attr drawableBottomCompat 0x0 -+int attr drawableEndCompat 0x0 -+int attr drawableLeftCompat 0x0 -+int attr drawableRightCompat 0x0 -+int attr drawableSize 0x0 -+int attr drawableStartCompat 0x0 -+int attr drawableTint 0x0 -+int attr drawableTintMode 0x0 -+int attr drawableTopCompat 0x0 -+int attr drawerArrowStyle 0x0 -+int attr dropDownListViewStyle 0x0 -+int attr dropdownListPreferredItemHeight 0x0 -+int attr editTextBackground 0x0 -+int attr editTextColor 0x0 -+int attr editTextStyle 0x0 -+int attr elevation 0x0 -+int attr emojiCompatEnabled 0x0 -+int attr expandActivityOverflowButtonDrawable 0x0 -+int attr fadeDuration 0x0 -+int attr failureImage 0x0 -+int attr failureImageScaleType 0x0 -+int attr firstBaselineToTopHeight 0x0 -+int attr font 0x0 -+int attr fontFamily 0x0 -+int attr fontProviderAuthority 0x0 -+int attr fontProviderCerts 0x0 -+int attr fontProviderFetchStrategy 0x0 -+int attr fontProviderFetchTimeout 0x0 -+int attr fontProviderPackage 0x0 -+int attr fontProviderQuery 0x0 -+int attr fontProviderSystemFontFamily 0x0 -+int attr fontStyle 0x0 -+int attr fontVariationSettings 0x0 -+int attr fontWeight 0x0 -+int attr gapBetweenBars 0x0 -+int attr goIcon 0x0 -+int attr height 0x0 -+int attr hideOnContentScroll 0x0 -+int attr homeAsUpIndicator 0x0 -+int attr homeLayout 0x0 -+int attr icon 0x0 -+int attr iconTint 0x0 -+int attr iconTintMode 0x0 -+int attr iconifiedByDefault 0x0 -+int attr imageButtonStyle 0x0 -+int attr indeterminateProgressStyle 0x0 -+int attr initialActivityCount 0x0 -+int attr isAutofillInlineSuggestionTheme 0x0 -+int attr isLightTheme 0x0 -+int attr itemPadding 0x0 -+int attr lStar 0x0 -+int attr lastBaselineToBottomHeight 0x0 -+int attr layout 0x0 -+int attr lineHeight 0x0 -+int attr listChoiceBackgroundIndicator 0x0 -+int attr listChoiceIndicatorMultipleAnimated 0x0 -+int attr listChoiceIndicatorSingleAnimated 0x0 -+int attr listDividerAlertDialog 0x0 -+int attr listItemLayout 0x0 -+int attr listLayout 0x0 -+int attr listMenuViewStyle 0x0 -+int attr listPopupWindowStyle 0x0 -+int attr listPreferredItemHeight 0x0 -+int attr listPreferredItemHeightLarge 0x0 -+int attr listPreferredItemHeightSmall 0x0 -+int attr listPreferredItemPaddingEnd 0x0 -+int attr listPreferredItemPaddingLeft 0x0 -+int attr listPreferredItemPaddingRight 0x0 -+int attr listPreferredItemPaddingStart 0x0 -+int attr logo 0x0 -+int attr logoDescription 0x0 -+int attr maxButtonHeight 0x0 -+int attr measureWithLargestChild 0x0 -+int attr menu 0x0 -+int attr multiChoiceItemLayout 0x0 -+int attr navigationContentDescription 0x0 -+int attr navigationIcon 0x0 -+int attr navigationMode 0x0 -+int attr nestedScrollViewStyle 0x0 -+int attr numericModifiers 0x0 -+int attr overlapAnchor 0x0 -+int attr overlayImage 0x0 -+int attr paddingBottomNoButtons 0x0 -+int attr paddingEnd 0x0 -+int attr paddingStart 0x0 -+int attr paddingTopNoTitle 0x0 -+int attr panelBackground 0x0 -+int attr panelMenuListTheme 0x0 -+int attr panelMenuListWidth 0x0 -+int attr placeholderImage 0x0 -+int attr placeholderImageScaleType 0x0 -+int attr popupMenuStyle 0x0 -+int attr popupTheme 0x0 -+int attr popupWindowStyle 0x0 -+int attr preserveIconSpacing 0x0 -+int attr pressedStateOverlayImage 0x0 -+int attr progressBarAutoRotateInterval 0x0 -+int attr progressBarImage 0x0 -+int attr progressBarImageScaleType 0x0 -+int attr progressBarPadding 0x0 -+int attr progressBarStyle 0x0 -+int attr queryBackground 0x0 -+int attr queryHint 0x0 -+int attr queryPatterns 0x0 -+int attr radioButtonStyle 0x0 -+int attr ratingBarStyle 0x0 -+int attr ratingBarStyleIndicator 0x0 -+int attr ratingBarStyleSmall 0x0 -+int attr retryImage 0x0 -+int attr retryImageScaleType 0x0 -+int attr roundAsCircle 0x0 -+int attr roundBottomEnd 0x0 -+int attr roundBottomLeft 0x0 -+int attr roundBottomRight 0x0 -+int attr roundBottomStart 0x0 -+int attr roundTopEnd 0x0 -+int attr roundTopLeft 0x0 -+int attr roundTopRight 0x0 -+int attr roundTopStart 0x0 -+int attr roundWithOverlayColor 0x0 -+int attr roundedCornerRadius 0x0 -+int attr roundingBorderColor 0x0 -+int attr roundingBorderPadding 0x0 -+int attr roundingBorderWidth 0x0 -+int attr searchHintIcon 0x0 -+int attr searchIcon 0x0 -+int attr searchViewStyle 0x0 -+int attr seekBarStyle 0x0 -+int attr selectableItemBackground 0x0 -+int attr selectableItemBackgroundBorderless 0x0 -+int attr shortcutMatchRequired 0x0 -+int attr showAsAction 0x0 -+int attr showDividers 0x0 -+int attr showText 0x0 -+int attr showTitle 0x0 -+int attr singleChoiceItemLayout 0x0 -+int attr spinBars 0x0 -+int attr spinnerDropDownItemStyle 0x0 -+int attr spinnerStyle 0x0 -+int attr splitTrack 0x0 -+int attr srcCompat 0x0 -+int attr state_above_anchor 0x0 -+int attr subMenuArrow 0x0 -+int attr submitBackground 0x0 -+int attr subtitle 0x0 -+int attr subtitleTextAppearance 0x0 -+int attr subtitleTextColor 0x0 -+int attr subtitleTextStyle 0x0 -+int attr suggestionRowLayout 0x0 -+int attr switchMinWidth 0x0 -+int attr switchPadding 0x0 -+int attr switchStyle 0x0 -+int attr switchTextAppearance 0x0 -+int attr textAllCaps 0x0 -+int attr textAppearanceLargePopupMenu 0x0 -+int attr textAppearanceListItem 0x0 -+int attr textAppearanceListItemSecondary 0x0 -+int attr textAppearanceListItemSmall 0x0 -+int attr textAppearancePopupMenuHeader 0x0 -+int attr textAppearanceSearchResultSubtitle 0x0 -+int attr textAppearanceSearchResultTitle 0x0 -+int attr textAppearanceSmallPopupMenu 0x0 -+int attr textColorAlertDialogListItem 0x0 -+int attr textColorSearchUrl 0x0 -+int attr textLocale 0x0 -+int attr theme 0x0 -+int attr thickness 0x0 -+int attr thumbTextPadding 0x0 -+int attr thumbTint 0x0 -+int attr thumbTintMode 0x0 -+int attr tickMark 0x0 -+int attr tickMarkTint 0x0 -+int attr tickMarkTintMode 0x0 -+int attr tint 0x0 -+int attr tintMode 0x0 -+int attr title 0x0 -+int attr titleMargin 0x0 -+int attr titleMarginBottom 0x0 -+int attr titleMarginEnd 0x0 -+int attr titleMarginStart 0x0 -+int attr titleMarginTop 0x0 -+int attr titleMargins 0x0 -+int attr titleTextAppearance 0x0 -+int attr titleTextColor 0x0 -+int attr titleTextStyle 0x0 -+int attr toolbarNavigationButtonStyle 0x0 -+int attr toolbarStyle 0x0 -+int attr tooltipForegroundColor 0x0 -+int attr tooltipFrameBackground 0x0 -+int attr tooltipText 0x0 -+int attr track 0x0 -+int attr trackTint 0x0 -+int attr trackTintMode 0x0 -+int attr ttcIndex 0x0 -+int attr viewAspectRatio 0x0 -+int attr viewInflaterClass 0x0 -+int attr voiceIcon 0x0 -+int attr windowActionBar 0x0 -+int attr windowActionBarOverlay 0x0 -+int attr windowActionModeOverlay 0x0 -+int attr windowFixedHeightMajor 0x0 -+int attr windowFixedHeightMinor 0x0 -+int attr windowFixedWidthMajor 0x0 -+int attr windowFixedWidthMinor 0x0 -+int attr windowMinWidthMajor 0x0 -+int attr windowMinWidthMinor 0x0 -+int attr windowNoTitle 0x0 -+int bool abc_action_bar_embed_tabs 0x0 -+int bool abc_config_actionMenuItemAllCaps 0x0 -+int color abc_background_cache_hint_selector_material_dark 0x0 -+int color abc_background_cache_hint_selector_material_light 0x0 -+int color abc_btn_colored_borderless_text_material 0x0 -+int color abc_btn_colored_text_material 0x0 -+int color abc_color_highlight_material 0x0 -+int color abc_decor_view_status_guard 0x0 -+int color abc_decor_view_status_guard_light 0x0 -+int color abc_hint_foreground_material_dark 0x0 -+int color abc_hint_foreground_material_light 0x0 -+int color abc_primary_text_disable_only_material_dark 0x0 -+int color abc_primary_text_disable_only_material_light 0x0 -+int color abc_primary_text_material_dark 0x0 -+int color abc_primary_text_material_light 0x0 -+int color abc_search_url_text 0x0 -+int color abc_search_url_text_normal 0x0 -+int color abc_search_url_text_pressed 0x0 -+int color abc_search_url_text_selected 0x0 -+int color abc_secondary_text_material_dark 0x0 -+int color abc_secondary_text_material_light 0x0 -+int color abc_tint_btn_checkable 0x0 -+int color abc_tint_default 0x0 -+int color abc_tint_edittext 0x0 -+int color abc_tint_seek_thumb 0x0 -+int color abc_tint_spinner 0x0 -+int color abc_tint_switch_track 0x0 -+int color accent_material_dark 0x0 -+int color accent_material_light 0x0 -+int color androidx_core_ripple_material_light 0x0 -+int color androidx_core_secondary_text_default_material_light 0x0 -+int color background_floating_material_dark 0x0 -+int color background_floating_material_light 0x0 -+int color background_material_dark 0x0 -+int color background_material_light 0x0 -+int color bright_foreground_disabled_material_dark 0x0 -+int color bright_foreground_disabled_material_light 0x0 -+int color bright_foreground_inverse_material_dark 0x0 -+int color bright_foreground_inverse_material_light 0x0 -+int color bright_foreground_material_dark 0x0 -+int color bright_foreground_material_light 0x0 -+int color button_material_dark 0x0 -+int color button_material_light 0x0 -+int color catalyst_logbox_background 0x0 -+int color catalyst_redbox_background 0x0 -+int color dim_foreground_disabled_material_dark 0x0 -+int color dim_foreground_disabled_material_light 0x0 -+int color dim_foreground_material_dark 0x0 -+int color dim_foreground_material_light 0x0 -+int color error_color_material_dark 0x0 -+int color error_color_material_light 0x0 -+int color foreground_material_dark 0x0 -+int color foreground_material_light 0x0 -+int color highlighted_text_material_dark 0x0 -+int color highlighted_text_material_light 0x0 -+int color material_blue_grey_800 0x0 -+int color material_blue_grey_900 0x0 -+int color material_blue_grey_950 0x0 -+int color material_deep_teal_200 0x0 -+int color material_deep_teal_500 0x0 -+int color material_grey_100 0x0 -+int color material_grey_300 0x0 -+int color material_grey_50 0x0 -+int color material_grey_600 0x0 -+int color material_grey_800 0x0 -+int color material_grey_850 0x0 -+int color material_grey_900 0x0 -+int color notification_action_color_filter 0x0 -+int color notification_icon_bg_color 0x0 -+int color primary_dark_material_dark 0x0 -+int color primary_dark_material_light 0x0 -+int color primary_material_dark 0x0 -+int color primary_material_light 0x0 -+int color primary_text_default_material_dark 0x0 -+int color primary_text_default_material_light 0x0 -+int color primary_text_disabled_material_dark 0x0 -+int color primary_text_disabled_material_light 0x0 -+int color ripple_material_dark 0x0 -+int color ripple_material_light 0x0 -+int color secondary_text_default_material_dark 0x0 -+int color secondary_text_default_material_light 0x0 -+int color secondary_text_disabled_material_dark 0x0 -+int color secondary_text_disabled_material_light 0x0 -+int color switch_thumb_disabled_material_dark 0x0 -+int color switch_thumb_disabled_material_light 0x0 -+int color switch_thumb_material_dark 0x0 -+int color switch_thumb_material_light 0x0 -+int color switch_thumb_normal_material_dark 0x0 -+int color switch_thumb_normal_material_light 0x0 -+int color tooltip_background_dark 0x0 -+int color tooltip_background_light 0x0 -+int dimen abc_action_bar_content_inset_material 0x0 -+int dimen abc_action_bar_content_inset_with_nav 0x0 -+int dimen abc_action_bar_default_height_material 0x0 -+int dimen abc_action_bar_default_padding_end_material 0x0 -+int dimen abc_action_bar_default_padding_start_material 0x0 -+int dimen abc_action_bar_elevation_material 0x0 -+int dimen abc_action_bar_icon_vertical_padding_material 0x0 -+int dimen abc_action_bar_overflow_padding_end_material 0x0 -+int dimen abc_action_bar_overflow_padding_start_material 0x0 -+int dimen abc_action_bar_stacked_max_height 0x0 -+int dimen abc_action_bar_stacked_tab_max_width 0x0 -+int dimen abc_action_bar_subtitle_bottom_margin_material 0x0 -+int dimen abc_action_bar_subtitle_top_margin_material 0x0 -+int dimen abc_action_button_min_height_material 0x0 -+int dimen abc_action_button_min_width_material 0x0 -+int dimen abc_action_button_min_width_overflow_material 0x0 -+int dimen abc_alert_dialog_button_bar_height 0x0 -+int dimen abc_alert_dialog_button_dimen 0x0 -+int dimen abc_button_inset_horizontal_material 0x0 -+int dimen abc_button_inset_vertical_material 0x0 -+int dimen abc_button_padding_horizontal_material 0x0 -+int dimen abc_button_padding_vertical_material 0x0 -+int dimen abc_cascading_menus_min_smallest_width 0x0 -+int dimen abc_config_prefDialogWidth 0x0 -+int dimen abc_control_corner_material 0x0 -+int dimen abc_control_inset_material 0x0 -+int dimen abc_control_padding_material 0x0 -+int dimen abc_dialog_corner_radius_material 0x0 -+int dimen abc_dialog_fixed_height_major 0x0 -+int dimen abc_dialog_fixed_height_minor 0x0 -+int dimen abc_dialog_fixed_width_major 0x0 -+int dimen abc_dialog_fixed_width_minor 0x0 -+int dimen abc_dialog_list_padding_bottom_no_buttons 0x0 -+int dimen abc_dialog_list_padding_top_no_title 0x0 -+int dimen abc_dialog_min_width_major 0x0 -+int dimen abc_dialog_min_width_minor 0x0 -+int dimen abc_dialog_padding_material 0x0 -+int dimen abc_dialog_padding_top_material 0x0 -+int dimen abc_dialog_title_divider_material 0x0 -+int dimen abc_disabled_alpha_material_dark 0x0 -+int dimen abc_disabled_alpha_material_light 0x0 -+int dimen abc_dropdownitem_icon_width 0x0 -+int dimen abc_dropdownitem_text_padding_left 0x0 -+int dimen abc_dropdownitem_text_padding_right 0x0 -+int dimen abc_edit_text_inset_bottom_material 0x0 -+int dimen abc_edit_text_inset_horizontal_material 0x0 -+int dimen abc_edit_text_inset_top_material 0x0 -+int dimen abc_floating_window_z 0x0 -+int dimen abc_list_item_height_large_material 0x0 -+int dimen abc_list_item_height_material 0x0 -+int dimen abc_list_item_height_small_material 0x0 -+int dimen abc_list_item_padding_horizontal_material 0x0 -+int dimen abc_panel_menu_list_width 0x0 -+int dimen abc_progress_bar_height_material 0x0 -+int dimen abc_search_view_preferred_height 0x0 -+int dimen abc_search_view_preferred_width 0x0 -+int dimen abc_seekbar_track_background_height_material 0x0 -+int dimen abc_seekbar_track_progress_height_material 0x0 -+int dimen abc_select_dialog_padding_start_material 0x0 -+int dimen abc_star_big 0x0 -+int dimen abc_star_medium 0x0 -+int dimen abc_star_small 0x0 -+int dimen abc_switch_padding 0x0 -+int dimen abc_text_size_body_1_material 0x0 -+int dimen abc_text_size_body_2_material 0x0 -+int dimen abc_text_size_button_material 0x0 -+int dimen abc_text_size_caption_material 0x0 -+int dimen abc_text_size_display_1_material 0x0 -+int dimen abc_text_size_display_2_material 0x0 -+int dimen abc_text_size_display_3_material 0x0 -+int dimen abc_text_size_display_4_material 0x0 -+int dimen abc_text_size_headline_material 0x0 -+int dimen abc_text_size_large_material 0x0 -+int dimen abc_text_size_medium_material 0x0 -+int dimen abc_text_size_menu_header_material 0x0 -+int dimen abc_text_size_menu_material 0x0 -+int dimen abc_text_size_small_material 0x0 -+int dimen abc_text_size_subhead_material 0x0 -+int dimen abc_text_size_subtitle_material_toolbar 0x0 -+int dimen abc_text_size_title_material 0x0 -+int dimen abc_text_size_title_material_toolbar 0x0 -+int dimen autofill_inline_suggestion_icon_size 0x0 -+int dimen compat_button_inset_horizontal_material 0x0 -+int dimen compat_button_inset_vertical_material 0x0 -+int dimen compat_button_padding_horizontal_material 0x0 -+int dimen compat_button_padding_vertical_material 0x0 -+int dimen compat_control_corner_material 0x0 -+int dimen compat_notification_large_icon_max_height 0x0 -+int dimen compat_notification_large_icon_max_width 0x0 -+int dimen disabled_alpha_material_dark 0x0 -+int dimen disabled_alpha_material_light 0x0 -+int dimen highlight_alpha_material_colored 0x0 -+int dimen highlight_alpha_material_dark 0x0 -+int dimen highlight_alpha_material_light 0x0 -+int dimen hint_alpha_material_dark 0x0 -+int dimen hint_alpha_material_light 0x0 -+int dimen hint_pressed_alpha_material_dark 0x0 -+int dimen hint_pressed_alpha_material_light 0x0 -+int dimen notification_action_icon_size 0x0 -+int dimen notification_action_text_size 0x0 -+int dimen notification_big_circle_margin 0x0 -+int dimen notification_content_margin_start 0x0 -+int dimen notification_large_icon_height 0x0 -+int dimen notification_large_icon_width 0x0 -+int dimen notification_main_column_padding_top 0x0 -+int dimen notification_media_narrow_margin 0x0 -+int dimen notification_right_icon_size 0x0 -+int dimen notification_right_side_padding_top 0x0 -+int dimen notification_small_icon_background_padding 0x0 -+int dimen notification_small_icon_size_as_large 0x0 -+int dimen notification_subtext_size 0x0 -+int dimen notification_top_pad 0x0 -+int dimen notification_top_pad_large_text 0x0 -+int dimen tooltip_corner_radius 0x0 -+int dimen tooltip_horizontal_padding 0x0 -+int dimen tooltip_margin 0x0 -+int dimen tooltip_precise_anchor_extra_offset 0x0 -+int dimen tooltip_precise_anchor_threshold 0x0 -+int dimen tooltip_vertical_padding 0x0 -+int dimen tooltip_y_offset_non_touch 0x0 -+int dimen tooltip_y_offset_touch 0x0 -+int drawable abc_ab_share_pack_mtrl_alpha 0x0 -+int drawable abc_action_bar_item_background_material 0x0 -+int drawable abc_btn_borderless_material 0x0 -+int drawable abc_btn_check_material 0x0 -+int drawable abc_btn_check_material_anim 0x0 -+int drawable abc_btn_check_to_on_mtrl_000 0x0 -+int drawable abc_btn_check_to_on_mtrl_015 0x0 -+int drawable abc_btn_colored_material 0x0 -+int drawable abc_btn_default_mtrl_shape 0x0 -+int drawable abc_btn_radio_material 0x0 -+int drawable abc_btn_radio_material_anim 0x0 -+int drawable abc_btn_radio_to_on_mtrl_000 0x0 -+int drawable abc_btn_radio_to_on_mtrl_015 0x0 -+int drawable abc_btn_switch_to_on_mtrl_00001 0x0 -+int drawable abc_btn_switch_to_on_mtrl_00012 0x0 -+int drawable abc_cab_background_internal_bg 0x0 -+int drawable abc_cab_background_top_material 0x0 -+int drawable abc_cab_background_top_mtrl_alpha 0x0 -+int drawable abc_control_background_material 0x0 -+int drawable abc_dialog_material_background 0x0 -+int drawable abc_edit_text_material 0x0 -+int drawable abc_ic_ab_back_material 0x0 -+int drawable abc_ic_arrow_drop_right_black_24dp 0x0 -+int drawable abc_ic_clear_material 0x0 -+int drawable abc_ic_commit_search_api_mtrl_alpha 0x0 -+int drawable abc_ic_go_search_api_material 0x0 -+int drawable abc_ic_menu_copy_mtrl_am_alpha 0x0 -+int drawable abc_ic_menu_cut_mtrl_alpha 0x0 -+int drawable abc_ic_menu_overflow_material 0x0 -+int drawable abc_ic_menu_paste_mtrl_am_alpha 0x0 -+int drawable abc_ic_menu_selectall_mtrl_alpha 0x0 -+int drawable abc_ic_menu_share_mtrl_alpha 0x0 -+int drawable abc_ic_search_api_material 0x0 -+int drawable abc_ic_voice_search_api_material 0x0 -+int drawable abc_item_background_holo_dark 0x0 -+int drawable abc_item_background_holo_light 0x0 -+int drawable abc_list_divider_material 0x0 -+int drawable abc_list_divider_mtrl_alpha 0x0 -+int drawable abc_list_focused_holo 0x0 -+int drawable abc_list_longpressed_holo 0x0 -+int drawable abc_list_pressed_holo_dark 0x0 -+int drawable abc_list_pressed_holo_light 0x0 -+int drawable abc_list_selector_background_transition_holo_dark 0x0 -+int drawable abc_list_selector_background_transition_holo_light 0x0 -+int drawable abc_list_selector_disabled_holo_dark 0x0 -+int drawable abc_list_selector_disabled_holo_light 0x0 -+int drawable abc_list_selector_holo_dark 0x0 -+int drawable abc_list_selector_holo_light 0x0 -+int drawable abc_menu_hardkey_panel_mtrl_mult 0x0 -+int drawable abc_popup_background_mtrl_mult 0x0 -+int drawable abc_ratingbar_indicator_material 0x0 -+int drawable abc_ratingbar_material 0x0 -+int drawable abc_ratingbar_small_material 0x0 -+int drawable abc_scrubber_control_off_mtrl_alpha 0x0 -+int drawable abc_scrubber_control_to_pressed_mtrl_000 0x0 -+int drawable abc_scrubber_control_to_pressed_mtrl_005 0x0 -+int drawable abc_scrubber_primary_mtrl_alpha 0x0 -+int drawable abc_scrubber_track_mtrl_alpha 0x0 -+int drawable abc_seekbar_thumb_material 0x0 -+int drawable abc_seekbar_tick_mark_material 0x0 -+int drawable abc_seekbar_track_material 0x0 -+int drawable abc_spinner_mtrl_am_alpha 0x0 -+int drawable abc_spinner_textfield_background_material 0x0 -+int drawable abc_star_black_48dp 0x0 -+int drawable abc_star_half_black_48dp 0x0 -+int drawable abc_switch_thumb_material 0x0 -+int drawable abc_switch_track_mtrl_alpha 0x0 -+int drawable abc_tab_indicator_material 0x0 -+int drawable abc_tab_indicator_mtrl_alpha 0x0 -+int drawable abc_text_cursor_material 0x0 -+int drawable abc_text_select_handle_left_mtrl 0x0 -+int drawable abc_text_select_handle_middle_mtrl 0x0 -+int drawable abc_text_select_handle_right_mtrl 0x0 -+int drawable abc_textfield_activated_mtrl_alpha 0x0 -+int drawable abc_textfield_default_mtrl_alpha 0x0 -+int drawable abc_textfield_search_activated_mtrl_alpha 0x0 -+int drawable abc_textfield_search_default_mtrl_alpha 0x0 -+int drawable abc_textfield_search_material 0x0 -+int drawable abc_vector_test 0x0 -+int drawable autofill_inline_suggestion_chip_background 0x0 -+int drawable btn_checkbox_checked_mtrl 0x0 -+int drawable btn_checkbox_checked_to_unchecked_mtrl_animation 0x0 -+int drawable btn_checkbox_unchecked_mtrl 0x0 -+int drawable btn_checkbox_unchecked_to_checked_mtrl_animation 0x0 -+int drawable btn_radio_off_mtrl 0x0 -+int drawable btn_radio_off_to_on_mtrl_animation 0x0 -+int drawable btn_radio_on_mtrl 0x0 -+int drawable btn_radio_on_to_off_mtrl_animation 0x0 -+int drawable notification_action_background 0x0 -+int drawable notification_bg 0x0 -+int drawable notification_bg_low 0x0 -+int drawable notification_bg_low_normal 0x0 -+int drawable notification_bg_low_pressed 0x0 -+int drawable notification_bg_normal 0x0 -+int drawable notification_bg_normal_pressed 0x0 -+int drawable notification_icon_background 0x0 -+int drawable notification_template_icon_bg 0x0 -+int drawable notification_template_icon_low_bg 0x0 -+int drawable notification_tile_bg 0x0 -+int drawable notify_panel_notification_icon_bg 0x0 -+int drawable redbox_top_border_background 0x0 -+int drawable test_level_drawable 0x0 -+int drawable tooltip_frame_dark 0x0 -+int drawable tooltip_frame_light 0x0 -+int id accessibility_action_clickable_span 0x0 -+int id accessibility_actions 0x0 -+int id accessibility_collection 0x0 -+int id accessibility_collection_item 0x0 -+int id accessibility_custom_action_0 0x0 -+int id accessibility_custom_action_1 0x0 -+int id accessibility_custom_action_10 0x0 -+int id accessibility_custom_action_11 0x0 -+int id accessibility_custom_action_12 0x0 -+int id accessibility_custom_action_13 0x0 -+int id accessibility_custom_action_14 0x0 -+int id accessibility_custom_action_15 0x0 -+int id accessibility_custom_action_16 0x0 -+int id accessibility_custom_action_17 0x0 -+int id accessibility_custom_action_18 0x0 -+int id accessibility_custom_action_19 0x0 -+int id accessibility_custom_action_2 0x0 -+int id accessibility_custom_action_20 0x0 -+int id accessibility_custom_action_21 0x0 -+int id accessibility_custom_action_22 0x0 -+int id accessibility_custom_action_23 0x0 -+int id accessibility_custom_action_24 0x0 -+int id accessibility_custom_action_25 0x0 -+int id accessibility_custom_action_26 0x0 -+int id accessibility_custom_action_27 0x0 -+int id accessibility_custom_action_28 0x0 -+int id accessibility_custom_action_29 0x0 -+int id accessibility_custom_action_3 0x0 -+int id accessibility_custom_action_30 0x0 -+int id accessibility_custom_action_31 0x0 -+int id accessibility_custom_action_4 0x0 -+int id accessibility_custom_action_5 0x0 -+int id accessibility_custom_action_6 0x0 -+int id accessibility_custom_action_7 0x0 -+int id accessibility_custom_action_8 0x0 -+int id accessibility_custom_action_9 0x0 -+int id accessibility_hint 0x0 -+int id accessibility_label 0x0 -+int id accessibility_links 0x0 -+int id accessibility_role 0x0 -+int id accessibility_state 0x0 -+int id accessibility_value 0x0 -+int id action_bar 0x0 -+int id action_bar_activity_content 0x0 -+int id action_bar_container 0x0 -+int id action_bar_root 0x0 -+int id action_bar_spinner 0x0 -+int id action_bar_subtitle 0x0 -+int id action_bar_title 0x0 -+int id action_container 0x0 -+int id action_context_bar 0x0 -+int id action_divider 0x0 -+int id action_image 0x0 -+int id action_menu_divider 0x0 -+int id action_menu_presenter 0x0 -+int id action_mode_bar 0x0 -+int id action_mode_bar_stub 0x0 -+int id action_mode_close_button 0x0 -+int id action_text 0x0 -+int id actions 0x0 -+int id activity_chooser_view_content 0x0 -+int id add 0x0 -+int id alertTitle 0x0 -+int id async 0x0 -+int id autofill_inline_suggestion_end_icon 0x0 -+int id autofill_inline_suggestion_start_icon 0x0 -+int id autofill_inline_suggestion_subtitle 0x0 -+int id autofill_inline_suggestion_title 0x0 -+int id blocking 0x0 -+int id buttonPanel 0x0 -+int id catalyst_redbox_title 0x0 -+int id center 0x0 -+int id centerCrop 0x0 -+int id centerInside 0x0 -+int id checkbox 0x0 -+int id checked 0x0 -+int id chronometer 0x0 -+int id content 0x0 -+int id contentPanel 0x0 -+int id custom 0x0 -+int id customPanel 0x0 -+int id decor_content_parent 0x0 -+int id default_activity_button 0x0 -+int id dialog_button 0x0 -+int id edit_query 0x0 -+int id expand_activities_button 0x0 -+int id expanded_menu 0x0 -+int id fitBottomStart 0x0 -+int id fitCenter 0x0 -+int id fitEnd 0x0 -+int id fitStart 0x0 -+int id fitXY 0x0 -+int id focusCrop 0x0 -+int id forever 0x0 -+int id fps_text 0x0 -+int id fragment_container_view_tag 0x0 -+int id group_divider 0x0 -+int id home 0x0 -+int id icon 0x0 -+int id icon_group 0x0 -+int id image 0x0 -+int id info 0x0 -+int id italic 0x0 -+int id item1 0x0 -+int id item2 0x0 -+int id item3 0x0 -+int id item4 0x0 -+int id labelled_by 0x0 -+int id line1 0x0 -+int id line3 0x0 -+int id listMode 0x0 -+int id list_item 0x0 -+int id message 0x0 -+int id multiply 0x0 -+int id none 0x0 -+int id normal 0x0 -+int id notification_background 0x0 -+int id notification_main_column 0x0 -+int id notification_main_column_container 0x0 -+int id off 0x0 -+int id on 0x0 -+int id parentPanel 0x0 -+int id pointer_events 0x0 -+int id progress_circular 0x0 -+int id progress_horizontal 0x0 -+int id radio 0x0 -+int id react_test_id 0x0 -+int id right_icon 0x0 -+int id right_side 0x0 -+int id rn_frame_file 0x0 -+int id rn_frame_method 0x0 -+int id rn_redbox_dismiss_button 0x0 -+int id rn_redbox_line_separator 0x0 -+int id rn_redbox_loading_indicator 0x0 -+int id rn_redbox_reload_button 0x0 -+int id rn_redbox_report_button 0x0 -+int id rn_redbox_report_label 0x0 -+int id rn_redbox_stack 0x0 -+int id screen 0x0 -+int id scrollIndicatorDown 0x0 -+int id scrollIndicatorUp 0x0 -+int id scrollView 0x0 -+int id search_badge 0x0 -+int id search_bar 0x0 -+int id search_button 0x0 -+int id search_close_btn 0x0 -+int id search_edit_frame 0x0 -+int id search_go_btn 0x0 -+int id search_mag_icon 0x0 -+int id search_plate 0x0 -+int id search_src_text 0x0 -+int id search_voice_btn 0x0 -+int id select_dialog_listview 0x0 -+int id shortcut 0x0 -+int id spacer 0x0 -+int id special_effects_controller_view_tag 0x0 -+int id split_action_bar 0x0 -+int id src_atop 0x0 -+int id src_in 0x0 -+int id src_over 0x0 -+int id submenuarrow 0x0 -+int id submit_area 0x0 -+int id tabMode 0x0 -+int id tag_accessibility_actions 0x0 -+int id tag_accessibility_clickable_spans 0x0 -+int id tag_accessibility_heading 0x0 -+int id tag_accessibility_pane_title 0x0 -+int id tag_on_apply_window_listener 0x0 -+int id tag_on_receive_content_listener 0x0 -+int id tag_on_receive_content_mime_types 0x0 -+int id tag_screen_reader_focusable 0x0 -+int id tag_state_description 0x0 -+int id tag_transition_group 0x0 -+int id tag_unhandled_key_event_manager 0x0 -+int id tag_unhandled_key_listeners 0x0 -+int id tag_window_insets_animation_callback 0x0 -+int id text 0x0 -+int id text2 0x0 -+int id textSpacerNoButtons 0x0 -+int id textSpacerNoTitle 0x0 -+int id time 0x0 -+int id title 0x0 -+int id titleDividerNoCustom 0x0 -+int id title_template 0x0 -+int id topPanel 0x0 -+int id unchecked 0x0 -+int id uniform 0x0 -+int id up 0x0 -+int id view_tag_instance_handle 0x0 -+int id view_tag_native_id 0x0 -+int id view_tree_lifecycle_owner 0x0 -+int id view_tree_saved_state_registry_owner 0x0 -+int id view_tree_view_model_store_owner 0x0 -+int id visible_removing_fragment_view_tag 0x0 -+int id wrap_content 0x0 -+int integer abc_config_activityDefaultDur 0x0 -+int integer abc_config_activityShortDur 0x0 -+int integer cancel_button_image_alpha 0x0 -+int integer config_tooltipAnimTime 0x0 -+int integer react_native_dev_server_port 0x0 -+int integer react_native_inspector_proxy_port 0x0 -+int integer status_bar_notification_info_maxnum 0x0 -+int interpolator btn_checkbox_checked_mtrl_animation_interpolator_0 0x0 -+int interpolator btn_checkbox_checked_mtrl_animation_interpolator_1 0x0 -+int interpolator btn_checkbox_unchecked_mtrl_animation_interpolator_0 0x0 -+int interpolator btn_checkbox_unchecked_mtrl_animation_interpolator_1 0x0 -+int interpolator btn_radio_to_off_mtrl_animation_interpolator_0 0x0 -+int interpolator btn_radio_to_on_mtrl_animation_interpolator_0 0x0 -+int interpolator fast_out_slow_in 0x0 -+int layout abc_action_bar_title_item 0x0 -+int layout abc_action_bar_up_container 0x0 -+int layout abc_action_menu_item_layout 0x0 -+int layout abc_action_menu_layout 0x0 -+int layout abc_action_mode_bar 0x0 -+int layout abc_action_mode_close_item_material 0x0 -+int layout abc_activity_chooser_view 0x0 -+int layout abc_activity_chooser_view_list_item 0x0 -+int layout abc_alert_dialog_button_bar_material 0x0 -+int layout abc_alert_dialog_material 0x0 -+int layout abc_alert_dialog_title_material 0x0 -+int layout abc_cascading_menu_item_layout 0x0 -+int layout abc_dialog_title_material 0x0 -+int layout abc_expanded_menu_layout 0x0 -+int layout abc_list_menu_item_checkbox 0x0 -+int layout abc_list_menu_item_icon 0x0 -+int layout abc_list_menu_item_layout 0x0 -+int layout abc_list_menu_item_radio 0x0 -+int layout abc_popup_menu_header_item_layout 0x0 -+int layout abc_popup_menu_item_layout 0x0 -+int layout abc_screen_content_include 0x0 -+int layout abc_screen_simple 0x0 -+int layout abc_screen_simple_overlay_action_mode 0x0 -+int layout abc_screen_toolbar 0x0 -+int layout abc_search_dropdown_item_icons_2line 0x0 -+int layout abc_search_view 0x0 -+int layout abc_select_dialog_material 0x0 -+int layout abc_tooltip 0x0 -+int layout autofill_inline_suggestion 0x0 -+int layout custom_dialog 0x0 -+int layout dev_loading_view 0x0 -+int layout fps_view 0x0 -+int layout notification_action 0x0 -+int layout notification_action_tombstone 0x0 -+int layout notification_template_custom_big 0x0 -+int layout notification_template_icon_group 0x0 -+int layout notification_template_part_chronometer 0x0 -+int layout notification_template_part_time 0x0 -+int layout redbox_item_frame 0x0 -+int layout redbox_item_title 0x0 -+int layout redbox_view 0x0 -+int layout select_dialog_item_material 0x0 -+int layout select_dialog_multichoice_material 0x0 -+int layout select_dialog_singlechoice_material 0x0 -+int layout support_simple_spinner_dropdown_item 0x0 -+int menu example_menu 0x0 -+int menu example_menu2 0x0 -+int string abc_action_bar_home_description 0x0 -+int string abc_action_bar_up_description 0x0 -+int string abc_action_menu_overflow_description 0x0 -+int string abc_action_mode_done 0x0 -+int string abc_activity_chooser_view_see_all 0x0 -+int string abc_activitychooserview_choose_application 0x0 -+int string abc_capital_off 0x0 -+int string abc_capital_on 0x0 -+int string abc_menu_alt_shortcut_label 0x0 -+int string abc_menu_ctrl_shortcut_label 0x0 -+int string abc_menu_delete_shortcut_label 0x0 -+int string abc_menu_enter_shortcut_label 0x0 -+int string abc_menu_function_shortcut_label 0x0 -+int string abc_menu_meta_shortcut_label 0x0 -+int string abc_menu_shift_shortcut_label 0x0 -+int string abc_menu_space_shortcut_label 0x0 -+int string abc_menu_sym_shortcut_label 0x0 -+int string abc_prepend_shortcut_label 0x0 -+int string abc_search_hint 0x0 -+int string abc_searchview_description_clear 0x0 -+int string abc_searchview_description_query 0x0 -+int string abc_searchview_description_search 0x0 -+int string abc_searchview_description_submit 0x0 -+int string abc_searchview_description_voice 0x0 -+int string abc_shareactionprovider_share_with 0x0 -+int string abc_shareactionprovider_share_with_application 0x0 -+int string abc_toolbar_collapse_description 0x0 -+int string alert_description 0x0 -+int string catalyst_change_bundle_location 0x0 -+int string catalyst_copy_button 0x0 -+int string catalyst_debug 0x0 -+int string catalyst_debug_chrome 0x0 -+int string catalyst_debug_chrome_stop 0x0 -+int string catalyst_debug_connecting 0x0 -+int string catalyst_debug_error 0x0 -+int string catalyst_debug_open 0x0 -+int string catalyst_debug_stop 0x0 -+int string catalyst_devtools_open 0x0 -+int string catalyst_dismiss_button 0x0 -+int string catalyst_heap_capture 0x0 -+int string catalyst_hot_reloading 0x0 -+int string catalyst_hot_reloading_auto_disable 0x0 -+int string catalyst_hot_reloading_auto_enable 0x0 -+int string catalyst_hot_reloading_stop 0x0 -+int string catalyst_inspector 0x0 -+int string catalyst_inspector_stop 0x0 -+int string catalyst_loading_from_url 0x0 -+int string catalyst_open_flipper_error 0x0 -+int string catalyst_perf_monitor 0x0 -+int string catalyst_perf_monitor_stop 0x0 -+int string catalyst_reload 0x0 -+int string catalyst_reload_button 0x0 -+int string catalyst_reload_error 0x0 -+int string catalyst_report_button 0x0 -+int string catalyst_sample_profiler_disable 0x0 -+int string catalyst_sample_profiler_enable 0x0 -+int string catalyst_settings 0x0 -+int string catalyst_settings_title 0x0 -+int string combobox_description 0x0 -+int string header_description 0x0 -+int string image_description 0x0 -+int string imagebutton_description 0x0 -+int string link_description 0x0 -+int string menu_description 0x0 -+int string menubar_description 0x0 -+int string menuitem_description 0x0 -+int string progressbar_description 0x0 -+int string radiogroup_description 0x0 -+int string rn_tab_description 0x0 -+int string scrollbar_description 0x0 -+int string search_menu_title 0x0 -+int string spinbutton_description 0x0 -+int string state_busy_description 0x0 -+int string state_collapsed_description 0x0 -+int string state_expanded_description 0x0 -+int string state_mixed_description 0x0 -+int string state_off_description 0x0 -+int string state_on_description 0x0 -+int string state_unselected_description 0x0 -+int string status_bar_notification_info_overflow 0x0 -+int string summary_description 0x0 -+int string tablist_description 0x0 -+int string timer_description 0x0 -+int string toolbar_description 0x0 -+int style AlertDialog_AppCompat 0x0 -+int style AlertDialog_AppCompat_Light 0x0 -+int style Animation_AppCompat_Dialog 0x0 -+int style Animation_AppCompat_DropDownUp 0x0 -+int style Animation_AppCompat_Tooltip 0x0 -+int style Animation_Catalyst_LogBox 0x0 -+int style Animation_Catalyst_RedBox 0x0 -+int style Base_AlertDialog_AppCompat 0x0 -+int style Base_AlertDialog_AppCompat_Light 0x0 -+int style Base_Animation_AppCompat_Dialog 0x0 -+int style Base_Animation_AppCompat_DropDownUp 0x0 -+int style Base_Animation_AppCompat_Tooltip 0x0 -+int style Base_DialogWindowTitleBackground_AppCompat 0x0 -+int style Base_DialogWindowTitle_AppCompat 0x0 -+int style Base_TextAppearance_AppCompat 0x0 -+int style Base_TextAppearance_AppCompat_Body1 0x0 -+int style Base_TextAppearance_AppCompat_Body2 0x0 -+int style Base_TextAppearance_AppCompat_Button 0x0 -+int style Base_TextAppearance_AppCompat_Caption 0x0 -+int style Base_TextAppearance_AppCompat_Display1 0x0 -+int style Base_TextAppearance_AppCompat_Display2 0x0 -+int style Base_TextAppearance_AppCompat_Display3 0x0 -+int style Base_TextAppearance_AppCompat_Display4 0x0 -+int style Base_TextAppearance_AppCompat_Headline 0x0 -+int style Base_TextAppearance_AppCompat_Inverse 0x0 -+int style Base_TextAppearance_AppCompat_Large 0x0 -+int style Base_TextAppearance_AppCompat_Large_Inverse 0x0 -+int style Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large 0x0 -+int style Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small 0x0 -+int style Base_TextAppearance_AppCompat_Medium 0x0 -+int style Base_TextAppearance_AppCompat_Medium_Inverse 0x0 -+int style Base_TextAppearance_AppCompat_Menu 0x0 -+int style Base_TextAppearance_AppCompat_SearchResult 0x0 -+int style Base_TextAppearance_AppCompat_SearchResult_Subtitle 0x0 -+int style Base_TextAppearance_AppCompat_SearchResult_Title 0x0 -+int style Base_TextAppearance_AppCompat_Small 0x0 -+int style Base_TextAppearance_AppCompat_Small_Inverse 0x0 -+int style Base_TextAppearance_AppCompat_Subhead 0x0 -+int style Base_TextAppearance_AppCompat_Subhead_Inverse 0x0 -+int style Base_TextAppearance_AppCompat_Title 0x0 -+int style Base_TextAppearance_AppCompat_Title_Inverse 0x0 -+int style Base_TextAppearance_AppCompat_Tooltip 0x0 -+int style Base_TextAppearance_AppCompat_Widget_ActionBar_Menu 0x0 -+int style Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle 0x0 -+int style Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse 0x0 -+int style Base_TextAppearance_AppCompat_Widget_ActionBar_Title 0x0 -+int style Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse 0x0 -+int style Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle 0x0 -+int style Base_TextAppearance_AppCompat_Widget_ActionMode_Title 0x0 -+int style Base_TextAppearance_AppCompat_Widget_Button 0x0 -+int style Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored 0x0 -+int style Base_TextAppearance_AppCompat_Widget_Button_Colored 0x0 -+int style Base_TextAppearance_AppCompat_Widget_Button_Inverse 0x0 -+int style Base_TextAppearance_AppCompat_Widget_DropDownItem 0x0 -+int style Base_TextAppearance_AppCompat_Widget_PopupMenu_Header 0x0 -+int style Base_TextAppearance_AppCompat_Widget_PopupMenu_Large 0x0 -+int style Base_TextAppearance_AppCompat_Widget_PopupMenu_Small 0x0 -+int style Base_TextAppearance_AppCompat_Widget_Switch 0x0 -+int style Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem 0x0 -+int style Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item 0x0 -+int style Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle 0x0 -+int style Base_TextAppearance_Widget_AppCompat_Toolbar_Title 0x0 -+int style Base_ThemeOverlay_AppCompat 0x0 -+int style Base_ThemeOverlay_AppCompat_ActionBar 0x0 -+int style Base_ThemeOverlay_AppCompat_Dark 0x0 -+int style Base_ThemeOverlay_AppCompat_Dark_ActionBar 0x0 -+int style Base_ThemeOverlay_AppCompat_Dialog 0x0 -+int style Base_ThemeOverlay_AppCompat_Dialog_Alert 0x0 -+int style Base_ThemeOverlay_AppCompat_Light 0x0 -+int style Base_Theme_AppCompat 0x0 -+int style Base_Theme_AppCompat_CompactMenu 0x0 -+int style Base_Theme_AppCompat_Dialog 0x0 -+int style Base_Theme_AppCompat_DialogWhenLarge 0x0 -+int style Base_Theme_AppCompat_Dialog_Alert 0x0 -+int style Base_Theme_AppCompat_Dialog_FixedSize 0x0 -+int style Base_Theme_AppCompat_Dialog_MinWidth 0x0 -+int style Base_Theme_AppCompat_Light 0x0 -+int style Base_Theme_AppCompat_Light_DarkActionBar 0x0 -+int style Base_Theme_AppCompat_Light_Dialog 0x0 -+int style Base_Theme_AppCompat_Light_DialogWhenLarge 0x0 -+int style Base_Theme_AppCompat_Light_Dialog_Alert 0x0 -+int style Base_Theme_AppCompat_Light_Dialog_FixedSize 0x0 -+int style Base_Theme_AppCompat_Light_Dialog_MinWidth 0x0 -+int style Base_V21_ThemeOverlay_AppCompat_Dialog 0x0 -+int style Base_V21_Theme_AppCompat 0x0 -+int style Base_V21_Theme_AppCompat_Dialog 0x0 -+int style Base_V21_Theme_AppCompat_Light 0x0 -+int style Base_V21_Theme_AppCompat_Light_Dialog 0x0 -+int style Base_V22_Theme_AppCompat 0x0 -+int style Base_V22_Theme_AppCompat_Light 0x0 -+int style Base_V23_Theme_AppCompat 0x0 -+int style Base_V23_Theme_AppCompat_Light 0x0 -+int style Base_V26_Theme_AppCompat 0x0 -+int style Base_V26_Theme_AppCompat_Light 0x0 -+int style Base_V26_Widget_AppCompat_Toolbar 0x0 -+int style Base_V28_Theme_AppCompat 0x0 -+int style Base_V28_Theme_AppCompat_Light 0x0 -+int style Base_V7_ThemeOverlay_AppCompat_Dialog 0x0 -+int style Base_V7_Theme_AppCompat 0x0 -+int style Base_V7_Theme_AppCompat_Dialog 0x0 -+int style Base_V7_Theme_AppCompat_Light 0x0 -+int style Base_V7_Theme_AppCompat_Light_Dialog 0x0 -+int style Base_V7_Widget_AppCompat_AutoCompleteTextView 0x0 -+int style Base_V7_Widget_AppCompat_EditText 0x0 -+int style Base_V7_Widget_AppCompat_Toolbar 0x0 -+int style Base_Widget_AppCompat_ActionBar 0x0 -+int style Base_Widget_AppCompat_ActionBar_Solid 0x0 -+int style Base_Widget_AppCompat_ActionBar_TabBar 0x0 -+int style Base_Widget_AppCompat_ActionBar_TabText 0x0 -+int style Base_Widget_AppCompat_ActionBar_TabView 0x0 -+int style Base_Widget_AppCompat_ActionButton 0x0 -+int style Base_Widget_AppCompat_ActionButton_CloseMode 0x0 -+int style Base_Widget_AppCompat_ActionButton_Overflow 0x0 -+int style Base_Widget_AppCompat_ActionMode 0x0 -+int style Base_Widget_AppCompat_ActivityChooserView 0x0 -+int style Base_Widget_AppCompat_AutoCompleteTextView 0x0 -+int style Base_Widget_AppCompat_Button 0x0 -+int style Base_Widget_AppCompat_ButtonBar 0x0 -+int style Base_Widget_AppCompat_ButtonBar_AlertDialog 0x0 -+int style Base_Widget_AppCompat_Button_Borderless 0x0 -+int style Base_Widget_AppCompat_Button_Borderless_Colored 0x0 -+int style Base_Widget_AppCompat_Button_ButtonBar_AlertDialog 0x0 -+int style Base_Widget_AppCompat_Button_Colored 0x0 -+int style Base_Widget_AppCompat_Button_Small 0x0 -+int style Base_Widget_AppCompat_CompoundButton_CheckBox 0x0 -+int style Base_Widget_AppCompat_CompoundButton_RadioButton 0x0 -+int style Base_Widget_AppCompat_CompoundButton_Switch 0x0 -+int style Base_Widget_AppCompat_DrawerArrowToggle 0x0 -+int style Base_Widget_AppCompat_DrawerArrowToggle_Common 0x0 -+int style Base_Widget_AppCompat_DropDownItem_Spinner 0x0 -+int style Base_Widget_AppCompat_EditText 0x0 -+int style Base_Widget_AppCompat_ImageButton 0x0 -+int style Base_Widget_AppCompat_Light_ActionBar 0x0 -+int style Base_Widget_AppCompat_Light_ActionBar_Solid 0x0 -+int style Base_Widget_AppCompat_Light_ActionBar_TabBar 0x0 -+int style Base_Widget_AppCompat_Light_ActionBar_TabText 0x0 -+int style Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse 0x0 -+int style Base_Widget_AppCompat_Light_ActionBar_TabView 0x0 -+int style Base_Widget_AppCompat_Light_PopupMenu 0x0 -+int style Base_Widget_AppCompat_Light_PopupMenu_Overflow 0x0 -+int style Base_Widget_AppCompat_ListMenuView 0x0 -+int style Base_Widget_AppCompat_ListPopupWindow 0x0 -+int style Base_Widget_AppCompat_ListView 0x0 -+int style Base_Widget_AppCompat_ListView_DropDown 0x0 -+int style Base_Widget_AppCompat_ListView_Menu 0x0 -+int style Base_Widget_AppCompat_PopupMenu 0x0 -+int style Base_Widget_AppCompat_PopupMenu_Overflow 0x0 -+int style Base_Widget_AppCompat_PopupWindow 0x0 -+int style Base_Widget_AppCompat_ProgressBar 0x0 -+int style Base_Widget_AppCompat_ProgressBar_Horizontal 0x0 -+int style Base_Widget_AppCompat_RatingBar 0x0 -+int style Base_Widget_AppCompat_RatingBar_Indicator 0x0 -+int style Base_Widget_AppCompat_RatingBar_Small 0x0 -+int style Base_Widget_AppCompat_SearchView 0x0 -+int style Base_Widget_AppCompat_SearchView_ActionBar 0x0 -+int style Base_Widget_AppCompat_SeekBar 0x0 -+int style Base_Widget_AppCompat_SeekBar_Discrete 0x0 -+int style Base_Widget_AppCompat_Spinner 0x0 -+int style Base_Widget_AppCompat_Spinner_Underlined 0x0 -+int style Base_Widget_AppCompat_TextView 0x0 -+int style Base_Widget_AppCompat_TextView_SpinnerItem 0x0 -+int style Base_Widget_AppCompat_Toolbar 0x0 -+int style Base_Widget_AppCompat_Toolbar_Button_Navigation 0x0 -+int style CalendarDatePickerDialog 0x0 -+int style CalendarDatePickerStyle 0x0 -+int style DialogAnimationFade 0x0 -+int style DialogAnimationSlide 0x0 -+int style Platform_AppCompat 0x0 -+int style Platform_AppCompat_Light 0x0 -+int style Platform_ThemeOverlay_AppCompat 0x0 -+int style Platform_ThemeOverlay_AppCompat_Dark 0x0 -+int style Platform_ThemeOverlay_AppCompat_Light 0x0 -+int style Platform_V21_AppCompat 0x0 -+int style Platform_V21_AppCompat_Light 0x0 -+int style Platform_V25_AppCompat 0x0 -+int style Platform_V25_AppCompat_Light 0x0 -+int style Platform_Widget_AppCompat_Spinner 0x0 -+int style RtlOverlay_DialogWindowTitle_AppCompat 0x0 -+int style RtlOverlay_Widget_AppCompat_ActionBar_TitleItem 0x0 -+int style RtlOverlay_Widget_AppCompat_DialogTitle_Icon 0x0 -+int style RtlOverlay_Widget_AppCompat_PopupMenuItem 0x0 -+int style RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup 0x0 -+int style RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut 0x0 -+int style RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow 0x0 -+int style RtlOverlay_Widget_AppCompat_PopupMenuItem_Text 0x0 -+int style RtlOverlay_Widget_AppCompat_PopupMenuItem_Title 0x0 -+int style RtlOverlay_Widget_AppCompat_SearchView_MagIcon 0x0 -+int style RtlOverlay_Widget_AppCompat_Search_DropDown 0x0 -+int style RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 0x0 -+int style RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 0x0 -+int style RtlOverlay_Widget_AppCompat_Search_DropDown_Query 0x0 -+int style RtlOverlay_Widget_AppCompat_Search_DropDown_Text 0x0 -+int style RtlUnderlay_Widget_AppCompat_ActionButton 0x0 -+int style RtlUnderlay_Widget_AppCompat_ActionButton_Overflow 0x0 -+int style SpinnerDatePickerDialog 0x0 -+int style SpinnerDatePickerStyle 0x0 -+int style TextAppearance_AppCompat 0x0 -+int style TextAppearance_AppCompat_Body1 0x0 -+int style TextAppearance_AppCompat_Body2 0x0 -+int style TextAppearance_AppCompat_Button 0x0 -+int style TextAppearance_AppCompat_Caption 0x0 -+int style TextAppearance_AppCompat_Display1 0x0 -+int style TextAppearance_AppCompat_Display2 0x0 -+int style TextAppearance_AppCompat_Display3 0x0 -+int style TextAppearance_AppCompat_Display4 0x0 -+int style TextAppearance_AppCompat_Headline 0x0 -+int style TextAppearance_AppCompat_Inverse 0x0 -+int style TextAppearance_AppCompat_Large 0x0 -+int style TextAppearance_AppCompat_Large_Inverse 0x0 -+int style TextAppearance_AppCompat_Light_SearchResult_Subtitle 0x0 -+int style TextAppearance_AppCompat_Light_SearchResult_Title 0x0 -+int style TextAppearance_AppCompat_Light_Widget_PopupMenu_Large 0x0 -+int style TextAppearance_AppCompat_Light_Widget_PopupMenu_Small 0x0 -+int style TextAppearance_AppCompat_Medium 0x0 -+int style TextAppearance_AppCompat_Medium_Inverse 0x0 -+int style TextAppearance_AppCompat_Menu 0x0 -+int style TextAppearance_AppCompat_SearchResult_Subtitle 0x0 -+int style TextAppearance_AppCompat_SearchResult_Title 0x0 -+int style TextAppearance_AppCompat_Small 0x0 -+int style TextAppearance_AppCompat_Small_Inverse 0x0 -+int style TextAppearance_AppCompat_Subhead 0x0 -+int style TextAppearance_AppCompat_Subhead_Inverse 0x0 -+int style TextAppearance_AppCompat_Title 0x0 -+int style TextAppearance_AppCompat_Title_Inverse 0x0 -+int style TextAppearance_AppCompat_Tooltip 0x0 -+int style TextAppearance_AppCompat_Widget_ActionBar_Menu 0x0 -+int style TextAppearance_AppCompat_Widget_ActionBar_Subtitle 0x0 -+int style TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse 0x0 -+int style TextAppearance_AppCompat_Widget_ActionBar_Title 0x0 -+int style TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse 0x0 -+int style TextAppearance_AppCompat_Widget_ActionMode_Subtitle 0x0 -+int style TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse 0x0 -+int style TextAppearance_AppCompat_Widget_ActionMode_Title 0x0 -+int style TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse 0x0 -+int style TextAppearance_AppCompat_Widget_Button 0x0 -+int style TextAppearance_AppCompat_Widget_Button_Borderless_Colored 0x0 -+int style TextAppearance_AppCompat_Widget_Button_Colored 0x0 -+int style TextAppearance_AppCompat_Widget_Button_Inverse 0x0 -+int style TextAppearance_AppCompat_Widget_DropDownItem 0x0 -+int style TextAppearance_AppCompat_Widget_PopupMenu_Header 0x0 -+int style TextAppearance_AppCompat_Widget_PopupMenu_Large 0x0 -+int style TextAppearance_AppCompat_Widget_PopupMenu_Small 0x0 -+int style TextAppearance_AppCompat_Widget_Switch 0x0 -+int style TextAppearance_AppCompat_Widget_TextView_SpinnerItem 0x0 -+int style TextAppearance_Compat_Notification 0x0 -+int style TextAppearance_Compat_Notification_Info 0x0 -+int style TextAppearance_Compat_Notification_Line2 0x0 -+int style TextAppearance_Compat_Notification_Time 0x0 -+int style TextAppearance_Compat_Notification_Title 0x0 -+int style TextAppearance_Widget_AppCompat_ExpandedMenu_Item 0x0 -+int style TextAppearance_Widget_AppCompat_Toolbar_Subtitle 0x0 -+int style TextAppearance_Widget_AppCompat_Toolbar_Title 0x0 -+int style Theme 0x0 -+int style ThemeOverlay_AppCompat 0x0 -+int style ThemeOverlay_AppCompat_ActionBar 0x0 -+int style ThemeOverlay_AppCompat_Dark 0x0 -+int style ThemeOverlay_AppCompat_Dark_ActionBar 0x0 -+int style ThemeOverlay_AppCompat_DayNight 0x0 -+int style ThemeOverlay_AppCompat_DayNight_ActionBar 0x0 -+int style ThemeOverlay_AppCompat_Dialog 0x0 -+int style ThemeOverlay_AppCompat_Dialog_Alert 0x0 -+int style ThemeOverlay_AppCompat_Light 0x0 -+int style Theme_AppCompat 0x0 -+int style Theme_AppCompat_CompactMenu 0x0 -+int style Theme_AppCompat_DayNight 0x0 -+int style Theme_AppCompat_DayNight_DarkActionBar 0x0 -+int style Theme_AppCompat_DayNight_Dialog 0x0 -+int style Theme_AppCompat_DayNight_DialogWhenLarge 0x0 -+int style Theme_AppCompat_DayNight_Dialog_Alert 0x0 -+int style Theme_AppCompat_DayNight_Dialog_MinWidth 0x0 -+int style Theme_AppCompat_DayNight_NoActionBar 0x0 -+int style Theme_AppCompat_Dialog 0x0 -+int style Theme_AppCompat_DialogWhenLarge 0x0 -+int style Theme_AppCompat_Dialog_Alert 0x0 -+int style Theme_AppCompat_Dialog_MinWidth 0x0 -+int style Theme_AppCompat_Empty 0x0 -+int style Theme_AppCompat_Light 0x0 -+int style Theme_AppCompat_Light_DarkActionBar 0x0 -+int style Theme_AppCompat_Light_Dialog 0x0 -+int style Theme_AppCompat_Light_DialogWhenLarge 0x0 -+int style Theme_AppCompat_Light_Dialog_Alert 0x0 -+int style Theme_AppCompat_Light_Dialog_MinWidth 0x0 -+int style Theme_AppCompat_Light_NoActionBar 0x0 -+int style Theme_AppCompat_NoActionBar 0x0 -+int style Theme_AutofillInlineSuggestion 0x0 -+int style Theme_Catalyst 0x0 -+int style Theme_Catalyst_LogBox 0x0 -+int style Theme_Catalyst_RedBox 0x0 -+int style Theme_FullScreenDialog 0x0 -+int style Theme_FullScreenDialogAnimatedFade 0x0 -+int style Theme_FullScreenDialogAnimatedSlide 0x0 -+int style Theme_ReactNative_AppCompat_Light 0x0 -+int style Theme_ReactNative_AppCompat_Light_NoActionBar_FullScreen 0x0 -+int style Widget_AppCompat_ActionBar 0x0 -+int style Widget_AppCompat_ActionBar_Solid 0x0 -+int style Widget_AppCompat_ActionBar_TabBar 0x0 -+int style Widget_AppCompat_ActionBar_TabText 0x0 -+int style Widget_AppCompat_ActionBar_TabView 0x0 -+int style Widget_AppCompat_ActionButton 0x0 -+int style Widget_AppCompat_ActionButton_CloseMode 0x0 -+int style Widget_AppCompat_ActionButton_Overflow 0x0 -+int style Widget_AppCompat_ActionMode 0x0 -+int style Widget_AppCompat_ActivityChooserView 0x0 -+int style Widget_AppCompat_AutoCompleteTextView 0x0 -+int style Widget_AppCompat_Button 0x0 -+int style Widget_AppCompat_ButtonBar 0x0 -+int style Widget_AppCompat_ButtonBar_AlertDialog 0x0 -+int style Widget_AppCompat_Button_Borderless 0x0 -+int style Widget_AppCompat_Button_Borderless_Colored 0x0 -+int style Widget_AppCompat_Button_ButtonBar_AlertDialog 0x0 -+int style Widget_AppCompat_Button_Colored 0x0 -+int style Widget_AppCompat_Button_Small 0x0 -+int style Widget_AppCompat_CompoundButton_CheckBox 0x0 -+int style Widget_AppCompat_CompoundButton_RadioButton 0x0 -+int style Widget_AppCompat_CompoundButton_Switch 0x0 -+int style Widget_AppCompat_DrawerArrowToggle 0x0 -+int style Widget_AppCompat_DropDownItem_Spinner 0x0 -+int style Widget_AppCompat_EditText 0x0 -+int style Widget_AppCompat_ImageButton 0x0 -+int style Widget_AppCompat_Light_ActionBar 0x0 -+int style Widget_AppCompat_Light_ActionBar_Solid 0x0 -+int style Widget_AppCompat_Light_ActionBar_Solid_Inverse 0x0 -+int style Widget_AppCompat_Light_ActionBar_TabBar 0x0 -+int style Widget_AppCompat_Light_ActionBar_TabBar_Inverse 0x0 -+int style Widget_AppCompat_Light_ActionBar_TabText 0x0 -+int style Widget_AppCompat_Light_ActionBar_TabText_Inverse 0x0 -+int style Widget_AppCompat_Light_ActionBar_TabView 0x0 -+int style Widget_AppCompat_Light_ActionBar_TabView_Inverse 0x0 -+int style Widget_AppCompat_Light_ActionButton 0x0 -+int style Widget_AppCompat_Light_ActionButton_CloseMode 0x0 -+int style Widget_AppCompat_Light_ActionButton_Overflow 0x0 -+int style Widget_AppCompat_Light_ActionMode_Inverse 0x0 -+int style Widget_AppCompat_Light_ActivityChooserView 0x0 -+int style Widget_AppCompat_Light_AutoCompleteTextView 0x0 -+int style Widget_AppCompat_Light_DropDownItem_Spinner 0x0 -+int style Widget_AppCompat_Light_ListPopupWindow 0x0 -+int style Widget_AppCompat_Light_ListView_DropDown 0x0 -+int style Widget_AppCompat_Light_PopupMenu 0x0 -+int style Widget_AppCompat_Light_PopupMenu_Overflow 0x0 -+int style Widget_AppCompat_Light_SearchView 0x0 -+int style Widget_AppCompat_Light_Spinner_DropDown_ActionBar 0x0 -+int style Widget_AppCompat_ListMenuView 0x0 -+int style Widget_AppCompat_ListPopupWindow 0x0 -+int style Widget_AppCompat_ListView 0x0 -+int style Widget_AppCompat_ListView_DropDown 0x0 -+int style Widget_AppCompat_ListView_Menu 0x0 -+int style Widget_AppCompat_PopupMenu 0x0 -+int style Widget_AppCompat_PopupMenu_Overflow 0x0 -+int style Widget_AppCompat_PopupWindow 0x0 -+int style Widget_AppCompat_ProgressBar 0x0 -+int style Widget_AppCompat_ProgressBar_Horizontal 0x0 -+int style Widget_AppCompat_RatingBar 0x0 -+int style Widget_AppCompat_RatingBar_Indicator 0x0 -+int style Widget_AppCompat_RatingBar_Small 0x0 -+int style Widget_AppCompat_SearchView 0x0 -+int style Widget_AppCompat_SearchView_ActionBar 0x0 -+int style Widget_AppCompat_SeekBar 0x0 -+int style Widget_AppCompat_SeekBar_Discrete 0x0 -+int style Widget_AppCompat_Spinner 0x0 -+int style Widget_AppCompat_Spinner_DropDown 0x0 -+int style Widget_AppCompat_Spinner_DropDown_ActionBar 0x0 -+int style Widget_AppCompat_Spinner_Underlined 0x0 -+int style Widget_AppCompat_TextView 0x0 -+int style Widget_AppCompat_TextView_SpinnerItem 0x0 -+int style Widget_AppCompat_Toolbar 0x0 -+int style Widget_AppCompat_Toolbar_Button_Navigation 0x0 -+int style Widget_Autofill 0x0 -+int style Widget_Autofill_InlineSuggestionChip 0x0 -+int style Widget_Autofill_InlineSuggestionEndIconStyle 0x0 -+int style Widget_Autofill_InlineSuggestionStartIconStyle 0x0 -+int style Widget_Autofill_InlineSuggestionSubtitle 0x0 -+int style Widget_Autofill_InlineSuggestionTitle 0x0 -+int style Widget_Compat_NotificationActionContainer 0x0 -+int style Widget_Compat_NotificationActionText 0x0 -+int style redboxButton 0x0 -+int[] styleable ActionBar { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } -+int styleable ActionBar_background 0 -+int styleable ActionBar_backgroundSplit 1 -+int styleable ActionBar_backgroundStacked 2 -+int styleable ActionBar_contentInsetEnd 3 -+int styleable ActionBar_contentInsetEndWithActions 4 -+int styleable ActionBar_contentInsetLeft 5 -+int styleable ActionBar_contentInsetRight 6 -+int styleable ActionBar_contentInsetStart 7 -+int styleable ActionBar_contentInsetStartWithNavigation 8 -+int styleable ActionBar_customNavigationLayout 9 -+int styleable ActionBar_displayOptions 10 -+int styleable ActionBar_divider 11 -+int styleable ActionBar_elevation 12 -+int styleable ActionBar_height 13 -+int styleable ActionBar_hideOnContentScroll 14 -+int styleable ActionBar_homeAsUpIndicator 15 -+int styleable ActionBar_homeLayout 16 -+int styleable ActionBar_icon 17 -+int styleable ActionBar_indeterminateProgressStyle 18 -+int styleable ActionBar_itemPadding 19 -+int styleable ActionBar_logo 20 -+int styleable ActionBar_navigationMode 21 -+int styleable ActionBar_popupTheme 22 -+int styleable ActionBar_progressBarPadding 23 -+int styleable ActionBar_progressBarStyle 24 -+int styleable ActionBar_subtitle 25 -+int styleable ActionBar_subtitleTextStyle 26 -+int styleable ActionBar_title 27 -+int styleable ActionBar_titleTextStyle 28 -+int[] styleable ActionBarLayout { 0x10100b3 } -+int styleable ActionBarLayout_android_layout_gravity 0 -+int[] styleable ActionMenuItemView { 0x101013f } -+int styleable ActionMenuItemView_android_minWidth 0 -+int[] styleable ActionMenuView { } -+int[] styleable ActionMode { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } -+int styleable ActionMode_background 0 -+int styleable ActionMode_backgroundSplit 1 -+int styleable ActionMode_closeItemLayout 2 -+int styleable ActionMode_height 3 -+int styleable ActionMode_subtitleTextStyle 4 -+int styleable ActionMode_titleTextStyle 5 -+int[] styleable ActivityChooserView { 0x0, 0x0 } -+int styleable ActivityChooserView_expandActivityOverflowButtonDrawable 0 -+int styleable ActivityChooserView_initialActivityCount 1 -+int[] styleable AlertDialog { 0x10100f2, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } -+int styleable AlertDialog_android_layout 0 -+int styleable AlertDialog_buttonIconDimen 1 -+int styleable AlertDialog_buttonPanelSideLayout 2 -+int styleable AlertDialog_listItemLayout 3 -+int styleable AlertDialog_listLayout 4 -+int styleable AlertDialog_multiChoiceItemLayout 5 -+int styleable AlertDialog_showTitle 6 -+int styleable AlertDialog_singleChoiceItemLayout 7 -+int[] styleable AnimatedStateListDrawableCompat { 0x1010196, 0x101011c, 0x101030c, 0x101030d, 0x1010195, 0x1010194 } -+int styleable AnimatedStateListDrawableCompat_android_constantSize 0 -+int styleable AnimatedStateListDrawableCompat_android_dither 1 -+int styleable AnimatedStateListDrawableCompat_android_enterFadeDuration 2 -+int styleable AnimatedStateListDrawableCompat_android_exitFadeDuration 3 -+int styleable AnimatedStateListDrawableCompat_android_variablePadding 4 -+int styleable AnimatedStateListDrawableCompat_android_visible 5 -+int[] styleable AnimatedStateListDrawableItem { 0x1010199, 0x10100d0 } -+int styleable AnimatedStateListDrawableItem_android_drawable 0 -+int styleable AnimatedStateListDrawableItem_android_id 1 -+int[] styleable AnimatedStateListDrawableTransition { 0x1010199, 0x101044a, 0x101044b, 0x1010449 } -+int styleable AnimatedStateListDrawableTransition_android_drawable 0 -+int styleable AnimatedStateListDrawableTransition_android_fromId 1 -+int styleable AnimatedStateListDrawableTransition_android_reversible 2 -+int styleable AnimatedStateListDrawableTransition_android_toId 3 -+int[] styleable AppCompatEmojiHelper { } -+int[] styleable AppCompatImageView { 0x1010119, 0x0, 0x0, 0x0 } -+int styleable AppCompatImageView_android_src 0 -+int styleable AppCompatImageView_srcCompat 1 -+int styleable AppCompatImageView_tint 2 -+int styleable AppCompatImageView_tintMode 3 -+int[] styleable AppCompatSeekBar { 0x1010142, 0x0, 0x0, 0x0 } -+int styleable AppCompatSeekBar_android_thumb 0 -+int styleable AppCompatSeekBar_tickMark 1 -+int styleable AppCompatSeekBar_tickMarkTint 2 -+int styleable AppCompatSeekBar_tickMarkTintMode 3 -+int[] styleable AppCompatTextHelper { 0x101016e, 0x1010393, 0x101016f, 0x1010170, 0x1010392, 0x101016d, 0x1010034 } -+int styleable AppCompatTextHelper_android_drawableBottom 0 -+int styleable AppCompatTextHelper_android_drawableEnd 1 -+int styleable AppCompatTextHelper_android_drawableLeft 2 -+int styleable AppCompatTextHelper_android_drawableRight 3 -+int styleable AppCompatTextHelper_android_drawableStart 4 -+int styleable AppCompatTextHelper_android_drawableTop 5 -+int styleable AppCompatTextHelper_android_textAppearance 6 -+int[] styleable AppCompatTextView { 0x1010034, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } -+int styleable AppCompatTextView_android_textAppearance 0 -+int styleable AppCompatTextView_autoSizeMaxTextSize 1 -+int styleable AppCompatTextView_autoSizeMinTextSize 2 -+int styleable AppCompatTextView_autoSizePresetSizes 3 -+int styleable AppCompatTextView_autoSizeStepGranularity 4 -+int styleable AppCompatTextView_autoSizeTextType 5 -+int styleable AppCompatTextView_drawableBottomCompat 6 -+int styleable AppCompatTextView_drawableEndCompat 7 -+int styleable AppCompatTextView_drawableLeftCompat 8 -+int styleable AppCompatTextView_drawableRightCompat 9 -+int styleable AppCompatTextView_drawableStartCompat 10 -+int styleable AppCompatTextView_drawableTint 11 -+int styleable AppCompatTextView_drawableTintMode 12 -+int styleable AppCompatTextView_drawableTopCompat 13 -+int styleable AppCompatTextView_emojiCompatEnabled 14 -+int styleable AppCompatTextView_firstBaselineToTopHeight 15 -+int styleable AppCompatTextView_fontFamily 16 -+int styleable AppCompatTextView_fontVariationSettings 17 -+int styleable AppCompatTextView_lastBaselineToBottomHeight 18 -+int styleable AppCompatTextView_lineHeight 19 -+int styleable AppCompatTextView_textAllCaps 20 -+int styleable AppCompatTextView_textLocale 21 -+int[] styleable AppCompatTheme { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x10100ae, 0x1010057, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } -+int styleable AppCompatTheme_actionBarDivider 0 -+int styleable AppCompatTheme_actionBarItemBackground 1 -+int styleable AppCompatTheme_actionBarPopupTheme 2 -+int styleable AppCompatTheme_actionBarSize 3 -+int styleable AppCompatTheme_actionBarSplitStyle 4 -+int styleable AppCompatTheme_actionBarStyle 5 -+int styleable AppCompatTheme_actionBarTabBarStyle 6 -+int styleable AppCompatTheme_actionBarTabStyle 7 -+int styleable AppCompatTheme_actionBarTabTextStyle 8 -+int styleable AppCompatTheme_actionBarTheme 9 -+int styleable AppCompatTheme_actionBarWidgetTheme 10 -+int styleable AppCompatTheme_actionButtonStyle 11 -+int styleable AppCompatTheme_actionDropDownStyle 12 -+int styleable AppCompatTheme_actionMenuTextAppearance 13 -+int styleable AppCompatTheme_actionMenuTextColor 14 -+int styleable AppCompatTheme_actionModeBackground 15 -+int styleable AppCompatTheme_actionModeCloseButtonStyle 16 -+int styleable AppCompatTheme_actionModeCloseContentDescription 17 -+int styleable AppCompatTheme_actionModeCloseDrawable 18 -+int styleable AppCompatTheme_actionModeCopyDrawable 19 -+int styleable AppCompatTheme_actionModeCutDrawable 20 -+int styleable AppCompatTheme_actionModeFindDrawable 21 -+int styleable AppCompatTheme_actionModePasteDrawable 22 -+int styleable AppCompatTheme_actionModePopupWindowStyle 23 -+int styleable AppCompatTheme_actionModeSelectAllDrawable 24 -+int styleable AppCompatTheme_actionModeShareDrawable 25 -+int styleable AppCompatTheme_actionModeSplitBackground 26 -+int styleable AppCompatTheme_actionModeStyle 27 -+int styleable AppCompatTheme_actionModeTheme 28 -+int styleable AppCompatTheme_actionModeWebSearchDrawable 29 -+int styleable AppCompatTheme_actionOverflowButtonStyle 30 -+int styleable AppCompatTheme_actionOverflowMenuStyle 31 -+int styleable AppCompatTheme_activityChooserViewStyle 32 -+int styleable AppCompatTheme_alertDialogButtonGroupStyle 33 -+int styleable AppCompatTheme_alertDialogCenterButtons 34 -+int styleable AppCompatTheme_alertDialogStyle 35 -+int styleable AppCompatTheme_alertDialogTheme 36 -+int styleable AppCompatTheme_android_windowAnimationStyle 37 -+int styleable AppCompatTheme_android_windowIsFloating 38 -+int styleable AppCompatTheme_autoCompleteTextViewStyle 39 -+int styleable AppCompatTheme_borderlessButtonStyle 40 -+int styleable AppCompatTheme_buttonBarButtonStyle 41 -+int styleable AppCompatTheme_buttonBarNegativeButtonStyle 42 -+int styleable AppCompatTheme_buttonBarNeutralButtonStyle 43 -+int styleable AppCompatTheme_buttonBarPositiveButtonStyle 44 -+int styleable AppCompatTheme_buttonBarStyle 45 -+int styleable AppCompatTheme_buttonStyle 46 -+int styleable AppCompatTheme_buttonStyleSmall 47 -+int styleable AppCompatTheme_checkboxStyle 48 -+int styleable AppCompatTheme_checkedTextViewStyle 49 -+int styleable AppCompatTheme_colorAccent 50 -+int styleable AppCompatTheme_colorBackgroundFloating 51 -+int styleable AppCompatTheme_colorButtonNormal 52 -+int styleable AppCompatTheme_colorControlActivated 53 -+int styleable AppCompatTheme_colorControlHighlight 54 -+int styleable AppCompatTheme_colorControlNormal 55 -+int styleable AppCompatTheme_colorError 56 -+int styleable AppCompatTheme_colorPrimary 57 -+int styleable AppCompatTheme_colorPrimaryDark 58 -+int styleable AppCompatTheme_colorSwitchThumbNormal 59 -+int styleable AppCompatTheme_controlBackground 60 -+int styleable AppCompatTheme_dialogCornerRadius 61 -+int styleable AppCompatTheme_dialogPreferredPadding 62 -+int styleable AppCompatTheme_dialogTheme 63 -+int styleable AppCompatTheme_dividerHorizontal 64 -+int styleable AppCompatTheme_dividerVertical 65 -+int styleable AppCompatTheme_dropDownListViewStyle 66 -+int styleable AppCompatTheme_dropdownListPreferredItemHeight 67 -+int styleable AppCompatTheme_editTextBackground 68 -+int styleable AppCompatTheme_editTextColor 69 -+int styleable AppCompatTheme_editTextStyle 70 -+int styleable AppCompatTheme_homeAsUpIndicator 71 -+int styleable AppCompatTheme_imageButtonStyle 72 -+int styleable AppCompatTheme_listChoiceBackgroundIndicator 73 -+int styleable AppCompatTheme_listChoiceIndicatorMultipleAnimated 74 -+int styleable AppCompatTheme_listChoiceIndicatorSingleAnimated 75 -+int styleable AppCompatTheme_listDividerAlertDialog 76 -+int styleable AppCompatTheme_listMenuViewStyle 77 -+int styleable AppCompatTheme_listPopupWindowStyle 78 -+int styleable AppCompatTheme_listPreferredItemHeight 79 -+int styleable AppCompatTheme_listPreferredItemHeightLarge 80 -+int styleable AppCompatTheme_listPreferredItemHeightSmall 81 -+int styleable AppCompatTheme_listPreferredItemPaddingEnd 82 -+int styleable AppCompatTheme_listPreferredItemPaddingLeft 83 -+int styleable AppCompatTheme_listPreferredItemPaddingRight 84 -+int styleable AppCompatTheme_listPreferredItemPaddingStart 85 -+int styleable AppCompatTheme_panelBackground 86 -+int styleable AppCompatTheme_panelMenuListTheme 87 -+int styleable AppCompatTheme_panelMenuListWidth 88 -+int styleable AppCompatTheme_popupMenuStyle 89 -+int styleable AppCompatTheme_popupWindowStyle 90 -+int styleable AppCompatTheme_radioButtonStyle 91 -+int styleable AppCompatTheme_ratingBarStyle 92 -+int styleable AppCompatTheme_ratingBarStyleIndicator 93 -+int styleable AppCompatTheme_ratingBarStyleSmall 94 -+int styleable AppCompatTheme_searchViewStyle 95 -+int styleable AppCompatTheme_seekBarStyle 96 -+int styleable AppCompatTheme_selectableItemBackground 97 -+int styleable AppCompatTheme_selectableItemBackgroundBorderless 98 -+int styleable AppCompatTheme_spinnerDropDownItemStyle 99 -+int styleable AppCompatTheme_spinnerStyle 100 -+int styleable AppCompatTheme_switchStyle 101 -+int styleable AppCompatTheme_textAppearanceLargePopupMenu 102 -+int styleable AppCompatTheme_textAppearanceListItem 103 -+int styleable AppCompatTheme_textAppearanceListItemSecondary 104 -+int styleable AppCompatTheme_textAppearanceListItemSmall 105 -+int styleable AppCompatTheme_textAppearancePopupMenuHeader 106 -+int styleable AppCompatTheme_textAppearanceSearchResultSubtitle 107 -+int styleable AppCompatTheme_textAppearanceSearchResultTitle 108 -+int styleable AppCompatTheme_textAppearanceSmallPopupMenu 109 -+int styleable AppCompatTheme_textColorAlertDialogListItem 110 -+int styleable AppCompatTheme_textColorSearchUrl 111 -+int styleable AppCompatTheme_toolbarNavigationButtonStyle 112 -+int styleable AppCompatTheme_toolbarStyle 113 -+int styleable AppCompatTheme_tooltipForegroundColor 114 -+int styleable AppCompatTheme_tooltipFrameBackground 115 -+int styleable AppCompatTheme_viewInflaterClass 116 -+int styleable AppCompatTheme_windowActionBar 117 -+int styleable AppCompatTheme_windowActionBarOverlay 118 -+int styleable AppCompatTheme_windowActionModeOverlay 119 -+int styleable AppCompatTheme_windowFixedHeightMajor 120 -+int styleable AppCompatTheme_windowFixedHeightMinor 121 -+int styleable AppCompatTheme_windowFixedWidthMajor 122 -+int styleable AppCompatTheme_windowFixedWidthMinor 123 -+int styleable AppCompatTheme_windowMinWidthMajor 124 -+int styleable AppCompatTheme_windowMinWidthMinor 125 -+int styleable AppCompatTheme_windowNoTitle 126 -+int[] styleable Autofill_InlineSuggestion { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } -+int styleable Autofill_InlineSuggestion_autofillInlineSuggestionChip 0 -+int styleable Autofill_InlineSuggestion_autofillInlineSuggestionEndIconStyle 1 -+int styleable Autofill_InlineSuggestion_autofillInlineSuggestionStartIconStyle 2 -+int styleable Autofill_InlineSuggestion_autofillInlineSuggestionSubtitle 3 -+int styleable Autofill_InlineSuggestion_autofillInlineSuggestionTitle 4 -+int styleable Autofill_InlineSuggestion_isAutofillInlineSuggestionTheme 5 -+int[] styleable ButtonBarLayout { 0x0 } -+int styleable ButtonBarLayout_allowStacking 0 -+int[] styleable Capability { 0x0, 0x0 } -+int styleable Capability_queryPatterns 0 -+int styleable Capability_shortcutMatchRequired 1 -+int[] styleable CheckedTextView { 0x1010108, 0x0, 0x0, 0x0 } -+int styleable CheckedTextView_android_checkMark 0 -+int styleable CheckedTextView_checkMarkCompat 1 -+int styleable CheckedTextView_checkMarkTint 2 -+int styleable CheckedTextView_checkMarkTintMode 3 -+int[] styleable ColorStateListItem { 0x0, 0x101031f, 0x10101a5, 0x1010647, 0x0 } -+int styleable ColorStateListItem_alpha 0 -+int styleable ColorStateListItem_android_alpha 1 -+int styleable ColorStateListItem_android_color 2 -+int styleable ColorStateListItem_android_lStar 3 -+int styleable ColorStateListItem_lStar 4 -+int[] styleable CompoundButton { 0x1010107, 0x0, 0x0, 0x0 } -+int styleable CompoundButton_android_button 0 -+int styleable CompoundButton_buttonCompat 1 -+int styleable CompoundButton_buttonTint 2 -+int styleable CompoundButton_buttonTintMode 3 -+int[] styleable DrawerArrowToggle { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } -+int styleable DrawerArrowToggle_arrowHeadLength 0 -+int styleable DrawerArrowToggle_arrowShaftLength 1 -+int styleable DrawerArrowToggle_barLength 2 -+int styleable DrawerArrowToggle_color 3 -+int styleable DrawerArrowToggle_drawableSize 4 -+int styleable DrawerArrowToggle_gapBetweenBars 5 -+int styleable DrawerArrowToggle_spinBars 6 -+int styleable DrawerArrowToggle_thickness 7 -+int[] styleable FontFamily { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } -+int styleable FontFamily_fontProviderAuthority 0 -+int styleable FontFamily_fontProviderCerts 1 -+int styleable FontFamily_fontProviderFetchStrategy 2 -+int styleable FontFamily_fontProviderFetchTimeout 3 -+int styleable FontFamily_fontProviderPackage 4 -+int styleable FontFamily_fontProviderQuery 5 -+int styleable FontFamily_fontProviderSystemFontFamily 6 -+int[] styleable FontFamilyFont { 0x1010532, 0x101053f, 0x1010570, 0x1010533, 0x101056f, 0x0, 0x0, 0x0, 0x0, 0x0 } -+int styleable FontFamilyFont_android_font 0 -+int styleable FontFamilyFont_android_fontStyle 1 -+int styleable FontFamilyFont_android_fontVariationSettings 2 -+int styleable FontFamilyFont_android_fontWeight 3 -+int styleable FontFamilyFont_android_ttcIndex 4 -+int styleable FontFamilyFont_font 5 -+int styleable FontFamilyFont_fontStyle 6 -+int styleable FontFamilyFont_fontVariationSettings 7 -+int styleable FontFamilyFont_fontWeight 8 -+int styleable FontFamilyFont_ttcIndex 9 -+int[] styleable Fragment { 0x10100d0, 0x1010003, 0x10100d1 } -+int styleable Fragment_android_id 0 -+int styleable Fragment_android_name 1 -+int styleable Fragment_android_tag 2 -+int[] styleable FragmentContainerView { 0x1010003, 0x10100d1 } -+int styleable FragmentContainerView_android_name 0 -+int styleable FragmentContainerView_android_tag 1 -+int[] styleable GenericDraweeHierarchy { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } -+int styleable GenericDraweeHierarchy_actualImageScaleType 0 -+int styleable GenericDraweeHierarchy_backgroundImage 1 -+int styleable GenericDraweeHierarchy_fadeDuration 2 -+int styleable GenericDraweeHierarchy_failureImage 3 -+int styleable GenericDraweeHierarchy_failureImageScaleType 4 -+int styleable GenericDraweeHierarchy_overlayImage 5 -+int styleable GenericDraweeHierarchy_placeholderImage 6 -+int styleable GenericDraweeHierarchy_placeholderImageScaleType 7 -+int styleable GenericDraweeHierarchy_pressedStateOverlayImage 8 -+int styleable GenericDraweeHierarchy_progressBarAutoRotateInterval 9 -+int styleable GenericDraweeHierarchy_progressBarImage 10 -+int styleable GenericDraweeHierarchy_progressBarImageScaleType 11 -+int styleable GenericDraweeHierarchy_retryImage 12 -+int styleable GenericDraweeHierarchy_retryImageScaleType 13 -+int styleable GenericDraweeHierarchy_roundAsCircle 14 -+int styleable GenericDraweeHierarchy_roundBottomEnd 15 -+int styleable GenericDraweeHierarchy_roundBottomLeft 16 -+int styleable GenericDraweeHierarchy_roundBottomRight 17 -+int styleable GenericDraweeHierarchy_roundBottomStart 18 -+int styleable GenericDraweeHierarchy_roundTopEnd 19 -+int styleable GenericDraweeHierarchy_roundTopLeft 20 -+int styleable GenericDraweeHierarchy_roundTopRight 21 -+int styleable GenericDraweeHierarchy_roundTopStart 22 -+int styleable GenericDraweeHierarchy_roundWithOverlayColor 23 -+int styleable GenericDraweeHierarchy_roundedCornerRadius 24 -+int styleable GenericDraweeHierarchy_roundingBorderColor 25 -+int styleable GenericDraweeHierarchy_roundingBorderPadding 26 -+int styleable GenericDraweeHierarchy_roundingBorderWidth 27 -+int styleable GenericDraweeHierarchy_viewAspectRatio 28 -+int[] styleable GradientColor { 0x101020b, 0x10101a2, 0x10101a3, 0x101019e, 0x1010512, 0x1010513, 0x10101a4, 0x101019d, 0x1010510, 0x1010511, 0x1010201, 0x10101a1 } -+int styleable GradientColor_android_centerColor 0 -+int styleable GradientColor_android_centerX 1 -+int styleable GradientColor_android_centerY 2 -+int styleable GradientColor_android_endColor 3 -+int styleable GradientColor_android_endX 4 -+int styleable GradientColor_android_endY 5 -+int styleable GradientColor_android_gradientRadius 6 -+int styleable GradientColor_android_startColor 7 -+int styleable GradientColor_android_startX 8 -+int styleable GradientColor_android_startY 9 -+int styleable GradientColor_android_tileMode 10 -+int styleable GradientColor_android_type 11 -+int[] styleable GradientColorItem { 0x10101a5, 0x1010514 } -+int styleable GradientColorItem_android_color 0 -+int styleable GradientColorItem_android_offset 1 -+int[] styleable LinearLayoutCompat { 0x1010126, 0x1010127, 0x10100af, 0x10100c4, 0x1010128, 0x0, 0x0, 0x0, 0x0 } -+int styleable LinearLayoutCompat_android_baselineAligned 0 -+int styleable LinearLayoutCompat_android_baselineAlignedChildIndex 1 -+int styleable LinearLayoutCompat_android_gravity 2 -+int styleable LinearLayoutCompat_android_orientation 3 -+int styleable LinearLayoutCompat_android_weightSum 4 -+int styleable LinearLayoutCompat_divider 5 -+int styleable LinearLayoutCompat_dividerPadding 6 -+int styleable LinearLayoutCompat_measureWithLargestChild 7 -+int styleable LinearLayoutCompat_showDividers 8 -+int[] styleable LinearLayoutCompat_Layout { 0x10100b3, 0x10100f5, 0x1010181, 0x10100f4 } -+int styleable LinearLayoutCompat_Layout_android_layout_gravity 0 -+int styleable LinearLayoutCompat_Layout_android_layout_height 1 -+int styleable LinearLayoutCompat_Layout_android_layout_weight 2 -+int styleable LinearLayoutCompat_Layout_android_layout_width 3 -+int[] styleable ListPopupWindow { 0x10102ac, 0x10102ad } -+int styleable ListPopupWindow_android_dropDownHorizontalOffset 0 -+int styleable ListPopupWindow_android_dropDownVerticalOffset 1 -+int[] styleable MenuGroup { 0x10101e0, 0x101000e, 0x10100d0, 0x10101de, 0x10101df, 0x1010194 } -+int styleable MenuGroup_android_checkableBehavior 0 -+int styleable MenuGroup_android_enabled 1 -+int styleable MenuGroup_android_id 2 -+int styleable MenuGroup_android_menuCategory 3 -+int styleable MenuGroup_android_orderInCategory 4 -+int styleable MenuGroup_android_visible 5 -+int[] styleable MenuItem { 0x0, 0x0, 0x0, 0x0, 0x10101e3, 0x10101e5, 0x1010106, 0x101000e, 0x1010002, 0x10100d0, 0x10101de, 0x10101e4, 0x101026f, 0x10101df, 0x10101e1, 0x10101e2, 0x1010194, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } -+int styleable MenuItem_actionLayout 0 -+int styleable MenuItem_actionProviderClass 1 -+int styleable MenuItem_actionViewClass 2 -+int styleable MenuItem_alphabeticModifiers 3 -+int styleable MenuItem_android_alphabeticShortcut 4 -+int styleable MenuItem_android_checkable 5 -+int styleable MenuItem_android_checked 6 -+int styleable MenuItem_android_enabled 7 -+int styleable MenuItem_android_icon 8 -+int styleable MenuItem_android_id 9 -+int styleable MenuItem_android_menuCategory 10 -+int styleable MenuItem_android_numericShortcut 11 -+int styleable MenuItem_android_onClick 12 -+int styleable MenuItem_android_orderInCategory 13 -+int styleable MenuItem_android_title 14 -+int styleable MenuItem_android_titleCondensed 15 -+int styleable MenuItem_android_visible 16 -+int styleable MenuItem_contentDescription 17 -+int styleable MenuItem_iconTint 18 -+int styleable MenuItem_iconTintMode 19 -+int styleable MenuItem_numericModifiers 20 -+int styleable MenuItem_showAsAction 21 -+int styleable MenuItem_tooltipText 22 -+int[] styleable MenuView { 0x101012f, 0x101012d, 0x1010130, 0x1010131, 0x101012c, 0x101012e, 0x10100ae, 0x0, 0x0 } -+int styleable MenuView_android_headerBackground 0 -+int styleable MenuView_android_horizontalDivider 1 -+int styleable MenuView_android_itemBackground 2 -+int styleable MenuView_android_itemIconDisabledAlpha 3 -+int styleable MenuView_android_itemTextAppearance 4 -+int styleable MenuView_android_verticalDivider 5 -+int styleable MenuView_android_windowAnimationStyle 6 -+int styleable MenuView_preserveIconSpacing 7 -+int styleable MenuView_subMenuArrow 8 -+int[] styleable PopupWindow { 0x10102c9, 0x1010176, 0x0 } -+int styleable PopupWindow_android_popupAnimationStyle 0 -+int styleable PopupWindow_android_popupBackground 1 -+int styleable PopupWindow_overlapAnchor 2 -+int[] styleable PopupWindowBackgroundState { 0x0 } -+int styleable PopupWindowBackgroundState_state_above_anchor 0 -+int[] styleable RecycleListView { 0x0, 0x0 } -+int styleable RecycleListView_paddingBottomNoButtons 0 -+int styleable RecycleListView_paddingTopNoTitle 1 -+int[] styleable SearchView { 0x10100da, 0x1010264, 0x1010220, 0x101011f, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } -+int styleable SearchView_android_focusable 0 -+int styleable SearchView_android_imeOptions 1 -+int styleable SearchView_android_inputType 2 -+int styleable SearchView_android_maxWidth 3 -+int styleable SearchView_closeIcon 4 -+int styleable SearchView_commitIcon 5 -+int styleable SearchView_defaultQueryHint 6 -+int styleable SearchView_goIcon 7 -+int styleable SearchView_iconifiedByDefault 8 -+int styleable SearchView_layout 9 -+int styleable SearchView_queryBackground 10 -+int styleable SearchView_queryHint 11 -+int styleable SearchView_searchHintIcon 12 -+int styleable SearchView_searchIcon 13 -+int styleable SearchView_submitBackground 14 -+int styleable SearchView_suggestionRowLayout 15 -+int styleable SearchView_voiceIcon 16 -+int[] styleable SimpleDraweeView { 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } -+int styleable SimpleDraweeView_actualImageResource 0 -+int styleable SimpleDraweeView_actualImageScaleType 1 -+int styleable SimpleDraweeView_actualImageUri 2 -+int styleable SimpleDraweeView_backgroundImage 3 -+int styleable SimpleDraweeView_fadeDuration 4 -+int styleable SimpleDraweeView_failureImage 5 -+int styleable SimpleDraweeView_failureImageScaleType 6 -+int styleable SimpleDraweeView_overlayImage 7 -+int styleable SimpleDraweeView_placeholderImage 8 -+int styleable SimpleDraweeView_placeholderImageScaleType 9 -+int styleable SimpleDraweeView_pressedStateOverlayImage 10 -+int styleable SimpleDraweeView_progressBarAutoRotateInterval 11 -+int styleable SimpleDraweeView_progressBarImage 12 -+int styleable SimpleDraweeView_progressBarImageScaleType 13 -+int styleable SimpleDraweeView_retryImage 14 -+int styleable SimpleDraweeView_retryImageScaleType 15 -+int styleable SimpleDraweeView_roundAsCircle 16 -+int styleable SimpleDraweeView_roundBottomEnd 17 -+int styleable SimpleDraweeView_roundBottomLeft 18 -+int styleable SimpleDraweeView_roundBottomRight 19 -+int styleable SimpleDraweeView_roundBottomStart 20 -+int styleable SimpleDraweeView_roundTopEnd 21 -+int styleable SimpleDraweeView_roundTopLeft 22 -+int styleable SimpleDraweeView_roundTopRight 23 -+int styleable SimpleDraweeView_roundTopStart 24 -+int styleable SimpleDraweeView_roundWithOverlayColor 25 -+int styleable SimpleDraweeView_roundedCornerRadius 26 -+int styleable SimpleDraweeView_roundingBorderColor 27 -+int styleable SimpleDraweeView_roundingBorderPadding 28 -+int styleable SimpleDraweeView_roundingBorderWidth 29 -+int styleable SimpleDraweeView_viewAspectRatio 30 -+int[] styleable Spinner { 0x1010262, 0x10100b2, 0x1010176, 0x101017b, 0x0 } -+int styleable Spinner_android_dropDownWidth 0 -+int styleable Spinner_android_entries 1 -+int styleable Spinner_android_popupBackground 2 -+int styleable Spinner_android_prompt 3 -+int styleable Spinner_popupTheme 4 -+int[] styleable StateListDrawable { 0x1010196, 0x101011c, 0x101030c, 0x101030d, 0x1010195, 0x1010194 } -+int styleable StateListDrawable_android_constantSize 0 -+int styleable StateListDrawable_android_dither 1 -+int styleable StateListDrawable_android_enterFadeDuration 2 -+int styleable StateListDrawable_android_exitFadeDuration 3 -+int styleable StateListDrawable_android_variablePadding 4 -+int styleable StateListDrawable_android_visible 5 -+int[] styleable StateListDrawableItem { 0x1010199 } -+int styleable StateListDrawableItem_android_drawable 0 -+int[] styleable SwitchCompat { 0x1010125, 0x1010124, 0x1010142, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } -+int styleable SwitchCompat_android_textOff 0 -+int styleable SwitchCompat_android_textOn 1 -+int styleable SwitchCompat_android_thumb 2 -+int styleable SwitchCompat_showText 3 -+int styleable SwitchCompat_splitTrack 4 -+int styleable SwitchCompat_switchMinWidth 5 -+int styleable SwitchCompat_switchPadding 6 -+int styleable SwitchCompat_switchTextAppearance 7 -+int styleable SwitchCompat_thumbTextPadding 8 -+int styleable SwitchCompat_thumbTint 9 -+int styleable SwitchCompat_thumbTintMode 10 -+int styleable SwitchCompat_track 11 -+int styleable SwitchCompat_trackTint 12 -+int styleable SwitchCompat_trackTintMode 13 -+int[] styleable TextAppearance { 0x10103ac, 0x1010161, 0x1010162, 0x1010163, 0x1010164, 0x1010098, 0x101009a, 0x101009b, 0x1010585, 0x1010095, 0x1010097, 0x1010096, 0x0, 0x0, 0x0, 0x0 } -+int styleable TextAppearance_android_fontFamily 0 -+int styleable TextAppearance_android_shadowColor 1 -+int styleable TextAppearance_android_shadowDx 2 -+int styleable TextAppearance_android_shadowDy 3 -+int styleable TextAppearance_android_shadowRadius 4 -+int styleable TextAppearance_android_textColor 5 -+int styleable TextAppearance_android_textColorHint 6 -+int styleable TextAppearance_android_textColorLink 7 -+int styleable TextAppearance_android_textFontWeight 8 -+int styleable TextAppearance_android_textSize 9 -+int styleable TextAppearance_android_textStyle 10 -+int styleable TextAppearance_android_typeface 11 -+int styleable TextAppearance_fontFamily 12 -+int styleable TextAppearance_fontVariationSettings 13 -+int styleable TextAppearance_textAllCaps 14 -+int styleable TextAppearance_textLocale 15 -+int[] styleable Toolbar { 0x10100af, 0x1010140, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } -+int styleable Toolbar_android_gravity 0 -+int styleable Toolbar_android_minHeight 1 -+int styleable Toolbar_buttonGravity 2 -+int styleable Toolbar_collapseContentDescription 3 -+int styleable Toolbar_collapseIcon 4 -+int styleable Toolbar_contentInsetEnd 5 -+int styleable Toolbar_contentInsetEndWithActions 6 -+int styleable Toolbar_contentInsetLeft 7 -+int styleable Toolbar_contentInsetRight 8 -+int styleable Toolbar_contentInsetStart 9 -+int styleable Toolbar_contentInsetStartWithNavigation 10 -+int styleable Toolbar_logo 11 -+int styleable Toolbar_logoDescription 12 -+int styleable Toolbar_maxButtonHeight 13 -+int styleable Toolbar_menu 14 -+int styleable Toolbar_navigationContentDescription 15 -+int styleable Toolbar_navigationIcon 16 -+int styleable Toolbar_popupTheme 17 -+int styleable Toolbar_subtitle 18 -+int styleable Toolbar_subtitleTextAppearance 19 -+int styleable Toolbar_subtitleTextColor 20 -+int styleable Toolbar_title 21 -+int styleable Toolbar_titleMargin 22 -+int styleable Toolbar_titleMarginBottom 23 -+int styleable Toolbar_titleMarginEnd 24 -+int styleable Toolbar_titleMarginStart 25 -+int styleable Toolbar_titleMarginTop 26 -+int styleable Toolbar_titleMargins 27 -+int styleable Toolbar_titleTextAppearance 28 -+int styleable Toolbar_titleTextColor 29 -+int[] styleable View { 0x10100da, 0x1010000, 0x0, 0x0, 0x0 } -+int styleable View_android_focusable 0 -+int styleable View_android_theme 1 -+int styleable View_paddingEnd 2 -+int styleable View_paddingStart 3 -+int styleable View_theme 4 -+int[] styleable ViewBackgroundHelper { 0x10100d4, 0x0, 0x0 } -+int styleable ViewBackgroundHelper_android_background 0 -+int styleable ViewBackgroundHelper_backgroundTint 1 -+int styleable ViewBackgroundHelper_backgroundTintMode 2 -+int[] styleable ViewStubCompat { 0x10100d0, 0x10100f3, 0x10100f2 } -+int styleable ViewStubCompat_android_id 0 -+int styleable ViewStubCompat_android_inflatedId 1 -+int styleable ViewStubCompat_android_layout 2 -+int xml rn_dev_preferences 0x0 -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties b/node_modules/react-native-power-saving-mode/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties -new file mode 100644 -index 0000000..f7e4a42 ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties -@@ -0,0 +1 @@ -+#Wed Sep 18 16:19:49 PDT 2024 -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/incremental/debug/packageDebugResources/merger.xml b/node_modules/react-native-power-saving-mode/android/build/intermediates/incremental/debug/packageDebugResources/merger.xml -new file mode 100644 -index 0000000..b752fca ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/incremental/debug/packageDebugResources/merger.xml -@@ -0,0 +1,2 @@ -+ -+ -\ No newline at end of file -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml b/node_modules/react-native-power-saving-mode/android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml -new file mode 100644 -index 0000000..0cc45aa ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml -@@ -0,0 +1,2 @@ -+ -+ -\ No newline at end of file -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/incremental/mergeDebugShaders/merger.xml b/node_modules/react-native-power-saving-mode/android/build/intermediates/incremental/mergeDebugShaders/merger.xml -new file mode 100644 -index 0000000..fd2e8f3 ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/incremental/mergeDebugShaders/merger.xml -@@ -0,0 +1,2 @@ -+ -+ -\ No newline at end of file -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/incremental/packageDebugAssets/merger.xml b/node_modules/react-native-power-saving-mode/android/build/intermediates/incremental/packageDebugAssets/merger.xml -new file mode 100644 -index 0000000..fd76591 ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/incremental/packageDebugAssets/merger.xml -@@ -0,0 +1,2 @@ -+ -+ -\ No newline at end of file -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/javac/debug/classes/io/powerSavingMode/BuildConfig.class b/node_modules/react-native-power-saving-mode/android/build/intermediates/javac/debug/classes/io/powerSavingMode/BuildConfig.class -new file mode 100644 -index 0000000..2effa67 -Binary files /dev/null and b/node_modules/react-native-power-saving-mode/android/build/intermediates/javac/debug/classes/io/powerSavingMode/BuildConfig.class differ -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/javac/debug/classes/io/powerSavingMode/RNPowerSavingModeModule$1.class b/node_modules/react-native-power-saving-mode/android/build/intermediates/javac/debug/classes/io/powerSavingMode/RNPowerSavingModeModule$1.class -new file mode 100644 -index 0000000..63bbfd5 -Binary files /dev/null and b/node_modules/react-native-power-saving-mode/android/build/intermediates/javac/debug/classes/io/powerSavingMode/RNPowerSavingModeModule$1.class differ -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/javac/debug/classes/io/powerSavingMode/RNPowerSavingModeModule$PowerSavingBroadcastReceiver.class b/node_modules/react-native-power-saving-mode/android/build/intermediates/javac/debug/classes/io/powerSavingMode/RNPowerSavingModeModule$PowerSavingBroadcastReceiver.class -new file mode 100644 -index 0000000..af659a0 -Binary files /dev/null and b/node_modules/react-native-power-saving-mode/android/build/intermediates/javac/debug/classes/io/powerSavingMode/RNPowerSavingModeModule$PowerSavingBroadcastReceiver.class differ -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/javac/debug/classes/io/powerSavingMode/RNPowerSavingModeModule.class b/node_modules/react-native-power-saving-mode/android/build/intermediates/javac/debug/classes/io/powerSavingMode/RNPowerSavingModeModule.class -new file mode 100644 -index 0000000..0dd7821 -Binary files /dev/null and b/node_modules/react-native-power-saving-mode/android/build/intermediates/javac/debug/classes/io/powerSavingMode/RNPowerSavingModeModule.class differ -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/javac/debug/classes/io/powerSavingMode/RNPowerSavingModePackage.class b/node_modules/react-native-power-saving-mode/android/build/intermediates/javac/debug/classes/io/powerSavingMode/RNPowerSavingModePackage.class -new file mode 100644 -index 0000000..7d77409 -Binary files /dev/null and b/node_modules/react-native-power-saving-mode/android/build/intermediates/javac/debug/classes/io/powerSavingMode/RNPowerSavingModePackage.class differ -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/local_only_symbol_list/debug/R-def.txt b/node_modules/react-native-power-saving-mode/android/build/intermediates/local_only_symbol_list/debug/R-def.txt -new file mode 100644 -index 0000000..78ac5b8 ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/local_only_symbol_list/debug/R-def.txt -@@ -0,0 +1,2 @@ -+R_DEF: Internal format may change without notice -+local -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/node_modules/react-native-power-saving-mode/android/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt -new file mode 100644 -index 0000000..57617e5 ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt -@@ -0,0 +1,8 @@ -+1 -+2 -+4 -+5 -+5-->/home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml -+6 -+7 -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/merged_manifest/debug/AndroidManifest.xml b/node_modules/react-native-power-saving-mode/android/build/intermediates/merged_manifest/debug/AndroidManifest.xml -new file mode 100644 -index 0000000..e127624 ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/merged_manifest/debug/AndroidManifest.xml -@@ -0,0 +1,7 @@ -+ -+ -+ -+ -+ -+ -\ No newline at end of file -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/navigation_json/debug/navigation.json b/node_modules/react-native-power-saving-mode/android/build/intermediates/navigation_json/debug/navigation.json -new file mode 100644 -index 0000000..0637a08 ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/navigation_json/debug/navigation.json -@@ -0,0 +1 @@ -+[] -\ No newline at end of file -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/packaged_manifests/debug/output-metadata.json b/node_modules/react-native-power-saving-mode/android/build/intermediates/packaged_manifests/debug/output-metadata.json -new file mode 100644 -index 0000000..a195b65 ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/packaged_manifests/debug/output-metadata.json -@@ -0,0 +1,18 @@ -+{ -+ "version": 3, -+ "artifactType": { -+ "type": "PACKAGED_MANIFESTS", -+ "kind": "Directory" -+ }, -+ "applicationId": "io.powerSavingMode", -+ "variantName": "debug", -+ "elements": [ -+ { -+ "type": "SINGLE", -+ "filters": [], -+ "attributes": [], -+ "outputFile": "../../merged_manifest/debug/AndroidManifest.xml" -+ } -+ ], -+ "elementType": "File" -+} -\ No newline at end of file -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/runtime_library_classes_jar/debug/classes.jar b/node_modules/react-native-power-saving-mode/android/build/intermediates/runtime_library_classes_jar/debug/classes.jar -new file mode 100644 -index 0000000..c61c61c -Binary files /dev/null and b/node_modules/react-native-power-saving-mode/android/build/intermediates/runtime_library_classes_jar/debug/classes.jar differ -diff --git a/node_modules/react-native-power-saving-mode/android/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt b/node_modules/react-native-power-saving-mode/android/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt -new file mode 100644 -index 0000000..e6ffb85 ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt -@@ -0,0 +1,1446 @@ -+io.powerSavingMode -+anim abc_fade_in -+anim abc_fade_out -+anim abc_grow_fade_in_from_bottom -+anim abc_popup_enter -+anim abc_popup_exit -+anim abc_shrink_fade_out_from_bottom -+anim abc_slide_in_bottom -+anim abc_slide_in_top -+anim abc_slide_out_bottom -+anim abc_slide_out_top -+anim abc_tooltip_enter -+anim abc_tooltip_exit -+anim btn_checkbox_to_checked_box_inner_merged_animation -+anim btn_checkbox_to_checked_box_outer_merged_animation -+anim btn_checkbox_to_checked_icon_null_animation -+anim btn_checkbox_to_unchecked_box_inner_merged_animation -+anim btn_checkbox_to_unchecked_check_path_merged_animation -+anim btn_checkbox_to_unchecked_icon_null_animation -+anim btn_radio_to_off_mtrl_dot_group_animation -+anim btn_radio_to_off_mtrl_ring_outer_animation -+anim btn_radio_to_off_mtrl_ring_outer_path_animation -+anim btn_radio_to_on_mtrl_dot_group_animation -+anim btn_radio_to_on_mtrl_ring_outer_animation -+anim btn_radio_to_on_mtrl_ring_outer_path_animation -+anim catalyst_fade_in -+anim catalyst_fade_out -+anim catalyst_push_up_in -+anim catalyst_push_up_out -+anim catalyst_slide_down -+anim catalyst_slide_up -+anim fragment_fast_out_extra_slow_in -+animator fragment_close_enter -+animator fragment_close_exit -+animator fragment_fade_enter -+animator fragment_fade_exit -+animator fragment_open_enter -+animator fragment_open_exit -+attr actionBarDivider -+attr actionBarItemBackground -+attr actionBarPopupTheme -+attr actionBarSize -+attr actionBarSplitStyle -+attr actionBarStyle -+attr actionBarTabBarStyle -+attr actionBarTabStyle -+attr actionBarTabTextStyle -+attr actionBarTheme -+attr actionBarWidgetTheme -+attr actionButtonStyle -+attr actionDropDownStyle -+attr actionLayout -+attr actionMenuTextAppearance -+attr actionMenuTextColor -+attr actionModeBackground -+attr actionModeCloseButtonStyle -+attr actionModeCloseContentDescription -+attr actionModeCloseDrawable -+attr actionModeCopyDrawable -+attr actionModeCutDrawable -+attr actionModeFindDrawable -+attr actionModePasteDrawable -+attr actionModePopupWindowStyle -+attr actionModeSelectAllDrawable -+attr actionModeShareDrawable -+attr actionModeSplitBackground -+attr actionModeStyle -+attr actionModeTheme -+attr actionModeWebSearchDrawable -+attr actionOverflowButtonStyle -+attr actionOverflowMenuStyle -+attr actionProviderClass -+attr actionViewClass -+attr activityChooserViewStyle -+attr actualImageResource -+attr actualImageScaleType -+attr actualImageUri -+attr alertDialogButtonGroupStyle -+attr alertDialogCenterButtons -+attr alertDialogStyle -+attr alertDialogTheme -+attr allowStacking -+attr alpha -+attr alphabeticModifiers -+attr arrowHeadLength -+attr arrowShaftLength -+attr autoCompleteTextViewStyle -+attr autoSizeMaxTextSize -+attr autoSizeMinTextSize -+attr autoSizePresetSizes -+attr autoSizeStepGranularity -+attr autoSizeTextType -+attr autofillInlineSuggestionChip -+attr autofillInlineSuggestionEndIconStyle -+attr autofillInlineSuggestionStartIconStyle -+attr autofillInlineSuggestionSubtitle -+attr autofillInlineSuggestionTitle -+attr background -+attr backgroundImage -+attr backgroundSplit -+attr backgroundStacked -+attr backgroundTint -+attr backgroundTintMode -+attr barLength -+attr borderlessButtonStyle -+attr buttonBarButtonStyle -+attr buttonBarNegativeButtonStyle -+attr buttonBarNeutralButtonStyle -+attr buttonBarPositiveButtonStyle -+attr buttonBarStyle -+attr buttonCompat -+attr buttonGravity -+attr buttonIconDimen -+attr buttonPanelSideLayout -+attr buttonStyle -+attr buttonStyleSmall -+attr buttonTint -+attr buttonTintMode -+attr checkMarkCompat -+attr checkMarkTint -+attr checkMarkTintMode -+attr checkboxStyle -+attr checkedTextViewStyle -+attr closeIcon -+attr closeItemLayout -+attr collapseContentDescription -+attr collapseIcon -+attr color -+attr colorAccent -+attr colorBackgroundFloating -+attr colorButtonNormal -+attr colorControlActivated -+attr colorControlHighlight -+attr colorControlNormal -+attr colorError -+attr colorPrimary -+attr colorPrimaryDark -+attr colorSwitchThumbNormal -+attr commitIcon -+attr contentDescription -+attr contentInsetEnd -+attr contentInsetEndWithActions -+attr contentInsetLeft -+attr contentInsetRight -+attr contentInsetStart -+attr contentInsetStartWithNavigation -+attr controlBackground -+attr customNavigationLayout -+attr defaultQueryHint -+attr dialogCornerRadius -+attr dialogPreferredPadding -+attr dialogTheme -+attr displayOptions -+attr divider -+attr dividerHorizontal -+attr dividerPadding -+attr dividerVertical -+attr drawableBottomCompat -+attr drawableEndCompat -+attr drawableLeftCompat -+attr drawableRightCompat -+attr drawableSize -+attr drawableStartCompat -+attr drawableTint -+attr drawableTintMode -+attr drawableTopCompat -+attr drawerArrowStyle -+attr dropDownListViewStyle -+attr dropdownListPreferredItemHeight -+attr editTextBackground -+attr editTextColor -+attr editTextStyle -+attr elevation -+attr emojiCompatEnabled -+attr expandActivityOverflowButtonDrawable -+attr fadeDuration -+attr failureImage -+attr failureImageScaleType -+attr firstBaselineToTopHeight -+attr font -+attr fontFamily -+attr fontProviderAuthority -+attr fontProviderCerts -+attr fontProviderFetchStrategy -+attr fontProviderFetchTimeout -+attr fontProviderPackage -+attr fontProviderQuery -+attr fontProviderSystemFontFamily -+attr fontStyle -+attr fontVariationSettings -+attr fontWeight -+attr gapBetweenBars -+attr goIcon -+attr height -+attr hideOnContentScroll -+attr homeAsUpIndicator -+attr homeLayout -+attr icon -+attr iconTint -+attr iconTintMode -+attr iconifiedByDefault -+attr imageButtonStyle -+attr indeterminateProgressStyle -+attr initialActivityCount -+attr isAutofillInlineSuggestionTheme -+attr isLightTheme -+attr itemPadding -+attr lStar -+attr lastBaselineToBottomHeight -+attr layout -+attr lineHeight -+attr listChoiceBackgroundIndicator -+attr listChoiceIndicatorMultipleAnimated -+attr listChoiceIndicatorSingleAnimated -+attr listDividerAlertDialog -+attr listItemLayout -+attr listLayout -+attr listMenuViewStyle -+attr listPopupWindowStyle -+attr listPreferredItemHeight -+attr listPreferredItemHeightLarge -+attr listPreferredItemHeightSmall -+attr listPreferredItemPaddingEnd -+attr listPreferredItemPaddingLeft -+attr listPreferredItemPaddingRight -+attr listPreferredItemPaddingStart -+attr logo -+attr logoDescription -+attr maxButtonHeight -+attr measureWithLargestChild -+attr menu -+attr multiChoiceItemLayout -+attr navigationContentDescription -+attr navigationIcon -+attr navigationMode -+attr nestedScrollViewStyle -+attr numericModifiers -+attr overlapAnchor -+attr overlayImage -+attr paddingBottomNoButtons -+attr paddingEnd -+attr paddingStart -+attr paddingTopNoTitle -+attr panelBackground -+attr panelMenuListTheme -+attr panelMenuListWidth -+attr placeholderImage -+attr placeholderImageScaleType -+attr popupMenuStyle -+attr popupTheme -+attr popupWindowStyle -+attr preserveIconSpacing -+attr pressedStateOverlayImage -+attr progressBarAutoRotateInterval -+attr progressBarImage -+attr progressBarImageScaleType -+attr progressBarPadding -+attr progressBarStyle -+attr queryBackground -+attr queryHint -+attr queryPatterns -+attr radioButtonStyle -+attr ratingBarStyle -+attr ratingBarStyleIndicator -+attr ratingBarStyleSmall -+attr retryImage -+attr retryImageScaleType -+attr roundAsCircle -+attr roundBottomEnd -+attr roundBottomLeft -+attr roundBottomRight -+attr roundBottomStart -+attr roundTopEnd -+attr roundTopLeft -+attr roundTopRight -+attr roundTopStart -+attr roundWithOverlayColor -+attr roundedCornerRadius -+attr roundingBorderColor -+attr roundingBorderPadding -+attr roundingBorderWidth -+attr searchHintIcon -+attr searchIcon -+attr searchViewStyle -+attr seekBarStyle -+attr selectableItemBackground -+attr selectableItemBackgroundBorderless -+attr shortcutMatchRequired -+attr showAsAction -+attr showDividers -+attr showText -+attr showTitle -+attr singleChoiceItemLayout -+attr spinBars -+attr spinnerDropDownItemStyle -+attr spinnerStyle -+attr splitTrack -+attr srcCompat -+attr state_above_anchor -+attr subMenuArrow -+attr submitBackground -+attr subtitle -+attr subtitleTextAppearance -+attr subtitleTextColor -+attr subtitleTextStyle -+attr suggestionRowLayout -+attr switchMinWidth -+attr switchPadding -+attr switchStyle -+attr switchTextAppearance -+attr textAllCaps -+attr textAppearanceLargePopupMenu -+attr textAppearanceListItem -+attr textAppearanceListItemSecondary -+attr textAppearanceListItemSmall -+attr textAppearancePopupMenuHeader -+attr textAppearanceSearchResultSubtitle -+attr textAppearanceSearchResultTitle -+attr textAppearanceSmallPopupMenu -+attr textColorAlertDialogListItem -+attr textColorSearchUrl -+attr textLocale -+attr theme -+attr thickness -+attr thumbTextPadding -+attr thumbTint -+attr thumbTintMode -+attr tickMark -+attr tickMarkTint -+attr tickMarkTintMode -+attr tint -+attr tintMode -+attr title -+attr titleMargin -+attr titleMarginBottom -+attr titleMarginEnd -+attr titleMarginStart -+attr titleMarginTop -+attr titleMargins -+attr titleTextAppearance -+attr titleTextColor -+attr titleTextStyle -+attr toolbarNavigationButtonStyle -+attr toolbarStyle -+attr tooltipForegroundColor -+attr tooltipFrameBackground -+attr tooltipText -+attr track -+attr trackTint -+attr trackTintMode -+attr ttcIndex -+attr viewAspectRatio -+attr viewInflaterClass -+attr voiceIcon -+attr windowActionBar -+attr windowActionBarOverlay -+attr windowActionModeOverlay -+attr windowFixedHeightMajor -+attr windowFixedHeightMinor -+attr windowFixedWidthMajor -+attr windowFixedWidthMinor -+attr windowMinWidthMajor -+attr windowMinWidthMinor -+attr windowNoTitle -+bool abc_action_bar_embed_tabs -+bool abc_config_actionMenuItemAllCaps -+color abc_background_cache_hint_selector_material_dark -+color abc_background_cache_hint_selector_material_light -+color abc_btn_colored_borderless_text_material -+color abc_btn_colored_text_material -+color abc_color_highlight_material -+color abc_decor_view_status_guard -+color abc_decor_view_status_guard_light -+color abc_hint_foreground_material_dark -+color abc_hint_foreground_material_light -+color abc_primary_text_disable_only_material_dark -+color abc_primary_text_disable_only_material_light -+color abc_primary_text_material_dark -+color abc_primary_text_material_light -+color abc_search_url_text -+color abc_search_url_text_normal -+color abc_search_url_text_pressed -+color abc_search_url_text_selected -+color abc_secondary_text_material_dark -+color abc_secondary_text_material_light -+color abc_tint_btn_checkable -+color abc_tint_default -+color abc_tint_edittext -+color abc_tint_seek_thumb -+color abc_tint_spinner -+color abc_tint_switch_track -+color accent_material_dark -+color accent_material_light -+color androidx_core_ripple_material_light -+color androidx_core_secondary_text_default_material_light -+color background_floating_material_dark -+color background_floating_material_light -+color background_material_dark -+color background_material_light -+color bright_foreground_disabled_material_dark -+color bright_foreground_disabled_material_light -+color bright_foreground_inverse_material_dark -+color bright_foreground_inverse_material_light -+color bright_foreground_material_dark -+color bright_foreground_material_light -+color button_material_dark -+color button_material_light -+color catalyst_logbox_background -+color catalyst_redbox_background -+color dim_foreground_disabled_material_dark -+color dim_foreground_disabled_material_light -+color dim_foreground_material_dark -+color dim_foreground_material_light -+color error_color_material_dark -+color error_color_material_light -+color foreground_material_dark -+color foreground_material_light -+color highlighted_text_material_dark -+color highlighted_text_material_light -+color material_blue_grey_800 -+color material_blue_grey_900 -+color material_blue_grey_950 -+color material_deep_teal_200 -+color material_deep_teal_500 -+color material_grey_100 -+color material_grey_300 -+color material_grey_50 -+color material_grey_600 -+color material_grey_800 -+color material_grey_850 -+color material_grey_900 -+color notification_action_color_filter -+color notification_icon_bg_color -+color primary_dark_material_dark -+color primary_dark_material_light -+color primary_material_dark -+color primary_material_light -+color primary_text_default_material_dark -+color primary_text_default_material_light -+color primary_text_disabled_material_dark -+color primary_text_disabled_material_light -+color ripple_material_dark -+color ripple_material_light -+color secondary_text_default_material_dark -+color secondary_text_default_material_light -+color secondary_text_disabled_material_dark -+color secondary_text_disabled_material_light -+color switch_thumb_disabled_material_dark -+color switch_thumb_disabled_material_light -+color switch_thumb_material_dark -+color switch_thumb_material_light -+color switch_thumb_normal_material_dark -+color switch_thumb_normal_material_light -+color tooltip_background_dark -+color tooltip_background_light -+dimen abc_action_bar_content_inset_material -+dimen abc_action_bar_content_inset_with_nav -+dimen abc_action_bar_default_height_material -+dimen abc_action_bar_default_padding_end_material -+dimen abc_action_bar_default_padding_start_material -+dimen abc_action_bar_elevation_material -+dimen abc_action_bar_icon_vertical_padding_material -+dimen abc_action_bar_overflow_padding_end_material -+dimen abc_action_bar_overflow_padding_start_material -+dimen abc_action_bar_stacked_max_height -+dimen abc_action_bar_stacked_tab_max_width -+dimen abc_action_bar_subtitle_bottom_margin_material -+dimen abc_action_bar_subtitle_top_margin_material -+dimen abc_action_button_min_height_material -+dimen abc_action_button_min_width_material -+dimen abc_action_button_min_width_overflow_material -+dimen abc_alert_dialog_button_bar_height -+dimen abc_alert_dialog_button_dimen -+dimen abc_button_inset_horizontal_material -+dimen abc_button_inset_vertical_material -+dimen abc_button_padding_horizontal_material -+dimen abc_button_padding_vertical_material -+dimen abc_cascading_menus_min_smallest_width -+dimen abc_config_prefDialogWidth -+dimen abc_control_corner_material -+dimen abc_control_inset_material -+dimen abc_control_padding_material -+dimen abc_dialog_corner_radius_material -+dimen abc_dialog_fixed_height_major -+dimen abc_dialog_fixed_height_minor -+dimen abc_dialog_fixed_width_major -+dimen abc_dialog_fixed_width_minor -+dimen abc_dialog_list_padding_bottom_no_buttons -+dimen abc_dialog_list_padding_top_no_title -+dimen abc_dialog_min_width_major -+dimen abc_dialog_min_width_minor -+dimen abc_dialog_padding_material -+dimen abc_dialog_padding_top_material -+dimen abc_dialog_title_divider_material -+dimen abc_disabled_alpha_material_dark -+dimen abc_disabled_alpha_material_light -+dimen abc_dropdownitem_icon_width -+dimen abc_dropdownitem_text_padding_left -+dimen abc_dropdownitem_text_padding_right -+dimen abc_edit_text_inset_bottom_material -+dimen abc_edit_text_inset_horizontal_material -+dimen abc_edit_text_inset_top_material -+dimen abc_floating_window_z -+dimen abc_list_item_height_large_material -+dimen abc_list_item_height_material -+dimen abc_list_item_height_small_material -+dimen abc_list_item_padding_horizontal_material -+dimen abc_panel_menu_list_width -+dimen abc_progress_bar_height_material -+dimen abc_search_view_preferred_height -+dimen abc_search_view_preferred_width -+dimen abc_seekbar_track_background_height_material -+dimen abc_seekbar_track_progress_height_material -+dimen abc_select_dialog_padding_start_material -+dimen abc_star_big -+dimen abc_star_medium -+dimen abc_star_small -+dimen abc_switch_padding -+dimen abc_text_size_body_1_material -+dimen abc_text_size_body_2_material -+dimen abc_text_size_button_material -+dimen abc_text_size_caption_material -+dimen abc_text_size_display_1_material -+dimen abc_text_size_display_2_material -+dimen abc_text_size_display_3_material -+dimen abc_text_size_display_4_material -+dimen abc_text_size_headline_material -+dimen abc_text_size_large_material -+dimen abc_text_size_medium_material -+dimen abc_text_size_menu_header_material -+dimen abc_text_size_menu_material -+dimen abc_text_size_small_material -+dimen abc_text_size_subhead_material -+dimen abc_text_size_subtitle_material_toolbar -+dimen abc_text_size_title_material -+dimen abc_text_size_title_material_toolbar -+dimen autofill_inline_suggestion_icon_size -+dimen compat_button_inset_horizontal_material -+dimen compat_button_inset_vertical_material -+dimen compat_button_padding_horizontal_material -+dimen compat_button_padding_vertical_material -+dimen compat_control_corner_material -+dimen compat_notification_large_icon_max_height -+dimen compat_notification_large_icon_max_width -+dimen disabled_alpha_material_dark -+dimen disabled_alpha_material_light -+dimen highlight_alpha_material_colored -+dimen highlight_alpha_material_dark -+dimen highlight_alpha_material_light -+dimen hint_alpha_material_dark -+dimen hint_alpha_material_light -+dimen hint_pressed_alpha_material_dark -+dimen hint_pressed_alpha_material_light -+dimen notification_action_icon_size -+dimen notification_action_text_size -+dimen notification_big_circle_margin -+dimen notification_content_margin_start -+dimen notification_large_icon_height -+dimen notification_large_icon_width -+dimen notification_main_column_padding_top -+dimen notification_media_narrow_margin -+dimen notification_right_icon_size -+dimen notification_right_side_padding_top -+dimen notification_small_icon_background_padding -+dimen notification_small_icon_size_as_large -+dimen notification_subtext_size -+dimen notification_top_pad -+dimen notification_top_pad_large_text -+dimen tooltip_corner_radius -+dimen tooltip_horizontal_padding -+dimen tooltip_margin -+dimen tooltip_precise_anchor_extra_offset -+dimen tooltip_precise_anchor_threshold -+dimen tooltip_vertical_padding -+dimen tooltip_y_offset_non_touch -+dimen tooltip_y_offset_touch -+drawable abc_ab_share_pack_mtrl_alpha -+drawable abc_action_bar_item_background_material -+drawable abc_btn_borderless_material -+drawable abc_btn_check_material -+drawable abc_btn_check_material_anim -+drawable abc_btn_check_to_on_mtrl_000 -+drawable abc_btn_check_to_on_mtrl_015 -+drawable abc_btn_colored_material -+drawable abc_btn_default_mtrl_shape -+drawable abc_btn_radio_material -+drawable abc_btn_radio_material_anim -+drawable abc_btn_radio_to_on_mtrl_000 -+drawable abc_btn_radio_to_on_mtrl_015 -+drawable abc_btn_switch_to_on_mtrl_00001 -+drawable abc_btn_switch_to_on_mtrl_00012 -+drawable abc_cab_background_internal_bg -+drawable abc_cab_background_top_material -+drawable abc_cab_background_top_mtrl_alpha -+drawable abc_control_background_material -+drawable abc_dialog_material_background -+drawable abc_edit_text_material -+drawable abc_ic_ab_back_material -+drawable abc_ic_arrow_drop_right_black_24dp -+drawable abc_ic_clear_material -+drawable abc_ic_commit_search_api_mtrl_alpha -+drawable abc_ic_go_search_api_material -+drawable abc_ic_menu_copy_mtrl_am_alpha -+drawable abc_ic_menu_cut_mtrl_alpha -+drawable abc_ic_menu_overflow_material -+drawable abc_ic_menu_paste_mtrl_am_alpha -+drawable abc_ic_menu_selectall_mtrl_alpha -+drawable abc_ic_menu_share_mtrl_alpha -+drawable abc_ic_search_api_material -+drawable abc_ic_voice_search_api_material -+drawable abc_item_background_holo_dark -+drawable abc_item_background_holo_light -+drawable abc_list_divider_material -+drawable abc_list_divider_mtrl_alpha -+drawable abc_list_focused_holo -+drawable abc_list_longpressed_holo -+drawable abc_list_pressed_holo_dark -+drawable abc_list_pressed_holo_light -+drawable abc_list_selector_background_transition_holo_dark -+drawable abc_list_selector_background_transition_holo_light -+drawable abc_list_selector_disabled_holo_dark -+drawable abc_list_selector_disabled_holo_light -+drawable abc_list_selector_holo_dark -+drawable abc_list_selector_holo_light -+drawable abc_menu_hardkey_panel_mtrl_mult -+drawable abc_popup_background_mtrl_mult -+drawable abc_ratingbar_indicator_material -+drawable abc_ratingbar_material -+drawable abc_ratingbar_small_material -+drawable abc_scrubber_control_off_mtrl_alpha -+drawable abc_scrubber_control_to_pressed_mtrl_000 -+drawable abc_scrubber_control_to_pressed_mtrl_005 -+drawable abc_scrubber_primary_mtrl_alpha -+drawable abc_scrubber_track_mtrl_alpha -+drawable abc_seekbar_thumb_material -+drawable abc_seekbar_tick_mark_material -+drawable abc_seekbar_track_material -+drawable abc_spinner_mtrl_am_alpha -+drawable abc_spinner_textfield_background_material -+drawable abc_star_black_48dp -+drawable abc_star_half_black_48dp -+drawable abc_switch_thumb_material -+drawable abc_switch_track_mtrl_alpha -+drawable abc_tab_indicator_material -+drawable abc_tab_indicator_mtrl_alpha -+drawable abc_text_cursor_material -+drawable abc_text_select_handle_left_mtrl -+drawable abc_text_select_handle_middle_mtrl -+drawable abc_text_select_handle_right_mtrl -+drawable abc_textfield_activated_mtrl_alpha -+drawable abc_textfield_default_mtrl_alpha -+drawable abc_textfield_search_activated_mtrl_alpha -+drawable abc_textfield_search_default_mtrl_alpha -+drawable abc_textfield_search_material -+drawable abc_vector_test -+drawable autofill_inline_suggestion_chip_background -+drawable btn_checkbox_checked_mtrl -+drawable btn_checkbox_checked_to_unchecked_mtrl_animation -+drawable btn_checkbox_unchecked_mtrl -+drawable btn_checkbox_unchecked_to_checked_mtrl_animation -+drawable btn_radio_off_mtrl -+drawable btn_radio_off_to_on_mtrl_animation -+drawable btn_radio_on_mtrl -+drawable btn_radio_on_to_off_mtrl_animation -+drawable notification_action_background -+drawable notification_bg -+drawable notification_bg_low -+drawable notification_bg_low_normal -+drawable notification_bg_low_pressed -+drawable notification_bg_normal -+drawable notification_bg_normal_pressed -+drawable notification_icon_background -+drawable notification_template_icon_bg -+drawable notification_template_icon_low_bg -+drawable notification_tile_bg -+drawable notify_panel_notification_icon_bg -+drawable redbox_top_border_background -+drawable test_level_drawable -+drawable tooltip_frame_dark -+drawable tooltip_frame_light -+id accessibility_action_clickable_span -+id accessibility_actions -+id accessibility_collection -+id accessibility_collection_item -+id accessibility_custom_action_0 -+id accessibility_custom_action_1 -+id accessibility_custom_action_10 -+id accessibility_custom_action_11 -+id accessibility_custom_action_12 -+id accessibility_custom_action_13 -+id accessibility_custom_action_14 -+id accessibility_custom_action_15 -+id accessibility_custom_action_16 -+id accessibility_custom_action_17 -+id accessibility_custom_action_18 -+id accessibility_custom_action_19 -+id accessibility_custom_action_2 -+id accessibility_custom_action_20 -+id accessibility_custom_action_21 -+id accessibility_custom_action_22 -+id accessibility_custom_action_23 -+id accessibility_custom_action_24 -+id accessibility_custom_action_25 -+id accessibility_custom_action_26 -+id accessibility_custom_action_27 -+id accessibility_custom_action_28 -+id accessibility_custom_action_29 -+id accessibility_custom_action_3 -+id accessibility_custom_action_30 -+id accessibility_custom_action_31 -+id accessibility_custom_action_4 -+id accessibility_custom_action_5 -+id accessibility_custom_action_6 -+id accessibility_custom_action_7 -+id accessibility_custom_action_8 -+id accessibility_custom_action_9 -+id accessibility_hint -+id accessibility_label -+id accessibility_links -+id accessibility_role -+id accessibility_state -+id accessibility_value -+id action_bar -+id action_bar_activity_content -+id action_bar_container -+id action_bar_root -+id action_bar_spinner -+id action_bar_subtitle -+id action_bar_title -+id action_container -+id action_context_bar -+id action_divider -+id action_image -+id action_menu_divider -+id action_menu_presenter -+id action_mode_bar -+id action_mode_bar_stub -+id action_mode_close_button -+id action_text -+id actions -+id activity_chooser_view_content -+id add -+id alertTitle -+id async -+id autofill_inline_suggestion_end_icon -+id autofill_inline_suggestion_start_icon -+id autofill_inline_suggestion_subtitle -+id autofill_inline_suggestion_title -+id blocking -+id buttonPanel -+id catalyst_redbox_title -+id center -+id centerCrop -+id centerInside -+id checkbox -+id checked -+id chronometer -+id content -+id contentPanel -+id custom -+id customPanel -+id decor_content_parent -+id default_activity_button -+id dialog_button -+id edit_query -+id expand_activities_button -+id expanded_menu -+id fitBottomStart -+id fitCenter -+id fitEnd -+id fitStart -+id fitXY -+id focusCrop -+id forever -+id fps_text -+id fragment_container_view_tag -+id group_divider -+id home -+id icon -+id icon_group -+id image -+id info -+id italic -+id item1 -+id item2 -+id item3 -+id item4 -+id labelled_by -+id line1 -+id line3 -+id listMode -+id list_item -+id message -+id multiply -+id none -+id normal -+id notification_background -+id notification_main_column -+id notification_main_column_container -+id off -+id on -+id parentPanel -+id pointer_events -+id progress_circular -+id progress_horizontal -+id radio -+id react_test_id -+id right_icon -+id right_side -+id rn_frame_file -+id rn_frame_method -+id rn_redbox_dismiss_button -+id rn_redbox_line_separator -+id rn_redbox_loading_indicator -+id rn_redbox_reload_button -+id rn_redbox_report_button -+id rn_redbox_report_label -+id rn_redbox_stack -+id screen -+id scrollIndicatorDown -+id scrollIndicatorUp -+id scrollView -+id search_badge -+id search_bar -+id search_button -+id search_close_btn -+id search_edit_frame -+id search_go_btn -+id search_mag_icon -+id search_plate -+id search_src_text -+id search_voice_btn -+id select_dialog_listview -+id shortcut -+id spacer -+id special_effects_controller_view_tag -+id split_action_bar -+id src_atop -+id src_in -+id src_over -+id submenuarrow -+id submit_area -+id tabMode -+id tag_accessibility_actions -+id tag_accessibility_clickable_spans -+id tag_accessibility_heading -+id tag_accessibility_pane_title -+id tag_on_apply_window_listener -+id tag_on_receive_content_listener -+id tag_on_receive_content_mime_types -+id tag_screen_reader_focusable -+id tag_state_description -+id tag_transition_group -+id tag_unhandled_key_event_manager -+id tag_unhandled_key_listeners -+id tag_window_insets_animation_callback -+id text -+id text2 -+id textSpacerNoButtons -+id textSpacerNoTitle -+id time -+id title -+id titleDividerNoCustom -+id title_template -+id topPanel -+id unchecked -+id uniform -+id up -+id view_tag_instance_handle -+id view_tag_native_id -+id view_tree_lifecycle_owner -+id view_tree_saved_state_registry_owner -+id view_tree_view_model_store_owner -+id visible_removing_fragment_view_tag -+id wrap_content -+integer abc_config_activityDefaultDur -+integer abc_config_activityShortDur -+integer cancel_button_image_alpha -+integer config_tooltipAnimTime -+integer react_native_dev_server_port -+integer react_native_inspector_proxy_port -+integer status_bar_notification_info_maxnum -+interpolator btn_checkbox_checked_mtrl_animation_interpolator_0 -+interpolator btn_checkbox_checked_mtrl_animation_interpolator_1 -+interpolator btn_checkbox_unchecked_mtrl_animation_interpolator_0 -+interpolator btn_checkbox_unchecked_mtrl_animation_interpolator_1 -+interpolator btn_radio_to_off_mtrl_animation_interpolator_0 -+interpolator btn_radio_to_on_mtrl_animation_interpolator_0 -+interpolator fast_out_slow_in -+layout abc_action_bar_title_item -+layout abc_action_bar_up_container -+layout abc_action_menu_item_layout -+layout abc_action_menu_layout -+layout abc_action_mode_bar -+layout abc_action_mode_close_item_material -+layout abc_activity_chooser_view -+layout abc_activity_chooser_view_list_item -+layout abc_alert_dialog_button_bar_material -+layout abc_alert_dialog_material -+layout abc_alert_dialog_title_material -+layout abc_cascading_menu_item_layout -+layout abc_dialog_title_material -+layout abc_expanded_menu_layout -+layout abc_list_menu_item_checkbox -+layout abc_list_menu_item_icon -+layout abc_list_menu_item_layout -+layout abc_list_menu_item_radio -+layout abc_popup_menu_header_item_layout -+layout abc_popup_menu_item_layout -+layout abc_screen_content_include -+layout abc_screen_simple -+layout abc_screen_simple_overlay_action_mode -+layout abc_screen_toolbar -+layout abc_search_dropdown_item_icons_2line -+layout abc_search_view -+layout abc_select_dialog_material -+layout abc_tooltip -+layout autofill_inline_suggestion -+layout custom_dialog -+layout dev_loading_view -+layout fps_view -+layout notification_action -+layout notification_action_tombstone -+layout notification_template_custom_big -+layout notification_template_icon_group -+layout notification_template_part_chronometer -+layout notification_template_part_time -+layout redbox_item_frame -+layout redbox_item_title -+layout redbox_view -+layout select_dialog_item_material -+layout select_dialog_multichoice_material -+layout select_dialog_singlechoice_material -+layout support_simple_spinner_dropdown_item -+menu example_menu -+menu example_menu2 -+string abc_action_bar_home_description -+string abc_action_bar_up_description -+string abc_action_menu_overflow_description -+string abc_action_mode_done -+string abc_activity_chooser_view_see_all -+string abc_activitychooserview_choose_application -+string abc_capital_off -+string abc_capital_on -+string abc_menu_alt_shortcut_label -+string abc_menu_ctrl_shortcut_label -+string abc_menu_delete_shortcut_label -+string abc_menu_enter_shortcut_label -+string abc_menu_function_shortcut_label -+string abc_menu_meta_shortcut_label -+string abc_menu_shift_shortcut_label -+string abc_menu_space_shortcut_label -+string abc_menu_sym_shortcut_label -+string abc_prepend_shortcut_label -+string abc_search_hint -+string abc_searchview_description_clear -+string abc_searchview_description_query -+string abc_searchview_description_search -+string abc_searchview_description_submit -+string abc_searchview_description_voice -+string abc_shareactionprovider_share_with -+string abc_shareactionprovider_share_with_application -+string abc_toolbar_collapse_description -+string alert_description -+string catalyst_change_bundle_location -+string catalyst_copy_button -+string catalyst_debug -+string catalyst_debug_chrome -+string catalyst_debug_chrome_stop -+string catalyst_debug_connecting -+string catalyst_debug_error -+string catalyst_debug_open -+string catalyst_debug_stop -+string catalyst_devtools_open -+string catalyst_dismiss_button -+string catalyst_heap_capture -+string catalyst_hot_reloading -+string catalyst_hot_reloading_auto_disable -+string catalyst_hot_reloading_auto_enable -+string catalyst_hot_reloading_stop -+string catalyst_inspector -+string catalyst_inspector_stop -+string catalyst_loading_from_url -+string catalyst_open_flipper_error -+string catalyst_perf_monitor -+string catalyst_perf_monitor_stop -+string catalyst_reload -+string catalyst_reload_button -+string catalyst_reload_error -+string catalyst_report_button -+string catalyst_sample_profiler_disable -+string catalyst_sample_profiler_enable -+string catalyst_settings -+string catalyst_settings_title -+string combobox_description -+string header_description -+string image_description -+string imagebutton_description -+string link_description -+string menu_description -+string menubar_description -+string menuitem_description -+string progressbar_description -+string radiogroup_description -+string rn_tab_description -+string scrollbar_description -+string search_menu_title -+string spinbutton_description -+string state_busy_description -+string state_collapsed_description -+string state_expanded_description -+string state_mixed_description -+string state_off_description -+string state_on_description -+string state_unselected_description -+string status_bar_notification_info_overflow -+string summary_description -+string tablist_description -+string timer_description -+string toolbar_description -+style AlertDialog_AppCompat -+style AlertDialog_AppCompat_Light -+style Animation_AppCompat_Dialog -+style Animation_AppCompat_DropDownUp -+style Animation_AppCompat_Tooltip -+style Animation_Catalyst_LogBox -+style Animation_Catalyst_RedBox -+style Base_AlertDialog_AppCompat -+style Base_AlertDialog_AppCompat_Light -+style Base_Animation_AppCompat_Dialog -+style Base_Animation_AppCompat_DropDownUp -+style Base_Animation_AppCompat_Tooltip -+style Base_DialogWindowTitleBackground_AppCompat -+style Base_DialogWindowTitle_AppCompat -+style Base_TextAppearance_AppCompat -+style Base_TextAppearance_AppCompat_Body1 -+style Base_TextAppearance_AppCompat_Body2 -+style Base_TextAppearance_AppCompat_Button -+style Base_TextAppearance_AppCompat_Caption -+style Base_TextAppearance_AppCompat_Display1 -+style Base_TextAppearance_AppCompat_Display2 -+style Base_TextAppearance_AppCompat_Display3 -+style Base_TextAppearance_AppCompat_Display4 -+style Base_TextAppearance_AppCompat_Headline -+style Base_TextAppearance_AppCompat_Inverse -+style Base_TextAppearance_AppCompat_Large -+style Base_TextAppearance_AppCompat_Large_Inverse -+style Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large -+style Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small -+style Base_TextAppearance_AppCompat_Medium -+style Base_TextAppearance_AppCompat_Medium_Inverse -+style Base_TextAppearance_AppCompat_Menu -+style Base_TextAppearance_AppCompat_SearchResult -+style Base_TextAppearance_AppCompat_SearchResult_Subtitle -+style Base_TextAppearance_AppCompat_SearchResult_Title -+style Base_TextAppearance_AppCompat_Small -+style Base_TextAppearance_AppCompat_Small_Inverse -+style Base_TextAppearance_AppCompat_Subhead -+style Base_TextAppearance_AppCompat_Subhead_Inverse -+style Base_TextAppearance_AppCompat_Title -+style Base_TextAppearance_AppCompat_Title_Inverse -+style Base_TextAppearance_AppCompat_Tooltip -+style Base_TextAppearance_AppCompat_Widget_ActionBar_Menu -+style Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle -+style Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse -+style Base_TextAppearance_AppCompat_Widget_ActionBar_Title -+style Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse -+style Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle -+style Base_TextAppearance_AppCompat_Widget_ActionMode_Title -+style Base_TextAppearance_AppCompat_Widget_Button -+style Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored -+style Base_TextAppearance_AppCompat_Widget_Button_Colored -+style Base_TextAppearance_AppCompat_Widget_Button_Inverse -+style Base_TextAppearance_AppCompat_Widget_DropDownItem -+style Base_TextAppearance_AppCompat_Widget_PopupMenu_Header -+style Base_TextAppearance_AppCompat_Widget_PopupMenu_Large -+style Base_TextAppearance_AppCompat_Widget_PopupMenu_Small -+style Base_TextAppearance_AppCompat_Widget_Switch -+style Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem -+style Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item -+style Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle -+style Base_TextAppearance_Widget_AppCompat_Toolbar_Title -+style Base_ThemeOverlay_AppCompat -+style Base_ThemeOverlay_AppCompat_ActionBar -+style Base_ThemeOverlay_AppCompat_Dark -+style Base_ThemeOverlay_AppCompat_Dark_ActionBar -+style Base_ThemeOverlay_AppCompat_Dialog -+style Base_ThemeOverlay_AppCompat_Dialog_Alert -+style Base_ThemeOverlay_AppCompat_Light -+style Base_Theme_AppCompat -+style Base_Theme_AppCompat_CompactMenu -+style Base_Theme_AppCompat_Dialog -+style Base_Theme_AppCompat_DialogWhenLarge -+style Base_Theme_AppCompat_Dialog_Alert -+style Base_Theme_AppCompat_Dialog_FixedSize -+style Base_Theme_AppCompat_Dialog_MinWidth -+style Base_Theme_AppCompat_Light -+style Base_Theme_AppCompat_Light_DarkActionBar -+style Base_Theme_AppCompat_Light_Dialog -+style Base_Theme_AppCompat_Light_DialogWhenLarge -+style Base_Theme_AppCompat_Light_Dialog_Alert -+style Base_Theme_AppCompat_Light_Dialog_FixedSize -+style Base_Theme_AppCompat_Light_Dialog_MinWidth -+style Base_V21_ThemeOverlay_AppCompat_Dialog -+style Base_V21_Theme_AppCompat -+style Base_V21_Theme_AppCompat_Dialog -+style Base_V21_Theme_AppCompat_Light -+style Base_V21_Theme_AppCompat_Light_Dialog -+style Base_V22_Theme_AppCompat -+style Base_V22_Theme_AppCompat_Light -+style Base_V23_Theme_AppCompat -+style Base_V23_Theme_AppCompat_Light -+style Base_V26_Theme_AppCompat -+style Base_V26_Theme_AppCompat_Light -+style Base_V26_Widget_AppCompat_Toolbar -+style Base_V28_Theme_AppCompat -+style Base_V28_Theme_AppCompat_Light -+style Base_V7_ThemeOverlay_AppCompat_Dialog -+style Base_V7_Theme_AppCompat -+style Base_V7_Theme_AppCompat_Dialog -+style Base_V7_Theme_AppCompat_Light -+style Base_V7_Theme_AppCompat_Light_Dialog -+style Base_V7_Widget_AppCompat_AutoCompleteTextView -+style Base_V7_Widget_AppCompat_EditText -+style Base_V7_Widget_AppCompat_Toolbar -+style Base_Widget_AppCompat_ActionBar -+style Base_Widget_AppCompat_ActionBar_Solid -+style Base_Widget_AppCompat_ActionBar_TabBar -+style Base_Widget_AppCompat_ActionBar_TabText -+style Base_Widget_AppCompat_ActionBar_TabView -+style Base_Widget_AppCompat_ActionButton -+style Base_Widget_AppCompat_ActionButton_CloseMode -+style Base_Widget_AppCompat_ActionButton_Overflow -+style Base_Widget_AppCompat_ActionMode -+style Base_Widget_AppCompat_ActivityChooserView -+style Base_Widget_AppCompat_AutoCompleteTextView -+style Base_Widget_AppCompat_Button -+style Base_Widget_AppCompat_ButtonBar -+style Base_Widget_AppCompat_ButtonBar_AlertDialog -+style Base_Widget_AppCompat_Button_Borderless -+style Base_Widget_AppCompat_Button_Borderless_Colored -+style Base_Widget_AppCompat_Button_ButtonBar_AlertDialog -+style Base_Widget_AppCompat_Button_Colored -+style Base_Widget_AppCompat_Button_Small -+style Base_Widget_AppCompat_CompoundButton_CheckBox -+style Base_Widget_AppCompat_CompoundButton_RadioButton -+style Base_Widget_AppCompat_CompoundButton_Switch -+style Base_Widget_AppCompat_DrawerArrowToggle -+style Base_Widget_AppCompat_DrawerArrowToggle_Common -+style Base_Widget_AppCompat_DropDownItem_Spinner -+style Base_Widget_AppCompat_EditText -+style Base_Widget_AppCompat_ImageButton -+style Base_Widget_AppCompat_Light_ActionBar -+style Base_Widget_AppCompat_Light_ActionBar_Solid -+style Base_Widget_AppCompat_Light_ActionBar_TabBar -+style Base_Widget_AppCompat_Light_ActionBar_TabText -+style Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse -+style Base_Widget_AppCompat_Light_ActionBar_TabView -+style Base_Widget_AppCompat_Light_PopupMenu -+style Base_Widget_AppCompat_Light_PopupMenu_Overflow -+style Base_Widget_AppCompat_ListMenuView -+style Base_Widget_AppCompat_ListPopupWindow -+style Base_Widget_AppCompat_ListView -+style Base_Widget_AppCompat_ListView_DropDown -+style Base_Widget_AppCompat_ListView_Menu -+style Base_Widget_AppCompat_PopupMenu -+style Base_Widget_AppCompat_PopupMenu_Overflow -+style Base_Widget_AppCompat_PopupWindow -+style Base_Widget_AppCompat_ProgressBar -+style Base_Widget_AppCompat_ProgressBar_Horizontal -+style Base_Widget_AppCompat_RatingBar -+style Base_Widget_AppCompat_RatingBar_Indicator -+style Base_Widget_AppCompat_RatingBar_Small -+style Base_Widget_AppCompat_SearchView -+style Base_Widget_AppCompat_SearchView_ActionBar -+style Base_Widget_AppCompat_SeekBar -+style Base_Widget_AppCompat_SeekBar_Discrete -+style Base_Widget_AppCompat_Spinner -+style Base_Widget_AppCompat_Spinner_Underlined -+style Base_Widget_AppCompat_TextView -+style Base_Widget_AppCompat_TextView_SpinnerItem -+style Base_Widget_AppCompat_Toolbar -+style Base_Widget_AppCompat_Toolbar_Button_Navigation -+style CalendarDatePickerDialog -+style CalendarDatePickerStyle -+style DialogAnimationFade -+style DialogAnimationSlide -+style Platform_AppCompat -+style Platform_AppCompat_Light -+style Platform_ThemeOverlay_AppCompat -+style Platform_ThemeOverlay_AppCompat_Dark -+style Platform_ThemeOverlay_AppCompat_Light -+style Platform_V21_AppCompat -+style Platform_V21_AppCompat_Light -+style Platform_V25_AppCompat -+style Platform_V25_AppCompat_Light -+style Platform_Widget_AppCompat_Spinner -+style RtlOverlay_DialogWindowTitle_AppCompat -+style RtlOverlay_Widget_AppCompat_ActionBar_TitleItem -+style RtlOverlay_Widget_AppCompat_DialogTitle_Icon -+style RtlOverlay_Widget_AppCompat_PopupMenuItem -+style RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup -+style RtlOverlay_Widget_AppCompat_PopupMenuItem_Shortcut -+style RtlOverlay_Widget_AppCompat_PopupMenuItem_SubmenuArrow -+style RtlOverlay_Widget_AppCompat_PopupMenuItem_Text -+style RtlOverlay_Widget_AppCompat_PopupMenuItem_Title -+style RtlOverlay_Widget_AppCompat_SearchView_MagIcon -+style RtlOverlay_Widget_AppCompat_Search_DropDown -+style RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 -+style RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 -+style RtlOverlay_Widget_AppCompat_Search_DropDown_Query -+style RtlOverlay_Widget_AppCompat_Search_DropDown_Text -+style RtlUnderlay_Widget_AppCompat_ActionButton -+style RtlUnderlay_Widget_AppCompat_ActionButton_Overflow -+style SpinnerDatePickerDialog -+style SpinnerDatePickerStyle -+style TextAppearance_AppCompat -+style TextAppearance_AppCompat_Body1 -+style TextAppearance_AppCompat_Body2 -+style TextAppearance_AppCompat_Button -+style TextAppearance_AppCompat_Caption -+style TextAppearance_AppCompat_Display1 -+style TextAppearance_AppCompat_Display2 -+style TextAppearance_AppCompat_Display3 -+style TextAppearance_AppCompat_Display4 -+style TextAppearance_AppCompat_Headline -+style TextAppearance_AppCompat_Inverse -+style TextAppearance_AppCompat_Large -+style TextAppearance_AppCompat_Large_Inverse -+style TextAppearance_AppCompat_Light_SearchResult_Subtitle -+style TextAppearance_AppCompat_Light_SearchResult_Title -+style TextAppearance_AppCompat_Light_Widget_PopupMenu_Large -+style TextAppearance_AppCompat_Light_Widget_PopupMenu_Small -+style TextAppearance_AppCompat_Medium -+style TextAppearance_AppCompat_Medium_Inverse -+style TextAppearance_AppCompat_Menu -+style TextAppearance_AppCompat_SearchResult_Subtitle -+style TextAppearance_AppCompat_SearchResult_Title -+style TextAppearance_AppCompat_Small -+style TextAppearance_AppCompat_Small_Inverse -+style TextAppearance_AppCompat_Subhead -+style TextAppearance_AppCompat_Subhead_Inverse -+style TextAppearance_AppCompat_Title -+style TextAppearance_AppCompat_Title_Inverse -+style TextAppearance_AppCompat_Tooltip -+style TextAppearance_AppCompat_Widget_ActionBar_Menu -+style TextAppearance_AppCompat_Widget_ActionBar_Subtitle -+style TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse -+style TextAppearance_AppCompat_Widget_ActionBar_Title -+style TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse -+style TextAppearance_AppCompat_Widget_ActionMode_Subtitle -+style TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse -+style TextAppearance_AppCompat_Widget_ActionMode_Title -+style TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse -+style TextAppearance_AppCompat_Widget_Button -+style TextAppearance_AppCompat_Widget_Button_Borderless_Colored -+style TextAppearance_AppCompat_Widget_Button_Colored -+style TextAppearance_AppCompat_Widget_Button_Inverse -+style TextAppearance_AppCompat_Widget_DropDownItem -+style TextAppearance_AppCompat_Widget_PopupMenu_Header -+style TextAppearance_AppCompat_Widget_PopupMenu_Large -+style TextAppearance_AppCompat_Widget_PopupMenu_Small -+style TextAppearance_AppCompat_Widget_Switch -+style TextAppearance_AppCompat_Widget_TextView_SpinnerItem -+style TextAppearance_Compat_Notification -+style TextAppearance_Compat_Notification_Info -+style TextAppearance_Compat_Notification_Line2 -+style TextAppearance_Compat_Notification_Time -+style TextAppearance_Compat_Notification_Title -+style TextAppearance_Widget_AppCompat_ExpandedMenu_Item -+style TextAppearance_Widget_AppCompat_Toolbar_Subtitle -+style TextAppearance_Widget_AppCompat_Toolbar_Title -+style Theme -+style ThemeOverlay_AppCompat -+style ThemeOverlay_AppCompat_ActionBar -+style ThemeOverlay_AppCompat_Dark -+style ThemeOverlay_AppCompat_Dark_ActionBar -+style ThemeOverlay_AppCompat_DayNight -+style ThemeOverlay_AppCompat_DayNight_ActionBar -+style ThemeOverlay_AppCompat_Dialog -+style ThemeOverlay_AppCompat_Dialog_Alert -+style ThemeOverlay_AppCompat_Light -+style Theme_AppCompat -+style Theme_AppCompat_CompactMenu -+style Theme_AppCompat_DayNight -+style Theme_AppCompat_DayNight_DarkActionBar -+style Theme_AppCompat_DayNight_Dialog -+style Theme_AppCompat_DayNight_DialogWhenLarge -+style Theme_AppCompat_DayNight_Dialog_Alert -+style Theme_AppCompat_DayNight_Dialog_MinWidth -+style Theme_AppCompat_DayNight_NoActionBar -+style Theme_AppCompat_Dialog -+style Theme_AppCompat_DialogWhenLarge -+style Theme_AppCompat_Dialog_Alert -+style Theme_AppCompat_Dialog_MinWidth -+style Theme_AppCompat_Empty -+style Theme_AppCompat_Light -+style Theme_AppCompat_Light_DarkActionBar -+style Theme_AppCompat_Light_Dialog -+style Theme_AppCompat_Light_DialogWhenLarge -+style Theme_AppCompat_Light_Dialog_Alert -+style Theme_AppCompat_Light_Dialog_MinWidth -+style Theme_AppCompat_Light_NoActionBar -+style Theme_AppCompat_NoActionBar -+style Theme_AutofillInlineSuggestion -+style Theme_Catalyst -+style Theme_Catalyst_LogBox -+style Theme_Catalyst_RedBox -+style Theme_FullScreenDialog -+style Theme_FullScreenDialogAnimatedFade -+style Theme_FullScreenDialogAnimatedSlide -+style Theme_ReactNative_AppCompat_Light -+style Theme_ReactNative_AppCompat_Light_NoActionBar_FullScreen -+style Widget_AppCompat_ActionBar -+style Widget_AppCompat_ActionBar_Solid -+style Widget_AppCompat_ActionBar_TabBar -+style Widget_AppCompat_ActionBar_TabText -+style Widget_AppCompat_ActionBar_TabView -+style Widget_AppCompat_ActionButton -+style Widget_AppCompat_ActionButton_CloseMode -+style Widget_AppCompat_ActionButton_Overflow -+style Widget_AppCompat_ActionMode -+style Widget_AppCompat_ActivityChooserView -+style Widget_AppCompat_AutoCompleteTextView -+style Widget_AppCompat_Button -+style Widget_AppCompat_ButtonBar -+style Widget_AppCompat_ButtonBar_AlertDialog -+style Widget_AppCompat_Button_Borderless -+style Widget_AppCompat_Button_Borderless_Colored -+style Widget_AppCompat_Button_ButtonBar_AlertDialog -+style Widget_AppCompat_Button_Colored -+style Widget_AppCompat_Button_Small -+style Widget_AppCompat_CompoundButton_CheckBox -+style Widget_AppCompat_CompoundButton_RadioButton -+style Widget_AppCompat_CompoundButton_Switch -+style Widget_AppCompat_DrawerArrowToggle -+style Widget_AppCompat_DropDownItem_Spinner -+style Widget_AppCompat_EditText -+style Widget_AppCompat_ImageButton -+style Widget_AppCompat_Light_ActionBar -+style Widget_AppCompat_Light_ActionBar_Solid -+style Widget_AppCompat_Light_ActionBar_Solid_Inverse -+style Widget_AppCompat_Light_ActionBar_TabBar -+style Widget_AppCompat_Light_ActionBar_TabBar_Inverse -+style Widget_AppCompat_Light_ActionBar_TabText -+style Widget_AppCompat_Light_ActionBar_TabText_Inverse -+style Widget_AppCompat_Light_ActionBar_TabView -+style Widget_AppCompat_Light_ActionBar_TabView_Inverse -+style Widget_AppCompat_Light_ActionButton -+style Widget_AppCompat_Light_ActionButton_CloseMode -+style Widget_AppCompat_Light_ActionButton_Overflow -+style Widget_AppCompat_Light_ActionMode_Inverse -+style Widget_AppCompat_Light_ActivityChooserView -+style Widget_AppCompat_Light_AutoCompleteTextView -+style Widget_AppCompat_Light_DropDownItem_Spinner -+style Widget_AppCompat_Light_ListPopupWindow -+style Widget_AppCompat_Light_ListView_DropDown -+style Widget_AppCompat_Light_PopupMenu -+style Widget_AppCompat_Light_PopupMenu_Overflow -+style Widget_AppCompat_Light_SearchView -+style Widget_AppCompat_Light_Spinner_DropDown_ActionBar -+style Widget_AppCompat_ListMenuView -+style Widget_AppCompat_ListPopupWindow -+style Widget_AppCompat_ListView -+style Widget_AppCompat_ListView_DropDown -+style Widget_AppCompat_ListView_Menu -+style Widget_AppCompat_PopupMenu -+style Widget_AppCompat_PopupMenu_Overflow -+style Widget_AppCompat_PopupWindow -+style Widget_AppCompat_ProgressBar -+style Widget_AppCompat_ProgressBar_Horizontal -+style Widget_AppCompat_RatingBar -+style Widget_AppCompat_RatingBar_Indicator -+style Widget_AppCompat_RatingBar_Small -+style Widget_AppCompat_SearchView -+style Widget_AppCompat_SearchView_ActionBar -+style Widget_AppCompat_SeekBar -+style Widget_AppCompat_SeekBar_Discrete -+style Widget_AppCompat_Spinner -+style Widget_AppCompat_Spinner_DropDown -+style Widget_AppCompat_Spinner_DropDown_ActionBar -+style Widget_AppCompat_Spinner_Underlined -+style Widget_AppCompat_TextView -+style Widget_AppCompat_TextView_SpinnerItem -+style Widget_AppCompat_Toolbar -+style Widget_AppCompat_Toolbar_Button_Navigation -+style Widget_Autofill -+style Widget_Autofill_InlineSuggestionChip -+style Widget_Autofill_InlineSuggestionEndIconStyle -+style Widget_Autofill_InlineSuggestionStartIconStyle -+style Widget_Autofill_InlineSuggestionSubtitle -+style Widget_Autofill_InlineSuggestionTitle -+style Widget_Compat_NotificationActionContainer -+style Widget_Compat_NotificationActionText -+style redboxButton -+styleable ActionBar background backgroundSplit backgroundStacked contentInsetEnd contentInsetEndWithActions contentInsetLeft contentInsetRight contentInsetStart contentInsetStartWithNavigation customNavigationLayout displayOptions divider elevation height hideOnContentScroll homeAsUpIndicator homeLayout icon indeterminateProgressStyle itemPadding logo navigationMode popupTheme progressBarPadding progressBarStyle subtitle subtitleTextStyle title titleTextStyle -+styleable ActionBarLayout android_layout_gravity -+styleable ActionMenuItemView android_minWidth -+styleable ActionMenuView -+styleable ActionMode background backgroundSplit closeItemLayout height subtitleTextStyle titleTextStyle -+styleable ActivityChooserView expandActivityOverflowButtonDrawable initialActivityCount -+styleable AlertDialog android_layout buttonIconDimen buttonPanelSideLayout listItemLayout listLayout multiChoiceItemLayout showTitle singleChoiceItemLayout -+styleable AnimatedStateListDrawableCompat android_constantSize android_dither android_enterFadeDuration android_exitFadeDuration android_variablePadding android_visible -+styleable AnimatedStateListDrawableItem android_drawable android_id -+styleable AnimatedStateListDrawableTransition android_drawable android_fromId android_reversible android_toId -+styleable AppCompatEmojiHelper -+styleable AppCompatImageView android_src srcCompat tint tintMode -+styleable AppCompatSeekBar android_thumb tickMark tickMarkTint tickMarkTintMode -+styleable AppCompatTextHelper android_drawableBottom android_drawableEnd android_drawableLeft android_drawableRight android_drawableStart android_drawableTop android_textAppearance -+styleable AppCompatTextView android_textAppearance autoSizeMaxTextSize autoSizeMinTextSize autoSizePresetSizes autoSizeStepGranularity autoSizeTextType drawableBottomCompat drawableEndCompat drawableLeftCompat drawableRightCompat drawableStartCompat drawableTint drawableTintMode drawableTopCompat emojiCompatEnabled firstBaselineToTopHeight fontFamily fontVariationSettings lastBaselineToBottomHeight lineHeight textAllCaps textLocale -+styleable AppCompatTheme actionBarDivider actionBarItemBackground actionBarPopupTheme actionBarSize actionBarSplitStyle actionBarStyle actionBarTabBarStyle actionBarTabStyle actionBarTabTextStyle actionBarTheme actionBarWidgetTheme actionButtonStyle actionDropDownStyle actionMenuTextAppearance actionMenuTextColor actionModeBackground actionModeCloseButtonStyle actionModeCloseContentDescription actionModeCloseDrawable actionModeCopyDrawable actionModeCutDrawable actionModeFindDrawable actionModePasteDrawable actionModePopupWindowStyle actionModeSelectAllDrawable actionModeShareDrawable actionModeSplitBackground actionModeStyle actionModeTheme actionModeWebSearchDrawable actionOverflowButtonStyle actionOverflowMenuStyle activityChooserViewStyle alertDialogButtonGroupStyle alertDialogCenterButtons alertDialogStyle alertDialogTheme android_windowAnimationStyle android_windowIsFloating autoCompleteTextViewStyle borderlessButtonStyle buttonBarButtonStyle buttonBarNegativeButtonStyle buttonBarNeutralButtonStyle buttonBarPositiveButtonStyle buttonBarStyle buttonStyle buttonStyleSmall checkboxStyle checkedTextViewStyle colorAccent colorBackgroundFloating colorButtonNormal colorControlActivated colorControlHighlight colorControlNormal colorError colorPrimary colorPrimaryDark colorSwitchThumbNormal controlBackground dialogCornerRadius dialogPreferredPadding dialogTheme dividerHorizontal dividerVertical dropDownListViewStyle dropdownListPreferredItemHeight editTextBackground editTextColor editTextStyle homeAsUpIndicator imageButtonStyle listChoiceBackgroundIndicator listChoiceIndicatorMultipleAnimated listChoiceIndicatorSingleAnimated listDividerAlertDialog listMenuViewStyle listPopupWindowStyle listPreferredItemHeight listPreferredItemHeightLarge listPreferredItemHeightSmall listPreferredItemPaddingEnd listPreferredItemPaddingLeft listPreferredItemPaddingRight listPreferredItemPaddingStart panelBackground panelMenuListTheme panelMenuListWidth popupMenuStyle popupWindowStyle radioButtonStyle ratingBarStyle ratingBarStyleIndicator ratingBarStyleSmall searchViewStyle seekBarStyle selectableItemBackground selectableItemBackgroundBorderless spinnerDropDownItemStyle spinnerStyle switchStyle textAppearanceLargePopupMenu textAppearanceListItem textAppearanceListItemSecondary textAppearanceListItemSmall textAppearancePopupMenuHeader textAppearanceSearchResultSubtitle textAppearanceSearchResultTitle textAppearanceSmallPopupMenu textColorAlertDialogListItem textColorSearchUrl toolbarNavigationButtonStyle toolbarStyle tooltipForegroundColor tooltipFrameBackground viewInflaterClass windowActionBar windowActionBarOverlay windowActionModeOverlay windowFixedHeightMajor windowFixedHeightMinor windowFixedWidthMajor windowFixedWidthMinor windowMinWidthMajor windowMinWidthMinor windowNoTitle -+styleable Autofill_InlineSuggestion autofillInlineSuggestionChip autofillInlineSuggestionEndIconStyle autofillInlineSuggestionStartIconStyle autofillInlineSuggestionSubtitle autofillInlineSuggestionTitle isAutofillInlineSuggestionTheme -+styleable ButtonBarLayout allowStacking -+styleable Capability queryPatterns shortcutMatchRequired -+styleable CheckedTextView android_checkMark checkMarkCompat checkMarkTint checkMarkTintMode -+styleable ColorStateListItem alpha android_alpha android_color android_lStar lStar -+styleable CompoundButton android_button buttonCompat buttonTint buttonTintMode -+styleable DrawerArrowToggle arrowHeadLength arrowShaftLength barLength color drawableSize gapBetweenBars spinBars thickness -+styleable FontFamily fontProviderAuthority fontProviderCerts fontProviderFetchStrategy fontProviderFetchTimeout fontProviderPackage fontProviderQuery fontProviderSystemFontFamily -+styleable FontFamilyFont android_font android_fontStyle android_fontVariationSettings android_fontWeight android_ttcIndex font fontStyle fontVariationSettings fontWeight ttcIndex -+styleable Fragment android_id android_name android_tag -+styleable FragmentContainerView android_name android_tag -+styleable GenericDraweeHierarchy actualImageScaleType backgroundImage fadeDuration failureImage failureImageScaleType overlayImage placeholderImage placeholderImageScaleType pressedStateOverlayImage progressBarAutoRotateInterval progressBarImage progressBarImageScaleType retryImage retryImageScaleType roundAsCircle roundBottomEnd roundBottomLeft roundBottomRight roundBottomStart roundTopEnd roundTopLeft roundTopRight roundTopStart roundWithOverlayColor roundedCornerRadius roundingBorderColor roundingBorderPadding roundingBorderWidth viewAspectRatio -+styleable GradientColor android_centerColor android_centerX android_centerY android_endColor android_endX android_endY android_gradientRadius android_startColor android_startX android_startY android_tileMode android_type -+styleable GradientColorItem android_color android_offset -+styleable LinearLayoutCompat android_baselineAligned android_baselineAlignedChildIndex android_gravity android_orientation android_weightSum divider dividerPadding measureWithLargestChild showDividers -+styleable LinearLayoutCompat_Layout android_layout_gravity android_layout_height android_layout_weight android_layout_width -+styleable ListPopupWindow android_dropDownHorizontalOffset android_dropDownVerticalOffset -+styleable MenuGroup android_checkableBehavior android_enabled android_id android_menuCategory android_orderInCategory android_visible -+styleable MenuItem actionLayout actionProviderClass actionViewClass alphabeticModifiers android_alphabeticShortcut android_checkable android_checked android_enabled android_icon android_id android_menuCategory android_numericShortcut android_onClick android_orderInCategory android_title android_titleCondensed android_visible contentDescription iconTint iconTintMode numericModifiers showAsAction tooltipText -+styleable MenuView android_headerBackground android_horizontalDivider android_itemBackground android_itemIconDisabledAlpha android_itemTextAppearance android_verticalDivider android_windowAnimationStyle preserveIconSpacing subMenuArrow -+styleable PopupWindow android_popupAnimationStyle android_popupBackground overlapAnchor -+styleable PopupWindowBackgroundState state_above_anchor -+styleable RecycleListView paddingBottomNoButtons paddingTopNoTitle -+styleable SearchView android_focusable android_imeOptions android_inputType android_maxWidth closeIcon commitIcon defaultQueryHint goIcon iconifiedByDefault layout queryBackground queryHint searchHintIcon searchIcon submitBackground suggestionRowLayout voiceIcon -+styleable SimpleDraweeView actualImageResource actualImageScaleType actualImageUri backgroundImage fadeDuration failureImage failureImageScaleType overlayImage placeholderImage placeholderImageScaleType pressedStateOverlayImage progressBarAutoRotateInterval progressBarImage progressBarImageScaleType retryImage retryImageScaleType roundAsCircle roundBottomEnd roundBottomLeft roundBottomRight roundBottomStart roundTopEnd roundTopLeft roundTopRight roundTopStart roundWithOverlayColor roundedCornerRadius roundingBorderColor roundingBorderPadding roundingBorderWidth viewAspectRatio -+styleable Spinner android_dropDownWidth android_entries android_popupBackground android_prompt popupTheme -+styleable StateListDrawable android_constantSize android_dither android_enterFadeDuration android_exitFadeDuration android_variablePadding android_visible -+styleable StateListDrawableItem android_drawable -+styleable SwitchCompat android_textOff android_textOn android_thumb showText splitTrack switchMinWidth switchPadding switchTextAppearance thumbTextPadding thumbTint thumbTintMode track trackTint trackTintMode -+styleable TextAppearance android_fontFamily android_shadowColor android_shadowDx android_shadowDy android_shadowRadius android_textColor android_textColorHint android_textColorLink android_textFontWeight android_textSize android_textStyle android_typeface fontFamily fontVariationSettings textAllCaps textLocale -+styleable Toolbar android_gravity android_minHeight buttonGravity collapseContentDescription collapseIcon contentInsetEnd contentInsetEndWithActions contentInsetLeft contentInsetRight contentInsetStart contentInsetStartWithNavigation logo logoDescription maxButtonHeight menu navigationContentDescription navigationIcon popupTheme subtitle subtitleTextAppearance subtitleTextColor title titleMargin titleMarginBottom titleMarginEnd titleMarginStart titleMarginTop titleMargins titleTextAppearance titleTextColor -+styleable View android_focusable android_theme paddingEnd paddingStart theme -+styleable ViewBackgroundHelper android_background backgroundTint backgroundTintMode -+styleable ViewStubCompat android_id android_inflatedId android_layout -+xml rn_dev_preferences -diff --git a/node_modules/react-native-power-saving-mode/android/build/outputs/logs/manifest-merger-debug-report.txt b/node_modules/react-native-power-saving-mode/android/build/outputs/logs/manifest-merger-debug-report.txt -new file mode 100644 -index 0000000..f0b5334 ---- /dev/null -+++ b/node_modules/react-native-power-saving-mode/android/build/outputs/logs/manifest-merger-debug-report.txt -@@ -0,0 +1,25 @@ -+-- Merging decision tree log --- -+manifest -+ADDED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml:2:1-6:12 -+INJECTED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml:2:1-6:12 -+INJECTED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml:2:1-6:12 -+ package -+ ADDED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml:4:5-33 -+ INJECTED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml -+ INJECTED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml -+ xmlns:android -+ ADDED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml:3:5-63 -+uses-sdk -+INJECTED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml reason: use-sdk injection requested -+INJECTED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml -+INJECTED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml -+INJECTED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml -+INJECTED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml -+ android:targetSdkVersion -+ INJECTED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml -+ ADDED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml -+ INJECTED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml -+ android:minSdkVersion -+ INJECTED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml -+ ADDED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml -+ INJECTED from /home/m00np3ngu1n/git/edge-react-gui/node_modules/react-native-power-saving-mode/android/src/main/AndroidManifest.xml -diff --git a/node_modules/react-native-power-saving-mode/android/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin b/node_modules/react-native-power-saving-mode/android/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin -new file mode 100644 -index 0000000..80b9097 -Binary files /dev/null and b/node_modules/react-native-power-saving-mode/android/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin differ diff --git a/src/__tests__/components/WalletListSortableRow.test.tsx b/src/__tests__/components/WalletListSortableRow.test.tsx index 4e29da2f1ad..c233dcea666 100644 --- a/src/__tests__/components/WalletListSortableRow.test.tsx +++ b/src/__tests__/components/WalletListSortableRow.test.tsx @@ -10,7 +10,7 @@ describe('WalletListSortableRow', () => { it('should render with loading wallet', () => { const renderer = TestRenderer.create( - {}} /> + ) expect(renderer.toJSON()).toMatchSnapshot() @@ -48,7 +48,7 @@ describe('WalletListSortableRow', () => { const renderer = TestRenderer.create( - {}} /> + ) expect(renderer.toJSON()).toMatchSnapshot() diff --git a/src/__tests__/components/__snapshots__/MenuTabs.test.tsx.snap b/src/__tests__/components/__snapshots__/MenuTabs.test.tsx.snap index fd3254a99e1..92f8b0bbe48 100644 --- a/src/__tests__/components/__snapshots__/MenuTabs.test.tsx.snap +++ b/src/__tests__/components/__snapshots__/MenuTabs.test.tsx.snap @@ -67,7 +67,6 @@ exports[`MenuTabs should render with loading props 1`] = ` style={ { "backgroundColor": undefined, - "borderRadius": 16, "bottom": 0, "left": 0, "position": "absolute", diff --git a/src/__tests__/components/__snapshots__/WalletListSortableRow.test.tsx.snap b/src/__tests__/components/__snapshots__/WalletListSortableRow.test.tsx.snap index 40dc0764af4..c62822efe4d 100644 --- a/src/__tests__/components/__snapshots__/WalletListSortableRow.test.tsx.snap +++ b/src/__tests__/components/__snapshots__/WalletListSortableRow.test.tsx.snap @@ -2,48 +2,54 @@ exports[`WalletListSortableRow should render with fake wallet 1`] = ` - + @@ -79,199 +85,199 @@ exports[`WalletListSortableRow should render with fake wallet 1`] = `  + + - - - + } + /> + + - - - FAKE - - - 0 - - - + - - Test wallet - - - $0.00 - - + 0 + + + + + Test wallet + + + $0.00 + diff --git a/src/__tests__/modals/__snapshots__/CategoryModal.test.tsx.snap b/src/__tests__/modals/__snapshots__/CategoryModal.test.tsx.snap index d1b88342333..00d7251519b 100644 --- a/src/__tests__/modals/__snapshots__/CategoryModal.test.tsx.snap +++ b/src/__tests__/modals/__snapshots__/CategoryModal.test.tsx.snap @@ -74,15 +74,19 @@ exports[`CategoryModal should render with a subcategory 1`] = ` blurType="dark" overlayColor="rgba(0, 0, 0, 0)" style={ - { - "backgroundColor": undefined, - "borderRadius": 16, - "bottom": 0, - "left": 0, - "position": "absolute", - "right": 0, - "top": 0, - } + [ + { + "backgroundColor": undefined, + "bottom": 0, + "left": 0, + "position": "absolute", + "right": 0, + "top": 0, + }, + { + "borderRadius": 16, + }, + ] } /> - Version 1.2.3 + Version undefined - Build 2019010101 + Build undefined diff --git a/src/__tests__/modals/__snapshots__/LogsModal.test.tsx.snap b/src/__tests__/modals/__snapshots__/LogsModal.test.tsx.snap index 9990f0bf0d7..5abc1549fa1 100644 --- a/src/__tests__/modals/__snapshots__/LogsModal.test.tsx.snap +++ b/src/__tests__/modals/__snapshots__/LogsModal.test.tsx.snap @@ -74,15 +74,19 @@ exports[`LogsModal should render with a logs modal 1`] = ` blurType="dark" overlayColor="rgba(0, 0, 0, 0)" style={ - { - "backgroundColor": undefined, - "borderRadius": 16, - "bottom": 0, - "left": 0, - "position": "absolute", - "right": 0, - "top": 0, - } + [ + { + "backgroundColor": undefined, + "bottom": 0, + "left": 0, + "position": "absolute", + "right": 0, + "top": 0, + }, + { + "borderRadius": 16, + }, + ] } /> - You may add any additional notes here, and select whether to share logs with Edge, or export logs to your device. + Select whether to share logs with Edge or export logs to your device. + + + + + + + +  + + + Do not enter seeds, private keys, password or other sensitive information + + + + { + const generalStore = makeGeneralStoreFixture() + + it('toJsonObject, toJson, fromJsonObject, fromJson', () => { + const obj = generalStore.toJsonObject() + const json = generalStore.toJson() + + const expectedObj = { + buy: true, + '*': { + US: true, + 'US:CA': true, + UK: true, + '*': { + 'iso:USD': true, + 'iso:CAD': true, + 'iso:GBP': true, + '*': { + ach: true, + sepa: true, + credit: true, + '*': { + 'ethereum:null': true, + 'ethereum:USDC': true, + 'bitcoin:null': true + } + } + } + } + } + expect(obj).toEqual(expectedObj) + + const expectedJson = JSON.stringify(expectedObj) + expect(json).toBe(expectedJson) + + generalStore.fromJsonObject(obj) + expect(generalStore.toJsonObject()).toEqual(expectedObj) + + generalStore.fromJson(json) + expect(generalStore.toJson()).toEqual(expectedJson) + }) + + it('toJsonObject', () => { + const obj = generalStore.toJsonObject() + + expect(obj).toEqual({ + buy: true, + '*': { + US: true, + 'US:CA': true, + UK: true, + '*': { + 'iso:USD': true, + 'iso:CAD': true, + 'iso:GBP': true, + '*': { + ach: true, + sepa: true, + credit: true, + '*': { + 'ethereum:null': true, + 'ethereum:USDC': true, + 'bitcoin:null': true + } + } + } + } + }) + }) + + it('isSupported -> true', () => { + expect(generalStore.is.direction('buy').supported).toBe(true) + expect(generalStore.is.direction('*').region('US').supported).toBe(true) + expect(generalStore.is.direction('buy').region('US').supported).toBe(true) + expect(generalStore.is.direction('buy').region('US').fiat('iso:USD').supported).toBe(true) + expect(generalStore.is.direction('buy').region('US').fiat('iso:USD').payment('ach').supported).toBe(true) + expect(generalStore.is.direction('buy').region('US').fiat('iso:USD').payment('ach').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('*').region('US').fiat('iso:USD').payment('ach').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('buy').region('*').fiat('iso:USD').payment('ach').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('*').region('*').fiat('iso:USD').payment('ach').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('buy').region('US').fiat('*').payment('ach').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('*').region('US').fiat('*').payment('ach').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('buy').region('*').fiat('*').payment('ach').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('*').region('*').fiat('*').payment('ach').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('buy').region('US').fiat('iso:USD').payment('*').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('*').region('US').fiat('iso:USD').payment('*').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('buy').region('*').fiat('iso:USD').payment('*').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('*').region('*').fiat('iso:USD').payment('*').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('buy').region('US').fiat('*').payment('*').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('*').region('US').fiat('*').payment('*').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('buy').region('*').fiat('*').payment('*').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('*').region('*').fiat('*').payment('*').crypto('ethereum:null').supported).toBe(true) + expect(generalStore.is.direction('buy').region('US').fiat('iso:USD').payment('ach').crypto('*').supported).toBe(true) + expect(generalStore.is.direction('*').region('US').fiat('iso:USD').payment('ach').crypto('*').supported).toBe(true) + expect(generalStore.is.direction('buy').region('*').fiat('iso:USD').payment('ach').crypto('*').supported).toBe(true) + expect(generalStore.is.direction('*').region('*').fiat('iso:USD').payment('ach').crypto('*').supported).toBe(true) + expect(generalStore.is.direction('buy').region('US').fiat('*').payment('ach').crypto('*').supported).toBe(true) + expect(generalStore.is.direction('*').region('US').fiat('*').payment('ach').crypto('*').supported).toBe(true) + expect(generalStore.is.direction('buy').region('*').fiat('*').payment('ach').crypto('*').supported).toBe(true) + expect(generalStore.is.direction('*').region('*').fiat('*').payment('ach').crypto('*').supported).toBe(true) + expect(generalStore.is.direction('buy').region('US').fiat('iso:USD').payment('*').crypto('*').supported).toBe(true) + expect(generalStore.is.direction('*').region('US').fiat('iso:USD').payment('*').crypto('*').supported).toBe(true) + expect(generalStore.is.direction('buy').region('*').fiat('iso:USD').payment('*').crypto('*').supported).toBe(true) + expect(generalStore.is.direction('*').region('*').fiat('iso:USD').payment('*').crypto('*').supported).toBe(true) + expect(generalStore.is.direction('buy').region('US').fiat('*').payment('*').crypto('*').supported).toBe(true) + expect(generalStore.is.direction('*').region('US').fiat('*').payment('*').crypto('*').supported).toBe(true) + expect(generalStore.is.direction('buy').region('*').fiat('*').payment('*').crypto('*').supported).toBe(true) + expect(generalStore.is.direction('*').region('*').fiat('*').payment('*').crypto('*').supported).toBe(true) + }) + + it('isSupported -> false', () => { + expect(generalStore.is.direction('sell').supported).toBe(false) + expect(generalStore.is.direction('sell').region('US').supported).toBe(false) + expect(generalStore.is.direction('sell').region('US').fiat('iso:USD').supported).toBe(false) + expect(generalStore.is.direction('sell').region('US').fiat('iso:USD').payment('ach').supported).toBe(false) + expect(generalStore.is.direction('sell').region('US').fiat('iso:USD').payment('ach').crypto('ethereum:null').supported).toBe(false) + expect(generalStore.is.direction('*').region('IT').fiat('iso:USD').payment('ach').crypto('ethereum:null').supported).toBe(false) + expect(generalStore.is.direction('buy').region('*').fiat('iso:JPY').payment('ach').crypto('ethereum:null').supported).toBe(false) + expect(generalStore.is.direction('buy').region('*').fiat('iso:JPY').payment('ach').supported).toBe(false) + expect(generalStore.is.direction('buy').region('*').fiat('iso:JPY').supported).toBe(false) + expect(generalStore.is.direction('*').region('*').fiat('*').payment('*').crypto('monero').supported).toBe(false) + }) + + it('special matching rules', () => { + const store = new ProviderSupportStore('test') + + // all rule with explicit regions + store.add.direction('buy').region('US:CA') + store.add.direction('buy').region('US:FL') + store.add.direction('buy').region('US:*').fiat('iso:USD') + // any rule (implied) + store.add.direction('buy').region('UK').fiat('iso:GBP') + // any rule with explicit any region + store.add.direction('buy').region('CA:').fiat('iso:CAD') + + // all rule -> true + expect(store.is.direction('buy').region('US:CA').fiat('iso:USD').supported).toBe(true) + expect(store.is.direction('buy').region('US:FL').fiat('iso:USD').supported).toBe(true) + expect(store.is.direction('buy').region('*').fiat('iso:USD').supported).toBe(true) + // all rule -> false + expect(store.is.direction('buy').region('US:TX').fiat('iso:USD').supported).toBe(false) + expect(store.is.direction('buy').region('US').fiat('iso:USD').supported).toBe(false) + + // any rule -> true + expect(store.is.direction('buy').region('UK').fiat('iso:GBP').supported).toBe(true) + expect(store.is.direction('buy').region('UK:JQ').fiat('iso:GBP').supported).toBe(true) + expect(store.is.direction('buy').region('CA').fiat('iso:CAD').supported).toBe(true) + expect(store.is.direction('buy').region('CA:QC').fiat('iso:CAD').supported).toBe(true) + // any rule -> false + expect(store.is.direction('buy').region('UK').fiat('iso:USD').supported).toBe(false) + expect(store.is.direction('buy').region('UK:JQ').fiat('iso:USD').supported).toBe(false) + expect(store.is.direction('buy').region('CA:QC').fiat('iso:USD').supported).toBe(false) + expect(store.is.direction('buy').region('CA').fiat('iso:USD').supported).toBe(false) + + // match-all queries: + expect(store.is.direction('buy').region('*').fiat('iso:CAD').supported).toBe(true) + expect(store.is.direction('buy').region('*').fiat('iso:CAD').supported).toBe(true) + expect(store.is.direction('buy').region('*').fiat('iso:CAD').supported).toBe(true) + expect(store.is.direction('buy').region('UK').fiat('*').supported).toBe(true) + expect(store.is.direction('*').region('UK').fiat('iso:GBP').supported).toBe(true) + expect(store.is.direction('*').region('UK').fiat('iso:USD').supported).toBe(false) + }) + + it('queries across branches', () => { + const store = makeBityStoreFixture() + + expect(store.toJsonObject()).toEqual({ + '*': { + AT: true, + BE: true, + BG: true, + CH: true, + CZ: true, + DK: true, + EE: true, + FI: true, + FR: true, + DE: true, + GR: true, + HU: true, + IE: true, + IT: true, + LV: true, + LT: true, + LU: true, + NL: true, + PL: true, + PT: true, + RO: true, + SK: true, + SI: true, + ES: true, + SE: true, + HR: true, + LI: true, + NO: true, + SM: true, + GB: true, + '*': { + '*': { + sepa: { + 'bitcoin:null': true, + 'ethereum:null': true, + 'ethereum:a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48': true, + 'ethereum:dac17f958d2ee523a2206206994597c13d831ec7': true + } + } + } + }, + sell: { + '*': { + 'iso:CHF': { + sepa: true + }, + 'iso:EUR': { + sepa: true + } + } + } + }) + + expect(store.is.direction('*').region('IT').fiat('iso:CHF').supported).toBe(true) + expect(store.is.direction('*').region('FR').fiat('iso:CHF').supported).toBe(true) + expect(store.is.direction('*').region('FR').fiat('iso:EUR').supported).toBe(true) + expect(store.is.direction('*').region('FR').fiat('iso:EUR').payment('sepa').supported).toBe(true) + expect(store.is.direction('*').region('FR').fiat('iso:EUR').payment('sepa').crypto('ethereum:null').supported).toBe(true) + + expect(store.is.direction('*').region('US').fiat('iso:EUR').payment('sepa').crypto('ethereum:null').supported).toBe(false) + expect(store.is.direction('*').region('US').fiat('iso:EUR').payment('sepa').supported).toBe(false) + expect(store.is.direction('*').region('US').fiat('iso:EUR').supported).toBe(false) + expect(store.is.direction('*').region('US').supported).toBe(false) + expect(store.is.direction('buy').region('FR').fiat('iso:EUR').payment('sepa').crypto('ethereum:null').supported).toBe(false) + expect(store.is.direction('buy').region('FR').fiat('iso:EUR').payment('sepa').supported).toBe(false) + expect(store.is.direction('buy').region('FR').fiat('iso:EUR').supported).toBe(false) + expect(store.is.direction('buy').region('FR').supported).toBe(false) + expect(store.is.direction('buy').supported).toBe(false) + expect(store.is.direction('*').region('*').fiat('iso:USD').payment('sepa').crypto('ethereum:null').supported).toBe(false) + expect(store.is.direction('*').region('*').fiat('iso:USD').payment('sepa').supported).toBe(false) + expect(store.is.direction('*').region('*').fiat('iso:USD').supported).toBe(false) + expect(store.is.direction('*').region('*').supported).toBe(true) + expect(store.is.direction('*').supported).toBe(true) + }) + + describe('getFiatProviderAssetMap', () => { + type Tester = (params: FiatProviderAssetMapQuery) => { crypto: string[]; fiat: string[] } + + function makeTestCase(fixture: ProviderSupportObject): Tester { + // Setup fixtures: + const store = new ProviderSupportStore('test') + store.fromJsonObject(fixture) + + // Make tester function: + const tester: Tester = params => { + const result = store.getFiatProviderAssetMap(params) + const crypto: string[] = Object.keys(result.crypto).flatMap(pluginId => { + return result.crypto[pluginId].map(token => `${pluginId}:${token.tokenId}`) + }) + const fiat: string[] = Object.keys(result.fiat) + return { crypto, fiat } + } + + // Return tester function: + return tester + } + + const test = makeTestCase({ + // direction + sell: { + // region + IT: true, + '*': { + // fiat + 'iso:EUR': true, + 'iso:CHF': true, + '*': { + // payment + sepa: { + // crypto + 'ethereum:null': true, + 'ethereum:a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48': true, + 'ethereum:dac17f958d2ee523a2206206994597c13d831ec7': true, + 'bitcoin:null': true + } + } + } + }, + // Negative test data (this data shouldn't appear in test results): + buy: { + IT: true, + US: { + 'iso:USD': { + sepa: { + 'ethereum:null': true, + 'ethereum:USDC': true, + 'bitcoin:null': true + } + } + }, + '*': { + 'iso:USD': { + ach: { + 'ethereum:null': true, + 'ethereum:USDC': true, + 'bitcoin:null': true + } + } + } + } + }) + + it('will match query-all with match-all node', () => { + const store = new ProviderSupportStore('test') + store.fromJsonObject({ + buy: true, + sell: true, + '*': { + '*': { '*': { sepa: true } } + } + }) + + expect(store.is.direction('*').region('*').fiat('*').payment('sepa').supported).toBe(true) + }) + + it('will return crypto and fiat for a given query', () => { + expect(test({ direction: 'sell', region: 'IT', payment: 'sepa' })).toStrictEqual({ + crypto: ['ethereum:null', 'ethereum:a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', 'ethereum:dac17f958d2ee523a2206206994597c13d831ec7', 'bitcoin:null'], + fiat: ['iso:EUR', 'iso:CHF'] + }) + }) + + it('will return empty results for wrong direction', () => { + expect(test({ direction: 'buy', region: 'IT', payment: 'sepa' })).toStrictEqual({ + crypto: [], + fiat: [] + }) + }) + + it('will return empty results for wrong region', () => { + expect(test({ direction: 'sell', region: 'US', payment: 'sepa' })).toStrictEqual({ + crypto: [], + fiat: [] + }) + }) + + it('will return empty results for wrong payment', () => { + expect(test({ direction: 'sell', region: 'IT', payment: 'ach' })).toStrictEqual({ + crypto: [], + fiat: [] + }) + }) + }) + + describe('queryNodes', () => { + type InternalTree = Map + interface InternalTreeRecord { + [key: string]: InternalTreeRecord + } + + // Convert objects to maps for testing convenience + const toMap = (obj: InternalTreeRecord): InternalTree => { + const map = new Map() + for (const key in obj) { + map.set(key, toMap(obj[key])) + } + return map + } + const allToMap = (arr: InternalTreeRecord[]): InternalTree[] => arr.map(toMap) + + const foodTree: InternalTree = toMap({ + 'fruit:apple': { + horse: {} + }, + 'fruit:banana': { + ape: {} + }, + 'veggie:carrot': { + bunny: {}, + horse: {} + }, + '': { + blender: {} + }, + '*': { + human: {} + } + }) + + it('will return all nodes for match-all query', () => { + const result = queryNodes([foodTree], '*') + expect(result).toStrictEqual( + allToMap([ + // fruit:apple + { + horse: {} + }, + // fruit:banana + { + ape: {} + }, + // veggie:carrot + { + bunny: {}, + horse: {} + }, + // match-any + { + blender: {} + }, + // match-all + { + human: {} + } + ]) + ) + }) + + it('will return exact node', () => { + const result = queryNodes([foodTree], 'veggie:carrot') + expect(result).toStrictEqual( + allToMap([ + // veggie:carrot + { + bunny: {}, + horse: {} + }, + // match-any + { + blender: {} + }, + // match-all + { + human: {} + } + ]) + ) + }) + + it('will always return match-any node', () => { + const result = queryNodes([foodTree], 'frog') + expect(result).toStrictEqual( + allToMap([ + // match-any + { + blender: {} + } + ]) + ) + }) + + it('will return sub-group node', () => { + const result = queryNodes([foodTree], 'fruit:*') + expect(result).toStrictEqual( + allToMap([ + // fruit:apple + { + horse: {} + }, + // fruit:banana + { + ape: {} + }, + // match-any + { + blender: {} + }, + // match-all + { + human: {} + } + ]) + ) + }) + }) +}) + +function makeGeneralStoreFixture(): ProviderSupportStore { + const store = new ProviderSupportStore('test') + + const directions = ['buy'] as const + const regions = ['US', 'US:CA', 'UK'] as const + const fiats = ['iso:USD', 'iso:CAD', 'iso:GBP'] as const + const payments: PaymentKey[] = ['ach', 'sepa', 'credit'] + const cryptos: CryptoKey[] = ['ethereum:null', 'ethereum:USDC', 'bitcoin:null'] + directions.forEach(direction => { + store.add.direction(direction) + }) + regions.forEach(region => { + store.add.direction('*').region(region) + }) + fiats.forEach(fiat => { + store.add.direction('*').region('*').fiat(fiat) + }) + payments.forEach(payment => { + store.add.direction('*').region('*').fiat('*').payment(payment) + }) + cryptos.forEach(crypto => { + store.add.direction('*').region('*').fiat('*').payment('*').crypto(crypto) + }) + + return store +} + +function makeBityStoreFixture(): ProviderSupportStore { + const store = new ProviderSupportStore('bity') + + const regions = [ + 'AT', + 'BE', + 'BG', + 'CH', + 'CZ', + 'DK', + 'EE', + 'FI', + 'FR', + 'DE', + 'GR', + 'HU', + 'IE', + 'IT', + 'LV', + 'LT', + 'LU', + 'NL', + 'PL', + 'PT', + 'RO', + 'SK', + 'SI', + 'ES', + 'SE', + 'HR', + 'LI', + 'NO', + 'SM', + 'GB' + ] + + // Add regions + regions.forEach(region => store.add.direction('*').region(region)) + + // Add fiats and payment methods + store.add.direction('sell').region('*').fiat('iso:CHF').payment('sepa') + store.add.direction('sell').region('*').fiat('iso:EUR').payment('sepa') + + // Add crypto assets + store.add.direction('*').region('*').fiat('*').payment('sepa').crypto('bitcoin:null') + store.add.direction('*').region('*').fiat('*').payment('sepa').crypto('ethereum:null') + store.add.direction('*').region('*').fiat('*').payment('sepa').crypto('ethereum:a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48') + store.add.direction('*').region('*').fiat('*').payment('sepa').crypto('ethereum:dac17f958d2ee523a2206206994597c13d831ec7') + + return store +} diff --git a/src/actions/CategoriesActions.ts b/src/actions/CategoriesActions.ts index 3e0623f2b31..a6a8b4c92be 100644 --- a/src/actions/CategoriesActions.ts +++ b/src/actions/CategoriesActions.ts @@ -542,7 +542,7 @@ export const pluginIdIcons: Record = { simplex: EDGE_CONTENT_SERVER_URI + '/simplex.png', swapuz: EDGE_CONTENT_SERVER_URI + '/swapuz.png', thorchain: EDGE_CONTENT_SERVER_URI + '/thorchain.png', - thorchainda: EDGE_CONTENT_SERVER_URI + '/thorchain.png', + swapkit: EDGE_CONTENT_SERVER_URI + '/swapkit.png', tronResources: EDGE_CONTENT_SERVER_URI + '/TRON/TRON.png', velodrome: EDGE_CONTENT_SERVER_URI + '/velodrome.png', xrpdex: EDGE_CONTENT_SERVER_URI + '/xrpdex.png' diff --git a/src/actions/DeepLinkingActions.tsx b/src/actions/DeepLinkingActions.tsx index 075644a3497..82d713c41b1 100644 --- a/src/actions/DeepLinkingActions.tsx +++ b/src/actions/DeepLinkingActions.tsx @@ -9,6 +9,7 @@ import { Airship, showError, showToast, showToastSpinner } from '../components/s import { guiPlugins } from '../constants/plugins/GuiPlugins' import { lstrings } from '../locales/strings' import { executePlugin, fiatProviderDeeplinkHandler } from '../plugins/gui/fiatPlugin' +import { config } from '../theme/appConfig' import { DeepLink } from '../types/DeepLinkTypes' import { Dispatch, RootState, ThunkAction } from '../types/reduxTypes' import { NavigationBase } from '../types/routerTypes' @@ -148,7 +149,7 @@ async function handleLink(navigation: NavigationBase, dispatch: Dispatch, state: showCreateWallet: true }) if (result?.type !== 'wallet') break - const wallet = currencyWallets[result.walletId] + const wallet = account.currencyWallets[result.walletId] if (wallet == null) break if (checkAndShowLightBackupModal(account, navigation)) break @@ -179,19 +180,33 @@ async function handleLink(navigation: NavigationBase, dispatch: Dispatch, state: case 'price-change': { const { pluginId, body } = link const currencyCode = account.currencyConfig[pluginId].currencyInfo.currencyCode - - const result = await Airship.show<'buy' | 'sell' | 'exchange' | undefined>(bridge => ( - - )) + let result + if (config.disableSwaps === true) { + result = await Airship.show<'buy' | 'sell' | undefined>(bridge => ( + + )) + } else { + result = await Airship.show<'buy' | 'sell' | 'exchange' | undefined>(bridge => ( + + )) + } if (result === 'buy') { navigation.navigate('buyTab', { screen: 'pluginListBuy' }) @@ -250,7 +265,7 @@ async function handleLink(navigation: NavigationBase, dispatch: Dispatch, state: showCreateWallet: true }) if (result?.type !== 'wallet') break - const wallet = currencyWallets[result.walletId] + const wallet = account.currencyWallets[result.walletId] if (wallet == null) break // Re-parse the uri with the final chosen wallet diff --git a/src/actions/ScanActions.tsx b/src/actions/ScanActions.tsx index c435be6c7ca..d87a6b10920 100644 --- a/src/actions/ScanActions.tsx +++ b/src/actions/ScanActions.tsx @@ -7,7 +7,7 @@ import URL from 'url-parse' import { ButtonsModal } from '../components/modals/ButtonsModal' import { ConfirmContinueModal } from '../components/modals/ConfirmContinueModal' import { WalletListModal, WalletListResult } from '../components/modals/WalletListModal' -import { Airship, showError, showWarning } from '../components/services/AirshipInstance' +import { Airship, showDevError, showError, showWarning } from '../components/services/AirshipInstance' import { getSpecialCurrencyInfo } from '../constants/WalletAndCurrencyConstants' import { lstrings } from '../locales/strings' import { getExchangeRate } from '../selectors/WalletSelectors' @@ -351,19 +351,34 @@ export function checkAndShowGetCryptoModal(navigation: NavigationBase, wallet: E let threeButtonModal const { displayBuyCrypto } = getSpecialCurrencyInfo(wallet.currencyInfo.pluginId) if (displayBuyCrypto) { - const messageSyntax = sprintf(lstrings.buy_crypto_modal_message, currencyCode, currencyCode, currencyCode) - threeButtonModal = await Airship.show<'buy' | 'exchange' | 'decline' | undefined>(bridge => ( - - )) + if (config.disableSwaps === true) { + const messageSyntax = sprintf(lstrings.buy_crypto_modal_message_no_exchange_s, currencyCode, currencyCode) + threeButtonModal = await Airship.show<'buy' | 'decline' | undefined>(bridge => ( + + )) + } else { + const messageSyntax = sprintf(lstrings.buy_crypto_modal_message, currencyCode, currencyCode, currencyCode) + threeButtonModal = await Airship.show<'buy' | 'exchange' | 'decline' | undefined>(bridge => ( + + )) + } } else { // if we're not targetting for buying, but rather exchange const messageSyntax = sprintf(lstrings.exchange_crypto_modal_message, currencyCode, currencyCode, currencyCode) @@ -382,7 +397,11 @@ export function checkAndShowGetCryptoModal(navigation: NavigationBase, wallet: E if (threeButtonModal === 'buy') { navigation.navigate('buyTab', { screen: 'pluginListBuy' }) } else if (threeButtonModal === 'exchange') { - navigation.navigate('swapTab', { screen: 'swapCreate', params: { toWalletId: wallet.id, toTokenId: tokenId } }) + if (config.disableSwaps === true) { + showDevError('Swaps are disabled. Cannot navigate to exchange.') + } else { + navigation.navigate('swapTab', { screen: 'swapCreate', params: { toWalletId: wallet.id, toTokenId: tokenId } }) + } } } catch (e: any) { // Don't bother the user with this error, but log it quietly: diff --git a/src/app.ts b/src/app.ts index d602ad0ca3e..f1aa410ce93 100644 --- a/src/app.ts +++ b/src/app.ts @@ -6,6 +6,7 @@ */ // import './wdyr' import * as Sentry from '@sentry/react-native' +import { Buffer } from 'buffer' import { asObject, asString } from 'cleaners' import { LogBox, Text, TextInput } from 'react-native' import { getVersion } from 'react-native-device-info' @@ -277,3 +278,5 @@ if (ENV.DEBUG_THEME) { initDeviceSettings().catch(err => console.log(err)) initInfoServer().catch(err => console.log(err)) + +if (global.Buffer == null) global.Buffer = Buffer diff --git a/src/components/cards/EarnOptionCard.tsx b/src/components/cards/EarnOptionCard.tsx new file mode 100644 index 00000000000..91fb396affc --- /dev/null +++ b/src/components/cards/EarnOptionCard.tsx @@ -0,0 +1,100 @@ +import { EdgeCurrencyInfo } from 'edge-core-js' +import * as React from 'react' +import { View } from 'react-native' +import { sprintf } from 'sprintf-js' + +import { toPercentString } from '../../locales/intl' +import { lstrings } from '../../locales/strings' +import { StakePolicy } from '../../plugins/stake-plugins/types' +import { getPolicyIconUris } from '../../util/stakeUtils' +import { getUkCompliantString } from '../../util/ukComplianceUtils' +import { PairIcons } from '../icons/PairIcons' +import { cacheStyles, Theme, useTheme } from '../services/ThemeContext' +import { TitleText } from '../text/TitleText' +import { EdgeText } from '../themed/EdgeText' +import { EdgeCard } from './EdgeCard' + +interface Props { + currencyInfo: EdgeCurrencyInfo + stakePolicy: StakePolicy + + countryCode?: string + /** If false, show "Stake"/"Earn" + * If true, show "Staked"/"Earned" */ + isOpenPosition?: boolean + onPress?: () => void +} + +export function EarnOptionCard(props: Props) { + const theme = useTheme() + const styles = getStyles(theme) + + const { stakePolicy, currencyInfo, isOpenPosition, countryCode, onPress } = props + const { apy, yieldType, stakeProviderInfo } = stakePolicy + + const { stakeAssets, rewardAssets } = stakePolicy + const stakeCurrencyCodes = stakeAssets.map(asset => asset.displayName ?? asset.currencyCode).join(' + ') + const rewardCurrencyCodes = rewardAssets.map(asset => asset.displayName ?? asset.currencyCode).join(', ') + + const stakeText = sprintf(isOpenPosition ? lstrings.stake_staked_1s : lstrings.stake_stake_1s, stakeCurrencyCodes) + const rewardText = isOpenPosition + ? sprintf(lstrings.stake_earning_1s, rewardCurrencyCodes) + : getUkCompliantString(countryCode, 'stake_earn_1s', rewardCurrencyCodes) + + const policyIcons = getPolicyIconUris(currencyInfo, stakePolicy) + + let apyText: string = yieldType === 'variable' ? lstrings.stake_variable_apy : lstrings.stake_stable_apy + + // Fill in the actual numeric apy values, if they exist + if (apy != null && apy > 0) { + const variablePrefix = yieldType === 'stable' ? '' : '~ ' + apyText = variablePrefix + sprintf(lstrings.stake_apy_1s, toPercentString(apy / 100)) + } + + return ( + + + + {stakeText} + {rewardText} + {apyText} + {`${lstrings.plugin_powered_by_space}${stakeProviderInfo.displayName}`} + + + + + + ) +} + +const getStyles = cacheStyles((theme: Theme) => ({ + contentContainer: { + flexDirection: 'row', + alignItems: 'center' + }, + textContainer: { + flexGrow: 1, + flexShrink: 1, + justifyContent: 'center', + padding: theme.rem(0.5) + }, + rewardText: { + fontSize: theme.rem(0.8), + marginTop: theme.rem(1), + marginBottom: theme.rem(0.15) + }, + apyText: { + fontSize: theme.rem(0.8), + color: theme.positiveText, + marginVertical: theme.rem(0.15) + }, + providerIcon: { + width: theme.rem(1), + height: theme.rem(1), + marginRight: theme.rem(0.25) + }, + providerText: { + fontSize: theme.rem(0.75), + color: theme.secondaryText + } +})) diff --git a/src/components/cards/StakingReturnsCard.tsx b/src/components/cards/StakingReturnsCard.tsx index 556acea8d61..5c86b4d75ac 100644 --- a/src/components/cards/StakingReturnsCard.tsx +++ b/src/components/cards/StakingReturnsCard.tsx @@ -1,95 +1,130 @@ -import { EdgeCurrencyWallet } from 'edge-core-js' +import { toFixed } from 'biggystring' import * as React from 'react' -import { View } from 'react-native' +import { View, ViewStyle } from 'react-native' +import FastImage from 'react-native-fast-image' import { sprintf } from 'sprintf-js' -import { toPercentString } from '../../locales/intl' import { lstrings } from '../../locales/strings' -import { StakePolicy } from '../../plugins/stake-plugins/types' -import { getPolicyIconUris } from '../../util/stakeUtils' -import { getUkCompliantString } from '../../util/ukComplianceUtils' +import { StakeProviderInfo } from '../../plugins/stake-plugins/types' +import { getStakeProviderIcon } from '../../util/CdnUris' import { PairIcons } from '../icons/PairIcons' import { cacheStyles, Theme, useTheme } from '../services/ThemeContext' -import { TitleText } from '../text/TitleText' import { EdgeText } from '../themed/EdgeText' import { EdgeCard } from './EdgeCard' -interface Props { - stakePolicy: StakePolicy - wallet: EdgeCurrencyWallet - - countryCode?: string - /** If false, show "Stake"/"Earn" - * If true, show "Staked"/"Earned" */ - isOpenPosition?: boolean - onPress?: () => void +interface StakingReturnsCardParams { + fromCurrencyLogos: string[] + toCurrencyLogos: string[] + apy?: number + stakeProviderInfo?: StakeProviderInfo } -export function StakingReturnsCard(props: Props) { +export function StakingReturnsCard({ fromCurrencyLogos, toCurrencyLogos, apy, stakeProviderInfo }: StakingReturnsCardParams) { const theme = useTheme() const styles = getStyles(theme) - const { stakePolicy, wallet, isOpenPosition, countryCode, onPress } = props - const { apy, yieldType, stakeProviderInfo } = stakePolicy - - const { stakeAssets, rewardAssets } = stakePolicy - const stakeCurrencyCodes = stakeAssets.map(asset => asset.currencyCode).join(' + ') - const rewardCurrencyCodes = rewardAssets.map(asset => asset.currencyCode).join(', ') - - const stakeText = sprintf(isOpenPosition ? lstrings.stake_staked_1s : lstrings.stake_stake_1s, stakeCurrencyCodes) - const rewardText = isOpenPosition - ? sprintf(lstrings.stake_earning_1s, rewardCurrencyCodes) - : getUkCompliantString(countryCode, 'stake_earn_1s', rewardCurrencyCodes) + const renderArrow = () => { + return ( + + + + + + ) + } - const policyIcons = getPolicyIconUris(wallet.currencyInfo, stakePolicy) + const renderEstimatedReturn = () => { + if (apy == null || apy <= 0) return null + const estimatedReturnMsg = toFixed(apy.toString(), 1, 1) + '% APR' + return {sprintf(lstrings.stake_estimated_return, estimatedReturnMsg)} + } - const variablePrefix = yieldType === 'stable' ? '' : '~ ' - const apyText = apy == null || apy <= 0 ? lstrings.stake_variable_apy : variablePrefix + sprintf(lstrings.stake_apy_1s, toPercentString(apy / 100)) + const renderStakeProvider = () => { + if (stakeProviderInfo == null) return null + const { displayName, pluginId, stakeProviderId } = stakeProviderInfo + const swapProviderIcon = getStakeProviderIcon(pluginId, stakeProviderId, theme) + return ( + + {swapProviderIcon ? : null} + {displayName} + + ) + } return ( - - - - {stakeText} - {rewardText} - {apyText} - {`${lstrings.plugin_powered_by_space}${stakeProviderInfo.displayName}`} - - - + + + + {renderArrow()} + + + + {renderEstimatedReturn()} + {renderStakeProvider()} ) } -const getStyles = cacheStyles((theme: Theme) => ({ - contentContainer: { - flexDirection: 'row', - alignItems: 'center' - }, - textContainer: { - flexGrow: 1, - flexShrink: 1, - justifyContent: 'center', - padding: theme.rem(0.5) - }, - rewardText: { - fontSize: theme.rem(0.8), - marginTop: theme.rem(1), - marginBottom: theme.rem(0.15) - }, - apyText: { - fontSize: theme.rem(0.8), - color: theme.positiveText, - marginVertical: theme.rem(0.15) - }, - providerIcon: { - width: theme.rem(1), - height: theme.rem(1), - marginRight: theme.rem(0.25) - }, - providerText: { - fontSize: theme.rem(0.75), - color: theme.secondaryText +const getStyles = cacheStyles((theme: Theme) => { + const commonArrow: ViewStyle = { + position: 'absolute', + width: theme.thinLineWidth * 2, + height: theme.rem(0.625), + right: 0 + theme.thinLineWidth * 1.5, + borderRadius: theme.thinLineWidth, + backgroundColor: theme.icon + } + return { + container: { + flexDirection: 'row', + minWidth: theme.rem(10), + marginTop: theme.rem(1.5) + }, + iconsContainer: { + flexDirection: 'row', + marginVertical: theme.rem(0.5), + alignItems: 'center', + justifyContent: 'center' + }, + textContainer: { + alignItems: 'center', + margin: theme.rem(0.5), + borderColor: theme.lineDivider, + minWidth: theme.rem(15) + }, + swapProvider: { + marginTop: theme.rem(0.25), + flexDirection: 'row', + alignItems: 'center' + }, + swapProviderIcon: { + width: theme.rem(0.625), + height: theme.rem(0.625), + marginRight: theme.rem(0.5) + }, + swapProviderText: { + fontSize: theme.rem(0.75), + color: theme.secondaryText + }, + arrowContainer: { + flexDirection: 'row' + }, + arrowBase: { + width: theme.rem(3), + height: theme.thinLineWidth * 2, + borderRadius: theme.thinLineWidth, + backgroundColor: theme.icon + }, + arrowTopLine: { + ...commonArrow, + bottom: 0 - theme.thinLineWidth * 1.325, + transform: [{ rotateZ: '-45deg' }] + }, + arrowBottomLine: { + ...commonArrow, + top: 0 - theme.thinLineWidth * 1.325, + transform: [{ rotateZ: '45deg' }] + } } -})) +}) diff --git a/src/components/common/BlurBackground.tsx b/src/components/common/BlurBackground.tsx index 14372123c93..7f9c758f547 100644 --- a/src/components/common/BlurBackground.tsx +++ b/src/components/common/BlurBackground.tsx @@ -6,22 +6,37 @@ import { cacheStyles, Theme, useTheme } from '../services/ThemeContext' const isAndroid = Platform.OS === 'android' +/** A blur background WITH rounded corners, used for most components */ export const BlurBackground = () => { const theme = useTheme() const styles = getStyles(theme) + return +} + +/** A blur background WITHOUT rounded corners. For the scene header/footer */ +export const BlurBackgroundNoRoundedCorners = () => { + const theme = useTheme() + const styles = getStyles(theme) + return } const getStyles = cacheStyles((theme: Theme) => ({ blurView: { ...StyleSheet.absoluteFillObject, - // iOS needs this to properly round the container, while Android doesn't: - borderRadius: theme.cardBorderRadius, // We need this backgroundColor because Android applies an overlay to the // entire screen for the BlurView by default. We change this default // behavior with the transparent overlayColor, so we add this background // color to compensate and to match iOS colors/shades. backgroundColor: isAndroid ? (theme.isDark ? '#161616aa' : '#ffffff55') : undefined + }, + roundCorner: { + // Weird quirk: iOS needs rounding at this component level to properly round + // corners, even if the parent has round corners. Parents can't hide + // overflows for this component. + // Android behaves as expected when a parent with rounded corners holds + // `BlurBackground,` properly hiding overflows. + borderRadius: theme.cardBorderRadius } })) diff --git a/src/components/modals/AddressModal.tsx b/src/components/modals/AddressModal.tsx index a9c8e76e955..9165f0d3ecc 100644 --- a/src/components/modals/AddressModal.tsx +++ b/src/components/modals/AddressModal.tsx @@ -1,3 +1,4 @@ +import Resolver from '@unstoppabledomains/resolution' import { EdgeAccount, EdgeCurrencyConfig, EdgeCurrencyWallet } from 'edge-core-js' import * as React from 'react' import { ActivityIndicator, FlatList, Image, Text, View } from 'react-native' @@ -7,7 +8,8 @@ import { sprintf } from 'sprintf-js' import { refreshAllFioAddresses } from '../../actions/FioAddressActions' import ENS_LOGO from '../../assets/images/ens_logo.png' import FIO_LOGO from '../../assets/images/fio/fio_logo.png' -import { ENS_DOMAINS, UNSTOPPABLE_DOMAINS } from '../../constants/WalletAndCurrencyConstants' +import { ENS_DOMAINS, SPECIAL_CURRENCY_INFO, UNSTOPPABLE_DOMAINS } from '../../constants/WalletAndCurrencyConstants' +import { ENV } from '../../env' import { lstrings } from '../../locales/strings' import { useDispatch, useSelector } from '../../types/reactRedux' import { Dispatch } from '../../types/reduxTypes' @@ -144,23 +146,27 @@ export class AddressModalComponent extends React.Component { checkIfEnsDomain = (name: string): boolean => ENS_DOMAINS.some(domain => name.endsWith(domain)) - fetchUnstoppableDomainAddress = async (domain: string, currencyTicker: string): Promise => { + fetchUnstoppableDomainAddress = async (resolver: Resolver, domain: string, currencyTicker: string): Promise => { domain = domain.trim().toLowerCase() if (!this.checkIfUnstoppableDomain(domain)) { throw new ResolutionError('UnsupportedDomain', { domain }) } - const baseurl = `https://unstoppabledomains.com/api/v1` - const url = `${baseurl}/${domain}` - const response = await global.fetch(url).then(async res => await res.json()) - const { addresses, meta } = response - if (!meta || !meta.owner) { - throw new ResolutionError('UnregisteredDomain', { domain }) + + if (currencyTicker == null) { + throw new ResolutionError('UnsupportedCurrency', { currencyTicker: this.props.coreWallet.currencyInfo.displayName, domain }) } - const ticker = currencyTicker.toUpperCase() - if (!addresses || !addresses[ticker]) { - throw new ResolutionError('UnspecifiedCurrency', { domain, currencyTicker }) + + const isValid = await resolver.isSupportedDomain(domain) + if (!isValid) { + throw new ResolutionError('UnsupportedDomain', { domain }) + } + + const address = await resolver.addr(domain, currencyTicker) + if (address == null) { + throw new ResolutionError('RecordNotFound', { domain }) } - return addresses[ticker] + + return address } fetchEnsAddress = async (domain: string): Promise => { @@ -177,8 +183,13 @@ export class AddressModalComponent extends React.Component { try { this.setState({ errorLabel: undefined, validLabel: lstrings.resolving }) let addr: string - if (this.checkIfUnstoppableDomain(domain)) addr = await this.fetchUnstoppableDomainAddress(domain, currencyTicker) - else if (this.checkIfEnsDomain(domain)) addr = await this.fetchEnsAddress(domain) + if (this.checkIfUnstoppableDomain(domain) && ENV.UNSTOPPABLE_DOMAINS_API_KEY != null) { + addr = await this.fetchUnstoppableDomainAddress( + new Resolver({ apiKey: ENV.UNSTOPPABLE_DOMAINS_API_KEY }), + domain, + unstoppableDomainsPluginIds[this.props.coreWallet.currencyInfo.pluginId] + ) + } else if (this.checkIfEnsDomain(domain)) addr = await this.fetchEnsAddress(domain) else { throw new ResolutionError('UnsupportedDomain', { domain }) } @@ -392,3 +403,10 @@ export function AddressModal(props: OwnProps): JSX.Element { /> ) } + +const unstoppableDomainsPluginIds = Object.entries(SPECIAL_CURRENCY_INFO).reduce((map: Record, [pluginId, info]) => { + if (info.unstoppableDomainsTicker != null) { + map[pluginId] = info.unstoppableDomainsTicker + } + return map +}, {}) diff --git a/src/components/modals/EdgeModal.tsx b/src/components/modals/EdgeModal.tsx index 272d133e1d7..58b62f2ab42 100644 --- a/src/components/modals/EdgeModal.tsx +++ b/src/components/modals/EdgeModal.tsx @@ -1,13 +1,16 @@ import * as React from 'react' -import { BackHandler, Dimensions, View } from 'react-native' +import { BackHandler, Dimensions, Platform, View } from 'react-native' import { AirshipBridge } from 'react-native-airship' +import DeviceInfo from 'react-native-device-info' import { Gesture, GestureDetector, ScrollView } from 'react-native-gesture-handler' import { cacheStyles } from 'react-native-patina' import Animated, { runOnJS, useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated' +import AntDesignIcon from 'react-native-vector-icons/AntDesign' import { SCROLL_INDICATOR_INSET_FIX } from '../../constants/constantSettings' import { useHandler } from '../../hooks/useHandler' import { BlurBackground } from '../common/BlurBackground' +import { EdgeTouchableOpacity } from '../common/EdgeTouchableOpacity' import { EdgeTouchableWithoutFeedback } from '../common/EdgeTouchableWithoutFeedback' import { Theme, useTheme } from '../services/ThemeContext' import { EdgeText } from '../themed/EdgeText' @@ -46,6 +49,8 @@ export function EdgeModal(props: EdgeModalProps): JSX.Element { const theme = useTheme() const styles = getStyles(theme) + const isDesktop = Platform.OS === 'windows' || Platform.OS === 'macos' || Platform.OS === 'web' || DeviceInfo.getDeviceType() === 'Desktop' + const isShowCloseButton = isDesktop && onCancel != null const halfRem = theme.rem(0.5) const closeThreshold = theme.rem(6) const dragSlop = theme.rem(1) @@ -112,6 +117,7 @@ export function EdgeModal(props: EdgeModalProps): JSX.Element { const bottomGap = safeAreaGap + dragSlop const isHeaderless = title == null && onCancel == null + const isCustomTitle = title != null && typeof title !== 'string' const modalLayout = { borderColor: warning ? theme.warningText : theme.modalBorderColor, @@ -143,6 +149,11 @@ export function EdgeModal(props: EdgeModalProps): JSX.Element { ) : ( title ?? undefined )} + {!isShowCloseButton ? null : ( + + + + )} )} diff --git a/src/components/modals/InsufficientFeesModal.tsx b/src/components/modals/InsufficientFeesModal.tsx index abea64b8aec..9423fe6fffd 100644 --- a/src/components/modals/InsufficientFeesModal.tsx +++ b/src/components/modals/InsufficientFeesModal.tsx @@ -6,6 +6,7 @@ import { sprintf } from 'sprintf-js' import { useDisplayDenom } from '../../hooks/useDisplayDenom' import { useHandler } from '../../hooks/useHandler' import { lstrings } from '../../locales/strings' +import { config } from '../../theme/appConfig' import { NavigationBase } from '../../types/routerTypes' import { getCurrencyCode } from '../../util/CurrencyInfoHelpers' import { getUkCompliantString } from '../../util/ukComplianceUtils' @@ -52,17 +53,28 @@ export function InsufficientFeesModal(props: Props) { // Give extra information about the network name like Base or Arbitrum where // the mainnet token is ETH but the network is not Ethereum. - const message = - currencyCode === 'ETH' && wallet.currencyInfo.pluginId !== 'ethereum' - ? sprintf(lstrings.buy_parent_crypto_modal_message_3s, amountString, denomName, wallet.currencyInfo.displayName) - : sprintf(lstrings.buy_parent_crypto_modal_message_2s, amountString, denomName) + let message: string + let secondary + if (config.disableSwaps === true) { + secondary = undefined + message = + currencyCode === 'ETH' && wallet.currencyInfo.pluginId !== 'ethereum' + ? sprintf(lstrings.buy_parent_crypto_modal_message_no_exchange_3s, amountString, denomName, wallet.currencyInfo.displayName) + : sprintf(lstrings.buy_parent_crypto_modal_message_no_exchange_2s, amountString, denomName) + } else { + secondary = { label: lstrings.buy_crypto_modal_exchange, onPress: handleSwap } + message = + currencyCode === 'ETH' && wallet.currencyInfo.pluginId !== 'ethereum' + ? sprintf(lstrings.buy_parent_crypto_modal_message_3s, amountString, denomName, wallet.currencyInfo.displayName) + : sprintf(lstrings.buy_parent_crypto_modal_message_2s, amountString, denomName) + } return ( {message} diff --git a/src/components/modals/LogsModal.tsx b/src/components/modals/LogsModal.tsx index a3253d40294..bd9f74f4d55 100644 --- a/src/components/modals/LogsModal.tsx +++ b/src/components/modals/LogsModal.tsx @@ -6,6 +6,7 @@ import Share, { ShareOptions } from 'react-native-share' import { MultiLogOutput, sendLogs } from '../../actions/LogActions' import { lstrings } from '../../locales/strings' +import { AlertCardUi4 } from '../cards/AlertCard' import { WarningCard } from '../cards/WarningCard' import { showToast } from '../services/AirshipInstance' import { Paragraph } from '../themed/EdgeText' @@ -73,7 +74,8 @@ export const LogsModal = (props: Props) => { return ( {!isDangerous ? null : } - {isDangerous ? null : {lstrings.settings_modal_export_logs_message}} + {isDangerous ? null : {lstrings.settings_modal_export_logs_directions}} + }) => { })) return ( - + + + {sprintf(lstrings.survey_discover_title_1s, config.appName)} + + + {lstrings.survey_discover_subtitle} + + + } + > {/** HACK: iOS and Android use extraScrollHeight differently... */} }) => { keyboardShouldPersistTaps="handled" style={styles.containerStyle} > - - {sprintf(lstrings.survey_discover_title_1s, config.appName)} - - - {lstrings.survey_discover_subtitle} - {options.map((option, index) => ( @@ -140,6 +147,9 @@ export const SurveyModal = (props: { bridge: AirshipBridge }) => { } const getStyles = cacheStyles((theme: Theme) => ({ + titleContainer: { + flexDirection: 'column' + }, radioContainer: { alignItems: 'flex-start' }, diff --git a/src/components/navigation/AlertDropdown.tsx b/src/components/navigation/AlertDropdown.tsx index a5ea77e89a6..ed0a01dd4e2 100644 --- a/src/components/navigation/AlertDropdown.tsx +++ b/src/components/navigation/AlertDropdown.tsx @@ -42,13 +42,15 @@ export function AlertDropdown(props: Props) { }) return ( - + - - - {warning ? lstrings.alert_dropdown_warning : lstrings.alert_dropdown_alert} - {message} - + + + + {warning ? lstrings.alert_dropdown_warning : lstrings.alert_dropdown_alert} + {message} + + @@ -65,6 +67,11 @@ const getStyles = cacheStyles((theme: Theme) => ({ justifyContent: 'space-between', padding: theme.rem(0.5) }, + content: { + flexDirection: 'row', + alignItems: 'center', + flex: 1 + }, text: { ...textStyle(theme, 'row-center', 'small'), color: theme.dropdownText, diff --git a/src/components/navigation/HeaderBackground.tsx b/src/components/navigation/HeaderBackground.tsx index 449fab94be1..894efec9f13 100644 --- a/src/components/navigation/HeaderBackground.tsx +++ b/src/components/navigation/HeaderBackground.tsx @@ -4,7 +4,7 @@ import LinearGradient from 'react-native-linear-gradient' import Animated, { interpolate, SharedValue, useAnimatedStyle } from 'react-native-reanimated' import { useSceneScrollContext } from '../../state/SceneScrollState' -import { BlurBackground } from '../common/BlurBackground' +import { BlurBackgroundNoRoundedCorners } from '../common/BlurBackground' import { styled } from '../hoc/styled' import { useTheme } from '../services/ThemeContext' import { DividerLine } from '../themed/DividerLine' @@ -17,7 +17,7 @@ export const HeaderBackground = (props: any) => { return ( - + diff --git a/src/components/scenes/DefaultFiatSettingScene.tsx b/src/components/scenes/DefaultFiatSettingScene.tsx index d24f54c6f8d..93545ab49c9 100644 --- a/src/components/scenes/DefaultFiatSettingScene.tsx +++ b/src/components/scenes/DefaultFiatSettingScene.tsx @@ -76,7 +76,16 @@ export class DefaultFiatSettingComponent extends React.Component { render() { const filteredArray = this.props.supportedFiats.filter(entry => { - return entry.label.toLowerCase().includes(this.state.searchTerm.toLowerCase()) + const key = `currency_label_${entry.value}` + const subTitle = lstrings[key as keyof typeof lstrings] ?? '' + + const lowerCaseText = this.state.searchTerm.toLowerCase() + return ( + subTitle.toLowerCase().includes(lowerCaseText) || + FIAT_COUNTRY[entry.value]?.countryName.toLowerCase().includes(lowerCaseText) || + entry.label.toLowerCase().includes(lowerCaseText) || + entry.value.toLowerCase().includes(lowerCaseText) + ) }) return ( diff --git a/src/components/scenes/Fio/FioStakingOverviewScene.tsx b/src/components/scenes/Fio/FioStakingOverviewScene.tsx index d05f9868ef0..1863b65a168 100644 --- a/src/components/scenes/Fio/FioStakingOverviewScene.tsx +++ b/src/components/scenes/Fio/FioStakingOverviewScene.tsx @@ -140,7 +140,7 @@ export const FioStakingOverviewSceneComponent = (props: Props) => { diff --git a/src/components/scenes/Loans/LoanCreateScene.tsx b/src/components/scenes/Loans/LoanCreateScene.tsx index 9326ac1fd67..828f8d99cd7 100644 --- a/src/components/scenes/Loans/LoanCreateScene.tsx +++ b/src/components/scenes/Loans/LoanCreateScene.tsx @@ -29,7 +29,7 @@ import { EdgeAppSceneProps, NavigationBase } from '../../../types/routerTypes' import { getWalletPickerExcludeWalletIds } from '../../../util/borrowUtils' import { getBorrowPluginIconUri } from '../../../util/CdnUris' import { getCurrencyCode, getTokenId, getTokenIdForced } from '../../../util/CurrencyInfoHelpers' -import { enableToken } from '../../../util/CurrencyWalletHelpers' +import { enableTokenCurrencyCode } from '../../../util/CurrencyWalletHelpers' import { DECIMAL_PRECISION, removeIsoPrefix, truncateDecimals, zeroString } from '../../../util/utils' import { EdgeCard } from '../../cards/EdgeCard' import { FiatAmountInputCard } from '../../cards/FiatAmountInputCard' @@ -67,8 +67,8 @@ export const LoanCreateScene = (props: Props) => { // Force enable tokens required for loan useAsyncEffect( async () => { - await enableToken('WBTC', borrowEngineWallet) - await enableToken('USDC', borrowEngineWallet) + await enableTokenCurrencyCode('WBTC', borrowEngineWallet) + await enableTokenCurrencyCode('USDC', borrowEngineWallet) }, [], 'LoanCreateScene:1' diff --git a/src/components/scenes/Staking/EarnScene.tsx b/src/components/scenes/Staking/EarnScene.tsx index 83b6c121d43..757857ff055 100644 --- a/src/components/scenes/Staking/EarnScene.tsx +++ b/src/components/scenes/Staking/EarnScene.tsx @@ -1,4 +1,5 @@ -import { EdgeCurrencyWallet } from 'edge-core-js' +import { useIsFocused } from '@react-navigation/native' +import { EdgeCurrencyInfo, EdgeCurrencyWallet } from 'edge-core-js' import * as React from 'react' import { ActivityIndicator } from 'react-native' @@ -11,28 +12,63 @@ import { lstrings } from '../../../locales/strings' import { getStakePlugins } from '../../../plugins/stake-plugins/stakePlugins' import { StakePlugin, StakePolicy, StakePosition } from '../../../plugins/stake-plugins/types' import { useSelector } from '../../../types/reactRedux' -import { EdgeAppSceneProps } from '../../../types/routerTypes' -import { getPluginFromPolicy, getPositionAllocations } from '../../../util/stakeUtils' +import { EdgeAppSceneProps, NavigationBase } from '../../../types/routerTypes' +import { getPositionAllocations } from '../../../util/stakeUtils' import { zeroString } from '../../../util/utils' import { EdgeSwitch } from '../../buttons/EdgeSwitch' -import { StakingReturnsCard } from '../../cards/StakingReturnsCard' +import { EarnOptionCard } from '../../cards/EarnOptionCard' import { EdgeAnim, fadeInUp20 } from '../../common/EdgeAnim' import { SceneWrapper } from '../../common/SceneWrapper' import { SectionHeader } from '../../common/SectionHeader' -import { showDevError } from '../../services/AirshipInstance' +import { WalletListModal, WalletListResult } from '../../modals/WalletListModal' +import { Airship, showDevError } from '../../services/AirshipInstance' import { cacheStyles, Theme, useTheme } from '../../services/ThemeContext' interface Props extends EdgeAppSceneProps<'earnScene'> {} export interface EarnSceneParams {} -interface StakePolicyPosition { +let USERNAME: string | undefined +let DISCOVER_MAP: DiscoverStakeMap = {} +let PORTFOLIO_MAP: PortfolioStakeMap = {} + +interface DiscoverStakeInfo { + stakePlugin: StakePlugin stakePolicy: StakePolicy +} + +interface PortfolioStakeInfo extends DiscoverStakeInfo { + walletStakeInfos: WalletStakeInfo[] +} + +interface DiscoverStakeMap { + [stakePolicyId: string]: DiscoverStakeInfo +} + +interface PortfolioStakeMap { + [stakePolicyId: string]: PortfolioStakeInfo +} + +interface WalletStakeInfo { + wallet: EdgeCurrencyWallet stakePosition: StakePosition } -interface StakePolicyMap { - [walletId: string]: { stakePolicyPositions: StakePolicyPosition[]; stakePlugins: StakePlugin[] } +/** Hook to ensure the UI updates on map changes, while retaining cached data + * functionality */ +const useStakeMaps = () => { + const [, forceUpdate] = React.useReducer(x => x + 1, 0) + + const updateMaps = React.useCallback((updates: () => void) => { + updates() + forceUpdate() + }, []) + + return { + discoverMap: DISCOVER_MAP, + portfolioMap: PORTFOLIO_MAP, + updateMaps + } } export const EarnScene = (props: Props) => { @@ -40,103 +76,248 @@ export const EarnScene = (props: Props) => { const theme = useTheme() const styles = getStyles(theme) + const { discoverMap, portfolioMap, updateMaps } = useStakeMaps() + const account = useSelector(state => state.core.account) + if (USERNAME !== account.username) { + // Reset local variable if user changes + USERNAME = account.username + DISCOVER_MAP = {} + PORTFOLIO_MAP = {} + } + + const currencyConfigMap = useSelector(state => state.core.account.currencyConfig) const currencyWallets = useWatch(account, 'currencyWallets') const wallets = Object.values(currencyWallets) - const [stakePolicyMap, setStakePolicyMap] = React.useState() - const [positionWallets, setPositionWallets] = React.useState([]) const [isPortfolioSelected, setIsPortfolioSelected] = React.useState(false) - const [isLoading, setIsLoading] = React.useState(true) - - // Filter wallets based on isPortfolioSelected - const displayWallets = !stakePolicyMap ? [] : isPortfolioSelected ? positionWallets : wallets + const [isLoadingDiscover, setIsLoadingDiscover] = React.useState(true) + const [isLoadingPortfolio, setIsLoadingPortfolio] = React.useState(true) + const [isPrevFocused, setIsPrevFocused] = React.useState() const handleSelectEarn = useHandler(() => setIsPortfolioSelected(false)) const handleSelectPortfolio = useHandler(() => setIsPortfolioSelected(true)) + const isFocused = useIsFocused() + + useAsyncEffect( + async () => { + const pluginIds = Object.keys(currencyConfigMap) + + for (const pluginId of pluginIds) { + setIsLoadingDiscover(true) + + const isStakingSupported = SPECIAL_CURRENCY_INFO[pluginId]?.isStakingSupported === true && ENV.ENABLE_STAKING + if (!isStakingSupported) continue + + const stakePlugins = await getStakePlugins(pluginId) + + updateMaps(() => { + for (const stakePlugin of stakePlugins) { + for (const stakePolicy of stakePlugin.getPolicies({ pluginId }).filter(stakePolicy => !stakePolicy.deprecated)) { + DISCOVER_MAP[stakePolicy.stakePolicyId] = { + stakePlugin, + stakePolicy + } + } + } + }) + + console.debug('getStakePlugins', pluginId, 'complete') + setIsLoadingDiscover(false) + } + + setIsLoadingDiscover(false) + return () => {} + }, + [], + 'EarnScene Initialize Discover Items' + ) + + // Refresh stake positions when re-entering the scene or on initial load useAsyncEffect( async () => { - if (stakePolicyMap != null) return + if (!isLoadingDiscover || (isFocused && !isPrevFocused)) { + setIsLoadingPortfolio(true) - const positionWallets = [] - const policyMap: StakePolicyMap = {} + const controller = new AbortController() + const signal = controller.signal - for (const wallet of wallets) { - // Get all available stake policies - const { pluginId } = wallet.currencyInfo - if (SPECIAL_CURRENCY_INFO[pluginId]?.isStakingSupported === true && ENV.ENABLE_STAKING) { - // For each wallet - const stakePolicyPositions: StakePolicyPosition[] = [] + try { + const stakePolicyIds = Object.keys(discoverMap) + for (const stakePolicyId of stakePolicyIds) { + if (signal.aborted) break - try { - const stakePlugins = await getStakePlugins(pluginId) - for (const stakePlugin of stakePlugins) { - const stakePolicies = stakePlugin.getPolicies({ wallet, currencyCode: wallet.currencyInfo.currencyCode }) + const discoverInfo = discoverMap[stakePolicyId] + const { stakePlugin, stakePolicy } = discoverInfo - // Check if there's open positions - for (const stakePolicy of stakePolicies) { - const stakePosition = await stakePlugin.fetchStakePosition({ stakePolicyId: stakePolicy.stakePolicyId, wallet, account }) - stakePolicyPositions.push({ stakePolicy, stakePosition }) + // Find matching wallets based on the first stake asset's pluginId + const pluginId = stakePolicy.stakeAssets[0].pluginId + const matchingWallets = wallets.filter((wallet: EdgeCurrencyWallet) => wallet.currencyInfo.pluginId === pluginId) + const walletStakeInfoPromises = matchingWallets.map(async wallet => { + if (signal.aborted) return null + try { + const stakePosition = await stakePlugin.fetchStakePosition({ + stakePolicyId: stakePolicy.stakePolicyId, + wallet, + account + }) const allocations = getPositionAllocations(stakePosition) const { staked, earned, unstaked } = allocations - if ([...staked, ...earned, ...unstaked].some(positionAllocation => !zeroString(positionAllocation.nativeAmount))) { - positionWallets.push(wallet) + const isPositionOpen = [...staked, ...earned, ...unstaked].some(positionAllocation => !zeroString(positionAllocation.nativeAmount)) + + if (isPositionOpen) { + return { wallet, stakePosition } } + } catch (e) { + showDevError(e) } - } + return null + }) - policyMap[wallet.id] = { stakePolicyPositions, stakePlugins } - setStakePolicyMap({ ...policyMap }) - setPositionWallets(positionWallets) - } catch (e) { - showDevError(e) + if (!signal.aborted) { + const walletStakeInfos = (await Promise.all(walletStakeInfoPromises)).filter( + (info: WalletStakeInfo | null): info is WalletStakeInfo => info != null + ) + + updateMaps(() => { + PORTFOLIO_MAP[stakePolicyId] = { + ...discoverInfo, + walletStakeInfos + } + }) + } + } + } finally { + if (!signal.aborted) { + setIsLoadingPortfolio(false) + setIsPrevFocused(isFocused) } } + + return () => { + controller.abort() + } } - setIsLoading(false) }, - [], - 'EarnScene' + [isFocused, isLoadingDiscover, updateMaps], + 'EarnScene Refresh Portfolio Data' ) - const renderStakeItems = (wallet: EdgeCurrencyWallet) => { - if (stakePolicyMap == null) return null + const renderDiscoverItem = (discoverStakeInfo: DiscoverStakeInfo, currencyInfo: EdgeCurrencyInfo) => { + const { stakePlugin, stakePolicy } = discoverStakeInfo + + const handlePress = async () => { + let walletId: string | undefined + + const matchingWallets = wallets.filter((wallet: EdgeCurrencyWallet) => wallet.currencyInfo.pluginId === currencyInfo.pluginId) + if (matchingWallets.length === 1) { + // Only one compatible wallet, auto-select it + const wallet = matchingWallets[0] + walletId = wallet.id + } else { + // Select an existing wallet that matches this policy or create a new one + const allowedAssets = stakePolicy.stakeAssets.map(stakeAsset => ({ pluginId: stakeAsset.pluginId, tokenId: null })) + + const result = await Airship.show(bridge => ( + + )) + + if (result?.type === 'wallet') { + walletId = result.walletId + } + } + + // User backed out of the WalletListModal + if (walletId == null) return + + navigation.push('stakeOverview', { + walletId, + stakePlugin, + stakePolicy, + // 'stakeOverview' scene will fetch the position if one exists. + // No need to know if a position exists at this point. + stakePosition: undefined + }) + } + + return ( + + + + ) + } + + const renderPortfolioItem = (portfolioStakeInfo: PortfolioStakeInfo, currencyInfo: EdgeCurrencyInfo) => { + const { stakePlugin, stakePolicy, walletStakeInfos } = portfolioStakeInfo + if (walletStakeInfos.length === 0) return null + + const handlePress = async () => { + let walletId: string | undefined + let stakePosition + + const matchingWallets = wallets.filter((wallet: EdgeCurrencyWallet) => wallet.currencyInfo.pluginId === currencyInfo.pluginId) + if (matchingWallets.length === 1) { + // Only one wallet with an open position, auto-select it + const { wallet, stakePosition: existingStakePosition } = walletStakeInfos[0] + walletId = wallet.id + stakePosition = existingStakePosition + } else { + // Select from wallets that have an open position + const allowedWalletIds = walletStakeInfos.map(walletStakePosition => walletStakePosition.wallet.id) + + const result = await Airship.show(bridge => ( + + )) + + if (result?.type === 'wallet') { + walletId = result.walletId + stakePosition = walletStakeInfos.find(walletStakeInfo => walletStakeInfo.wallet.id === result.walletId)?.stakePosition + } + } + + // User backed out of the WalletListModal + if (walletId == null) return - const { stakePolicyPositions, stakePlugins } = stakePolicyMap[wallet.id] ?? { stakePolicyPositions: [], stakePlugins: [] } + navigation.push('stakeOverview', { + walletId, + stakePlugin, + stakePolicy, + stakePosition + }) + } return ( - <> - {stakePolicyPositions.map((stakePolicyPosition: { stakePolicy: StakePolicy; stakePosition: StakePosition }, index: number) => { - const { stakePolicy, stakePosition } = stakePolicyPosition - - if (stakePolicy == null) return null - const stakePlugin = getPluginFromPolicy(stakePlugins, stakePolicy) - - const handlePress = - stakePlugin == null ? undefined : () => navigation.push('stakeOverview', { stakePlugin, walletId: wallet.id, stakePolicy, stakePosition }) - - return ( - - - - ) - })} - + + + ) } return ( - // TODO: Address "VirtualizedLists should never be nested inside plain - // ScrollViews with the same orientation because it can break windowing and - // other functionality - use another VirtualizedList-backed container - // instead." somehow, while retaining the bottom loader positioning... - {displayWallets.map(wallet => renderStakeItems(wallet))} - {isLoading && } + {isPortfolioSelected && + Object.values(portfolioMap).map(info => renderPortfolioItem(info, currencyConfigMap[info.stakePolicy.stakeAssets[0].pluginId].currencyInfo))} + {!isPortfolioSelected && + Object.values(discoverMap).map(info => renderDiscoverItem(info, currencyConfigMap[info.stakePolicy.stakeAssets[0].pluginId].currencyInfo))} + {((isLoadingDiscover && !isPortfolioSelected) || (isLoadingPortfolio && isPortfolioSelected)) && ( + + )} ) } diff --git a/src/components/scenes/Staking/StakeModifyScene.tsx b/src/components/scenes/Staking/StakeModifyScene.tsx index cb138642fff..ac2d43f8d42 100644 --- a/src/components/scenes/Staking/StakeModifyScene.tsx +++ b/src/components/scenes/Staking/StakeModifyScene.tsx @@ -4,6 +4,7 @@ import * as React from 'react' import { Image, View } from 'react-native' import { sprintf } from 'sprintf-js' +import { useAsyncEffect } from '../../../hooks/useAsyncEffect' import { useDisplayDenom } from '../../../hooks/useDisplayDenom' import { lstrings } from '../../../locales/strings' import { @@ -23,7 +24,7 @@ import { EdgeAppSceneProps } from '../../../types/routerTypes' import { getCurrencyIconUris } from '../../../util/CdnUris' import { getTokenIdForced, getWalletTokenId } from '../../../util/CurrencyInfoHelpers' import { getWalletName } from '../../../util/CurrencyWalletHelpers' -import { getPolicyIconUris, getPositionAllocations } from '../../../util/stakeUtils' +import { enableStakeTokens, getPolicyIconUris, getPositionAllocations } from '../../../util/stakeUtils' import { toBigNumberString } from '../../../util/toBigNumberString' import { zeroString } from '../../../util/utils' import { EdgeCard } from '../../cards/EdgeCard' @@ -58,8 +59,6 @@ interface Props extends EdgeAppSceneProps<'stakeModify'> { wallet: EdgeCurrencyWallet } -// TODO: Check contentPadding - const StakeModifySceneComponent = (props: Props) => { const { navigation, route, wallet } = props const { modification, title, stakePlugin, stakePolicy, stakePosition } = route.params @@ -104,6 +103,15 @@ const StakeModifySceneComponent = (props: Props) => { // Error message tile contents const [errorMessage, setErrorMessage] = React.useState('') + // Ensure required tokens are enabled + useAsyncEffect( + async () => { + await enableStakeTokens(account, wallet, stakePolicy) + }, + [], + 'StakeModifyScene' + ) + React.useEffect(() => { // Initialize the claim row since the user would never modify the amount if (modification === 'claim' && changeQuoteRequest.nativeAmount === '0') { diff --git a/src/components/scenes/Staking/StakeOptionsScene.tsx b/src/components/scenes/Staking/StakeOptionsScene.tsx index f53b9fa2402..17572401a58 100644 --- a/src/components/scenes/Staking/StakeOptionsScene.tsx +++ b/src/components/scenes/Staking/StakeOptionsScene.tsx @@ -64,7 +64,7 @@ const StakeOptionsSceneComponent = (props: Props) => { const handleStakeOptionPress = (stakePolicy: StakePolicy) => { const { stakePolicyId } = stakePolicy - const stakePlugin = getPluginFromPolicy(stakePlugins, stakePolicy) + const stakePlugin = getPluginFromPolicy(stakePlugins, stakePolicy, { pluginId }) // Transition to next scene immediately const stakePosition = stakePositionMap[stakePolicyId] if (stakePlugin != null) navigation.push('stakeOverview', { stakePlugin, walletId: wallet.id, stakePolicy: stakePolicy, stakePosition }) diff --git a/src/components/scenes/Staking/StakeOverviewScene.tsx b/src/components/scenes/Staking/StakeOverviewScene.tsx index d405c31bf62..a19e358715a 100644 --- a/src/components/scenes/Staking/StakeOverviewScene.tsx +++ b/src/components/scenes/Staking/StakeOverviewScene.tsx @@ -11,10 +11,10 @@ import { lstrings } from '../../../locales/strings' import { ChangeQuoteRequest, PositionAllocation, StakePlugin, StakePolicy, StakePosition } from '../../../plugins/stake-plugins/types' import { selectDisplayDenomByCurrencyCode } from '../../../selectors/DenominationSelectors' import { useDispatch, useSelector } from '../../../types/reactRedux' -import { EdgeAppSceneProps } from '../../../types/routerTypes' +import { EdgeSceneProps } from '../../../types/routerTypes' import { getTokenIdForced } from '../../../util/CurrencyInfoHelpers' -import { getAllocationLocktimeMessage, getPolicyTitleName, getPositionAllocations } from '../../../util/stakeUtils' -import { StyledButtonContainer } from '../../buttons/ButtonsView' +import { enableStakeTokens, getAllocationLocktimeMessage, getPolicyIconUris, getPolicyTitleName, getPositionAllocations } from '../../../util/stakeUtils' +import { SceneButtons } from '../../buttons/SceneButtons' import { StakingReturnsCard } from '../../cards/StakingReturnsCard' import { SceneWrapper } from '../../common/SceneWrapper' import { withWallet } from '../../hoc/withWallet' @@ -22,11 +22,10 @@ import { FillLoader } from '../../progress-indicators/FillLoader' import { Shimmer } from '../../progress-indicators/Shimmer' import { showError } from '../../services/AirshipInstance' import { cacheStyles, Theme, useTheme } from '../../services/ThemeContext' -import { MainButton } from '../../themed/MainButton' -import { SceneHeader } from '../../themed/SceneHeader' +import { SceneHeaderUi4 } from '../../themed/SceneHeaderUi4' import { CryptoFiatAmountTile } from '../../tiles/CryptoFiatAmountTile' -interface Props extends EdgeAppSceneProps<'stakeOverview'> { +interface Props extends EdgeSceneProps<'stakeOverview'> { wallet: EdgeCurrencyWallet } @@ -55,13 +54,15 @@ const StakeOverviewSceneComponent = (props: Props) => { denomMap[asset.currencyCode] = dispatch((_, getState) => selectDisplayDenomByCurrencyCode(getState(), wallet.currencyConfig, asset.currencyCode)) return denomMap }, {}) + const policyIcons = getPolicyIconUris(wallet.currencyInfo, stakePolicy) // Hooks + + const [countryCode, setCountryCode] = React.useState() const [stakeAllocations, setStakeAllocations] = React.useState([]) const [rewardAllocations, setRewardAllocations] = React.useState([]) const [unstakedAllocations, setUnstakedAllocations] = React.useState([]) const [stakePosition, setStakePosition] = React.useState(startingStakePosition) - const [countryCode, setCountryCode] = React.useState() // Background loop to force fetchStakePosition updates const [updateCounter, setUpdateCounter] = React.useState(0) @@ -98,6 +99,15 @@ const StakeOverviewSceneComponent = (props: Props) => { 'StakeOverviewSceneComponent' ) + // Ensure required tokens are enabled + useAsyncEffect( + async () => { + await enableStakeTokens(account, wallet, stakePolicy) + }, + [], + 'StakeOverviewSceneComponent 1' + ) + // Handlers const handleModifyPress = (modification: ChangeQuoteRequest['action'] | 'unstakeAndClaim') => () => { const sceneTitleMap = { @@ -149,8 +159,13 @@ const StakeOverviewSceneComponent = (props: Props) => { return ( - - + + {stakePosition == null ? ( <> @@ -169,34 +184,42 @@ const StakeOverviewSceneComponent = (props: Props) => { } scrollIndicatorInsets={SCROLL_INDICATOR_INSET_FIX} /> - - - {stakePolicy.hideClaimAction ? null : ( - - )} - {stakePolicy.hideUnstakeAndClaimAction ? null : ( - - )} - {stakePolicy.hideUnstakeAction ? null : ( - - )} - + ) } const getStyles = cacheStyles((theme: Theme) => ({ - card: { - alignItems: 'center', - justifyContent: 'flex-start', - padding: theme.rem(0.5) - }, shimmer: { height: theme.rem(3), marginLeft: theme.rem(1), diff --git a/src/components/scenes/SwapCreateScene.tsx b/src/components/scenes/SwapCreateScene.tsx index ab8b9cb5c94..be0e4b6c16e 100644 --- a/src/components/scenes/SwapCreateScene.tsx +++ b/src/components/scenes/SwapCreateScene.tsx @@ -37,9 +37,8 @@ import { SwapVerticalIcon } from '../icons/ThemedIcons' import { WalletListModal, WalletListResult } from '../modals/WalletListModal' import { Airship, showToast, showWarning } from '../services/AirshipInstance' import { useTheme } from '../services/ThemeContext' -import { ExchangedFlipInputAmounts, ExchangedFlipInputRef } from '../themed/ExchangedFlipInput2' import { LineTextDivider } from '../themed/LineTextDivider' -import { SwapInput } from '../themed/SwapInput' +import { SwapInput, SwapInputCardAmounts, SwapInputCardInputRef } from '../themed/SwapInput' import { ButtonBox } from '../themed/ThemedButtons' export interface SwapCreateParams { @@ -72,8 +71,8 @@ export const SwapCreateScene = (props: Props) => { const [inputFiatAmount, setInputFiatAmount] = useState('0') const [inputNativeAmountFor, setInputNativeAmountFor] = useState<'from' | 'to'>('from') - const fromInputRef = React.useRef(null) - const toInputRef = React.useRef(null) + const fromInputRef = React.useRef(null) + const toInputRef = React.useRef(null) const swapRequestOptions = useSwapRequestOptions() @@ -283,6 +282,15 @@ export const SwapCreateScene = (props: Props) => { // Update the error state: ...getNewErrorInfo('asset') }) + + // Make sure to update the values if the wallet change is for the input + // field that has a native amount: + if (direction === 'from' && inputNativeAmountFor === 'from') { + fromInputRef.current?.triggerConvertValue() + } + if (direction === 'to' && inputNativeAmountFor === 'to') { + toInputRef.current?.triggerConvertValue() + } }) const handleMaxPress = useHandler(() => { @@ -341,7 +349,7 @@ export const SwapCreateScene = (props: Props) => { await showWalletListModal('to') }) - const handleFromAmountChange = useHandler((amounts: ExchangedFlipInputAmounts) => { + const handleFromAmountChange = useHandler((amounts: SwapInputCardAmounts) => { navigation.setParams({ ...route.params, // Update the error state: @@ -355,7 +363,7 @@ export const SwapCreateScene = (props: Props) => { toInputRef.current?.setAmount('crypto', '0') }) - const handleToAmountChange = useHandler((amounts: ExchangedFlipInputAmounts) => { + const handleToAmountChange = useHandler((amounts: SwapInputCardAmounts) => { navigation.setParams({ ...route.params, // Update the error state: diff --git a/src/components/scenes/TransactionDetailsScene.tsx b/src/components/scenes/TransactionDetailsScene.tsx index 83410a04f74..4092c5d8871 100644 --- a/src/components/scenes/TransactionDetailsScene.tsx +++ b/src/components/scenes/TransactionDetailsScene.tsx @@ -410,7 +410,15 @@ const TransactionDetailsComponent = (props: Props) => { - + { + const walletIds: string[] = [] + for (const wallet of Object.values(account.currencyWallets)) { + if (Object.keys(wallet.currencyConfig.builtinTokens).length > 0) { + walletIds.push(wallet.id) + } + } + return walletIds + }, [account]) + + const handlePressAddEditToken = useHandler(async () => { + const walletListResult = await Airship.show(bridge => ( + + )) + if (walletListResult?.type === 'wallet') { + const { walletId } = walletListResult + navigation.navigate('editToken', { + walletId + }) + } + }) + const handleFooterLayoutHeight = useHandler((height: number) => { setFooterHeight(height) }) @@ -98,8 +126,11 @@ export function WalletListScene(props: Props) { }, [handleSort, navigation, isSearching, sorting]) const renderListFooter = React.useMemo(() => { + if (isSearching && tokenSupportingWalletIds.length > 0) { + return + } return - }, [handlePressRestoreWallets]) + }, [handlePressAddEditToken, handlePressRestoreWallets, tokenSupportingWalletIds, isSearching]) const renderFooter: FooterRender = React.useCallback( sceneWrapperInfo => { diff --git a/src/components/services/Services.tsx b/src/components/services/Services.tsx index 6c731f4bbab..143edbc95a3 100644 --- a/src/components/services/Services.tsx +++ b/src/components/services/Services.tsx @@ -1,9 +1,9 @@ import { asDate, asJSON, asObject, uncleaner } from 'cleaners' import { EdgeAccount } from 'edge-core-js' import * as React from 'react' -import { EmitterSubscription } from 'react-native' -import { AirshipBridge } from 'react-native-airship' -import { powerSavingModeChanged, powerSavingOn } from 'react-native-power-saving-mode' +import { Platform } from 'react-native' +import { BatteryOptEnabled, RequestDisableOptimization } from 'react-native-battery-optimization-check' +import { usePowerState } from 'react-native-device-info' import { updateExchangeInfo } from '../../actions/ExchangeInfoActions' import { refreshConnectedWallets } from '../../actions/FioActions' @@ -25,7 +25,7 @@ import { FioCreateHandleModal } from '../modals/FioCreateHandleModal' import { AlertDropdown } from '../navigation/AlertDropdown' import { AccountCallbackManager } from './AccountCallbackManager' import { ActionQueueService } from './ActionQueueService' -import { Airship } from './AirshipInstance' +import { Airship, showDevError } from './AirshipInstance' import { AutoLogout } from './AutoLogout' import { ContactsLoader } from './ContactsLoader' import { EdgeContextCallbackManager } from './EdgeContextCallbackManager' @@ -61,6 +61,7 @@ let isFioModalShown = false export function Services(props: Props) { const dispatch = useDispatch() const account = useSelector(state => (state.core.account !== defaultAccount ? state.core.account : undefined)) + const powerState = usePowerState() const { navigation } = props // Show FIO handle modal for new accounts or existing accounts without a FIO wallet: @@ -128,49 +129,26 @@ export function Services(props: Props) { 'Services 2' ) - // Subscribe to Android Power Saver state, and show a warning only if it - // changes from off to on: useAsyncEffect( async () => { - // This method is only available for Android - if (powerSavingOn == null) return - - let airshipBridge: AirshipBridge | undefined - const handlePowerSavingModeChanged = async (isPowerSavingModeOn: boolean) => { - if (isPowerSavingModeOn && airshipBridge == null) { - await Airship.show(bridge => { - airshipBridge = bridge // Capture the bridge here - return - }).then(() => { - airshipBridge = undefined - }) - } else if (!isPowerSavingModeOn && airshipBridge != null) { - // Dismiss the alert when power-saving mode turns off and there's an - // active warning that wasn't dismissed - airshipBridge.resolve() - } + if (Platform.OS !== 'android' || !powerState.lowPowerMode) { + return } - // Show warning if Power Saver mode is on initially on app boot - await handlePowerSavingModeChanged(await powerSavingOn()) - - // Subscribe to Power Saver mode changes - let subscription: EmitterSubscription | undefined - if (powerSavingModeChanged != null) { - subscription = powerSavingModeChanged(handlePowerSavingModeChanged) + const batteryOptEnabled = await BatteryOptEnabled() + if (!batteryOptEnabled) { + return } - - // Cleanup - return () => { - if (subscription != null) { - subscription.remove() + console.warn('Battery saver mode enabled and battery optimization is disabled') + await Airship.show(bridge => { + const onPress = async () => { + await RequestDisableOptimization() + bridge.resolve() } - if (airshipBridge != null) { - airshipBridge.resolve() - } - } + return + }).catch(e => showDevError(e)) }, - [], + [powerState], 'Services 3' ) diff --git a/src/components/services/SortedWalletList.ts b/src/components/services/SortedWalletList.ts index e7107c64c44..924a4c5bf76 100644 --- a/src/components/services/SortedWalletList.ts +++ b/src/components/services/SortedWalletList.ts @@ -266,6 +266,13 @@ export function searchWalletList(list: WalletListItem[], searchText: string): Wa const { currencyCode, displayName } = token == null ? wallet.currencyInfo : token const name = getWalletName(wallet) - return normalizeForSearch(currencyCode).includes(target) || normalizeForSearch(displayName).includes(target) || normalizeForSearch(name).includes(target) + const contractAddress = token?.networkLocation?.contractAddress ?? '' + + return ( + normalizeForSearch(currencyCode).includes(target) || + normalizeForSearch(displayName).includes(target) || + normalizeForSearch(name).includes(target) || + normalizeForSearch(contractAddress).includes(target) + ) }) } diff --git a/src/components/themed/FlipInput2.tsx b/src/components/themed/FlipInput2.tsx index aa0947c9ac1..b36e0decab9 100644 --- a/src/components/themed/FlipInput2.tsx +++ b/src/components/themed/FlipInput2.tsx @@ -31,6 +31,7 @@ import { ButtonBox } from './ThemedButtons' export interface FlipInputRef { setAmounts: (value: string[]) => void + triggerConvertValue: () => void } export type FieldNum = 0 | 1 @@ -232,6 +233,9 @@ export const FlipInput2 = React.forwardRef((props: Props, r React.useImperativeHandle(ref, () => ({ setAmounts: amounts => { setAmounts([amounts[0], amounts[1]]) + }, + triggerConvertValue: () => { + onNumericInputChange(amounts[primaryField]) } })) diff --git a/src/components/themed/MenuTabs.tsx b/src/components/themed/MenuTabs.tsx index 3b72a5eb44c..cf55dbd29ea 100644 --- a/src/components/themed/MenuTabs.tsx +++ b/src/components/themed/MenuTabs.tsx @@ -20,7 +20,7 @@ import { lstrings } from '../../locales/strings' import { useSceneFooterRenderState, useSceneFooterState } from '../../state/SceneFooterState' import { config } from '../../theme/appConfig' import { scale } from '../../util/scaling' -import { BlurBackground } from '../common/BlurBackground' +import { BlurBackgroundNoRoundedCorners } from '../common/BlurBackground' import { styled } from '../hoc/styled' import { useTheme } from '../services/ThemeContext' import { VectorIcon } from './VectorIcon' @@ -89,7 +89,7 @@ export const MenuTabs = (props: BottomTabBarProps) => { return ( - + {renderFooter()} diff --git a/src/components/themed/SideMenu.tsx b/src/components/themed/SideMenu.tsx index d1d9d5d7169..232f0c26131 100644 --- a/src/components/themed/SideMenu.tsx +++ b/src/components/themed/SideMenu.tsx @@ -272,6 +272,14 @@ export function SideMenu(props: DrawerContentComponentProps) { } ] + if (ENV.FIO_INIT == null || ENV.FIO_INIT === false) { + // Remove FIO rows + let index = rowDatas.findIndex(row => row.title === lstrings.drawer_fio_names) + if (index >= 0) rowDatas.splice(index, 1) + index = rowDatas.findIndex(row => row.title === lstrings.drawer_fio_requests) + if (index >= 0) rowDatas.splice(index, 1) + } + if (ENV.ENABLE_VISA_PROGRAM && IONIA_SUPPORTED_FIATS.includes(defaultFiat)) { rowDatas.unshift({ pressHandler: () => { diff --git a/src/components/themed/SwapInput.tsx b/src/components/themed/SwapInput.tsx index 77b3a58f0cb..b6ce2ba75ff 100644 --- a/src/components/themed/SwapInput.tsx +++ b/src/components/themed/SwapInput.tsx @@ -18,6 +18,7 @@ export type ExchangeFlipInputFields = 'fiat' | 'crypto' export interface SwapInputCardInputRef { setAmount: (field: ExchangeFlipInputFields, value: string) => void + triggerConvertValue: () => void } export interface SwapInputCardAmounts { @@ -184,6 +185,9 @@ const SwapInputComponent = React.forwardRef((props const { displayAmount } = convertFromFiat(value) flipInputRef.current?.setAmounts([displayAmount, value]) } + }, + triggerConvertValue: () => { + flipInputRef.current?.triggerConvertValue() } })) diff --git a/src/components/themed/TransactionListTop.tsx b/src/components/themed/TransactionListTop.tsx index ef8ae6c391c..66a3000d0d0 100644 --- a/src/components/themed/TransactionListTop.tsx +++ b/src/components/themed/TransactionListTop.tsx @@ -153,7 +153,7 @@ export class TransactionListTopComponent extends React.PureComponent { let lockedNativeAmount = '0' const stakePositionMap: StakePositionMap = {} - for (const stakePolicy of stakePolicies) { - // Don't show liquid staking positions as locked amount - if (stakePolicy.isLiquidStaking === true) continue - - let total: string | undefined - const stakePlugin = getPluginFromPolicy(stakePlugins, stakePolicy) - if (stakePlugin == null) continue - try { - const stakePosition = await stakePlugin.fetchStakePosition({ - stakePolicyId: stakePolicy.stakePolicyId, - wallet: this.props.wallet, - account: this.props.account - }) + for (const stakePlugin of stakePlugins) { + for (const stakePolicy of stakePolicies) { + // Don't show liquid staking positions as locked amount + if (stakePolicy.isLiquidStaking === true) continue + + let total: string | undefined + try { + const stakePosition = await stakePlugin.fetchStakePosition({ + stakePolicyId: stakePolicy.stakePolicyId, + wallet: this.props.wallet, + account: this.props.account + }) - stakePositionMap[stakePolicy.stakePolicyId] = stakePosition - const { staked, earned } = getPositionAllocations(stakePosition) - total = this.getTotalPosition(this.props.currencyCode, [...staked, ...earned]) - } catch (err) { - console.error(err) - const { displayName } = stakePolicy.stakeProviderInfo - datelog(`${displayName}: ${lstrings.stake_unable_to_query_locked}`) - continue - } + stakePositionMap[stakePolicy.stakePolicyId] = stakePosition + const { staked, earned } = getPositionAllocations(stakePosition) + total = this.getTotalPosition(this.props.currencyCode, [...staked, ...earned]) + } catch (err) { + console.error(err) + const { displayName } = stakePolicy.stakeProviderInfo + datelog(`${displayName}: ${lstrings.stake_unable_to_query_locked}`) + continue + } - lockedNativeAmount = add(lockedNativeAmount, total) + lockedNativeAmount = add(lockedNativeAmount, total) + } } this.setState({ stakePositionMap }) this.setState({ lockedNativeAmount }) @@ -641,7 +641,7 @@ export class TransactionListTopComponent extends React.PureComponent state.core.account) const currencyWallets = useWatch(account, 'currencyWallets') const [walletOrder, setWalletOrder] = React.useState(account.activeWalletIds) - const handleDragEnd = useHandler((params: DragEndParams) => setWalletOrder(params.data)) - const keyExtractor = useHandler((walletId: string) => walletId) - const renderItem = useHandler((params: RenderItemParams) => ( - - - - )) - const handleScroll = useSceneScrollHandler() + const handleReorder = useHandler(({ from, to }: { from: number; to: number }) => { + // Reorder the walletOrder array + const newOrder = [...walletOrder] + newOrder.splice(to, 0, newOrder.splice(from, 1)[0]) + setWalletOrder(newOrder) - React.useEffect(() => () => { + // Update the wallet sort order in the account const keyStates: EdgeWalletStates = {} - for (let i = 0; i < walletOrder.length; ++i) { - const walletId = walletOrder[i] + for (let i = 0; i < newOrder.length; ++i) { + const walletId = newOrder[i] keyStates[walletId] = { sortIndex: i } } account.changeWalletStates(keyStates).catch(error => showError(error)) }) + const keyExtractor = React.useCallback( + (item: string) => item, + // eslint-disable-next-line react-hooks/exhaustive-deps + [walletOrder] + ) + + const renderItem = useHandler(item => { + return ( + + + + ) + }) + + const handleScroll = useSceneScrollWorkletHandler() + return ( - void } function WalletListSortableRowComponent(props: Props) { - const { wallet, onDrag } = props + const { wallet } = props + + const handleDrag = useReorderableDrag() const theme = useTheme() const styles = getStyles(theme) @@ -36,7 +38,7 @@ function WalletListSortableRowComponent(props: Props) { if (wallet == null || exchangeDenomination == null) { return ( - + @@ -62,26 +64,26 @@ function WalletListSortableRowComponent(props: Props) { const fiatBalanceString = showBalance ? formatNumber(fiatBalanceFormat, { toFixed: FIAT_PRECISION }) : '' return ( - - + + - - + + + + + + + {currencyCode} + {finalCryptoAmountString} - - - {currencyCode} - {finalCryptoAmountString} - - - {name} - {fiatBalanceSymbol + fiatBalanceString} - + + {name} + {fiatBalanceSymbol + fiatBalanceString} - + ) } @@ -89,6 +91,10 @@ const getStyles = cacheStyles((theme: Theme) => ({ container: { paddingHorizontal: theme.rem(1) }, + handleContainer: { + margin: -theme.rem(0.5), + padding: theme.rem(0.5) + }, rowContainer: { flexDirection: 'row', justifyContent: 'center', diff --git a/src/constants/WalletAndCurrencyConstants.ts b/src/constants/WalletAndCurrencyConstants.ts index d58587da2ab..71b26fac48e 100644 --- a/src/constants/WalletAndCurrencyConstants.ts +++ b/src/constants/WalletAndCurrencyConstants.ts @@ -160,6 +160,7 @@ interface SpecialCurrencyInfo { maxSpendTargets?: number walletConnectV2ChainId?: WalletConnectChainId chainIcon?: boolean + unstoppableDomainsTicker?: string // https://support.unstoppabledomains.com/support/solutions/articles/48001185621 } /* @@ -197,7 +198,8 @@ export const SPECIAL_CURRENCY_INFO: { displayBuyCrypto: true, displayIoniaRewards: true, isImportKeySupported: true, - isStakingSupported: true + isStakingSupported: true, + unstoppableDomainsTicker: 'BTC' }, bitcointestnet: { hasSegwit: true, @@ -214,21 +216,24 @@ export const SPECIAL_CURRENCY_INFO: { displayBuyCrypto: true, displayIoniaRewards: true, isImportKeySupported: true, - isStakingSupported: true + isStakingSupported: true, + unstoppableDomainsTicker: 'BCH' }, bitcoinsv: { maxSpendTargets: UTXO_MAX_SPEND_TARGETS, initWalletName: lstrings.string_first_bitcoin_sv_wallet_name, chainCode: 'BSV', keysOnlyMode: true, - isImportKeySupported: true + isImportKeySupported: true, + unstoppableDomainsTicker: 'BSV' }, digibyte: { maxSpendTargets: UTXO_MAX_SPEND_TARGETS, initWalletName: lstrings.string_first_digibyte_wallet_name, chainCode: 'DGB', displayBuyCrypto: true, - isImportKeySupported: true + isImportKeySupported: true, + unstoppableDomainsTicker: 'DGB' }, litecoin: { hasSegwit: true, @@ -238,7 +243,8 @@ export const SPECIAL_CURRENCY_INFO: { displayBuyCrypto: true, displayIoniaRewards: true, isImportKeySupported: true, - isStakingSupported: true + isStakingSupported: true, + unstoppableDomainsTicker: 'LTC' }, rsk: { initWalletName: lstrings.string_first_rsk_wallet_name, @@ -249,7 +255,8 @@ export const SPECIAL_CURRENCY_INFO: { walletConnectV2ChainId: { namespace: 'eip155', reference: '30' - } + }, + unstoppableDomainsTicker: 'RSK' }, stellar: { initWalletName: lstrings.string_first_stellar_wallet_name, @@ -261,7 +268,8 @@ export const SPECIAL_CURRENCY_INFO: { alertMessage: lstrings.request_xlm_minimum_notification_alert_body }, displayBuyCrypto: false, - isImportKeySupported: true + isImportKeySupported: true, + unstoppableDomainsTicker: 'XLM' }, ripple: { initWalletName: lstrings.string_first_ripple_wallet_name, @@ -275,13 +283,15 @@ export const SPECIAL_CURRENCY_INFO: { }, displayBuyCrypto: false, tokenActivationAdditionalReserveText: lstrings.activate_wallet_token_scene_body_xrp_extra, - isImportKeySupported: true + isImportKeySupported: true, + unstoppableDomainsTicker: 'XRP' }, monero: { initWalletName: lstrings.string_first_monero_wallet_name, chainCode: 'XMR', dummyPublicAddress: '46qxvuS78CNBoiiKmDjvjd5pMAZrTBbDNNHDoP52jKj9j5mk6m4R5nU6BDrWQURiWV9a2n5Sy8Qo4aJskKa92FX1GpZFiYA', - isImportKeySupported: false + isImportKeySupported: false, + unstoppableDomainsTicker: 'XMR' }, cardano: { initWalletName: lstrings.string_first_cardano_wallet_name, @@ -290,7 +300,8 @@ export const SPECIAL_CURRENCY_INFO: { noMaxSpend: true, dummyPublicAddress: 'addr1qyh498v7479sljadw8mdlmshnlt3n30ewzpqnmvrsz2v8rpqt56tgy6jhzgcc7v8mlh7lhw9a9j2hdlmek4arx2238us9e5fq0', isImportKeySupported: true, - isStakingSupported: true + isStakingSupported: true, + unstoppableDomainsTicker: 'ADA' }, cardanotestnet: { initWalletName: lstrings.string_first_cardano_preprod_wallet_name, @@ -308,7 +319,8 @@ export const SPECIAL_CURRENCY_INFO: { isImportKeySupported: true, keysOnlyMode: true, needsAccountNameSetup: true, - noChangeMiningFee: true + noChangeMiningFee: true, + unstoppableDomainsTicker: 'EOS' }, telos: { initWalletName: lstrings.string_first_telos_wallet_name, @@ -318,7 +330,8 @@ export const SPECIAL_CURRENCY_INFO: { dummyPublicAddress: 'edgecreator2', needsAccountNameSetup: true, noChangeMiningFee: true, - isImportKeySupported: true + isImportKeySupported: true, + unstoppableDomainsTicker: 'TLOS' }, wax: { initWalletName: lstrings.string_first_wax_wallet_name, @@ -328,7 +341,8 @@ export const SPECIAL_CURRENCY_INFO: { needsAccountNameSetup: false, noChangeMiningFee: true, isImportKeySupported: true, - keysOnlyMode: true + keysOnlyMode: true, + unstoppableDomainsTicker: 'WAXP' }, ethereum: { initWalletName: lstrings.string_first_ethereum_wallet_name, @@ -341,7 +355,8 @@ export const SPECIAL_CURRENCY_INFO: { walletConnectV2ChainId: { namespace: 'eip155', reference: '1' - } + }, + unstoppableDomainsTicker: 'ETH' }, arbitrum: { initWalletName: lstrings.string_first_arbitrum_wallet_name, @@ -374,7 +389,8 @@ export const SPECIAL_CURRENCY_INFO: { displayBuyCrypto: false, isImportKeySupported: true, isStakingSupported: false, - noMaxSpend: true + noMaxSpend: true, + unstoppableDomainsTicker: 'FIL' }, filecoinfevm: { initWalletName: lstrings.string_first_filecoin_fevm_wallet_name, @@ -399,7 +415,8 @@ export const SPECIAL_CURRENCY_INFO: { allowZeroTx: true, noChangeMiningFee: true, isImportKeySupported: true, - isStakingSupported: true + isStakingSupported: true, + unstoppableDomainsTicker: 'TRX' }, ethereumclassic: { initWalletName: lstrings.string_first_ethereum_classic_wallet_name, @@ -409,7 +426,8 @@ export const SPECIAL_CURRENCY_INFO: { walletConnectV2ChainId: { namespace: 'eip155', reference: '61' - } + }, + unstoppableDomainsTicker: 'ETC' }, ethereumpow: { initWalletName: lstrings.string_first_ethereum_pow_wallet_name, @@ -466,7 +484,8 @@ export const SPECIAL_CURRENCY_INFO: { // will share / copy public address instead of URI on Request scene isUriEncodedStructure: true, dummyPublicAddress: 'tz1cVgSd4oY25pDkH7vdvVp5DfPkZwT2hXwX', - isImportKeySupported: true + isImportKeySupported: true, + unstoppableDomainsTicker: 'XTZ' }, axelar: { initWalletName: lstrings.string_first_axelar_wallet_name, @@ -499,7 +518,8 @@ export const SPECIAL_CURRENCY_INFO: { walletConnectV2ChainId: { namespace: 'cosmos', reference: 'cosmoshub-4' - } + }, + unstoppableDomainsTicker: 'ATOM' }, osmosis: { initWalletName: lstrings.string_first_osmosis_wallet_name, @@ -516,14 +536,16 @@ export const SPECIAL_CURRENCY_INFO: { chainCode: 'TON', dummyPublicAddress: 'UQAc_4sYewa5e5eN1D3nrt9wDy2akCCQ3VyNlhcxF4VozlO5', isImportKeySupported: false, - noChangeMiningFee: true + noChangeMiningFee: true, + unstoppableDomainsTicker: 'TON' }, thorchainrune: { initWalletName: lstrings.string_first_thorchainrune_wallet_name, chainCode: 'RUNE', noChangeMiningFee: true, dummyPublicAddress: 'thor1mj5j3eke6m9tcvmn8lwwxdrputyvax45lqawch', - isImportKeySupported: true + isImportKeySupported: true, + unstoppableDomainsTicker: 'RUNE' }, binance: { initWalletName: lstrings.string_first_bnb_wallet_name, @@ -549,7 +571,8 @@ export const SPECIAL_CURRENCY_INFO: { chainCode: 'SOL', isImportKeySupported: true, dummyPublicAddress: 'DEd1rkRyr5bRkJHgaAKMSYjYC1KMz3Hc5bSs4Jiwt29x', - noChangeMiningFee: true + noChangeMiningFee: true, + unstoppableDomainsTicker: 'SOL' }, celo: { initWalletName: lstrings.string_first_celo_wallet_name, @@ -560,7 +583,8 @@ export const SPECIAL_CURRENCY_INFO: { walletConnectV2ChainId: { namespace: 'eip155', reference: '42220' - } + }, + unstoppableDomainsTicker: 'CELO' }, fio: { allowZeroTx: true, @@ -577,13 +601,15 @@ export const SPECIAL_CURRENCY_INFO: { initWalletName: lstrings.string_first_dash_wallet_name, chainCode: 'DASH', displayIoniaRewards: true, - isImportKeySupported: true + isImportKeySupported: true, + unstoppableDomainsTicker: 'DASH' }, ravencoin: { maxSpendTargets: UTXO_MAX_SPEND_TARGETS, initWalletName: lstrings.string_first_ravencoin_wallet_name, chainCode: 'RVN', - isImportKeySupported: true + isImportKeySupported: true, + unstoppableDomainsTicker: 'RVN' }, dogecoin: { maxSpendTargets: UTXO_MAX_SPEND_TARGETS, @@ -591,20 +617,23 @@ export const SPECIAL_CURRENCY_INFO: { chainCode: 'DOGE', displayIoniaRewards: true, isImportKeySupported: true, - isStakingSupported: true + isStakingSupported: true, + unstoppableDomainsTicker: 'DOGE' }, zcoin: { maxSpendTargets: UTXO_MAX_SPEND_TARGETS, initWalletName: lstrings.string_first_zcoin_wallet_name, chainCode: 'FIRO', - isImportKeySupported: true + isImportKeySupported: true, + unstoppableDomainsTicker: 'FIRO' }, smartcash: { maxSpendTargets: UTXO_MAX_SPEND_TARGETS, initWalletName: lstrings.string_first_smartcash_wallet_name, chainCode: 'SMART', isImportKeySupported: true, - keysOnlyMode: true + keysOnlyMode: true, + unstoppableDomainsTicker: 'SMART' }, vertcoin: { maxSpendTargets: UTXO_MAX_SPEND_TARGETS, @@ -617,7 +646,8 @@ export const SPECIAL_CURRENCY_INFO: { initWalletName: lstrings.string_first_bitcoin_gold_wallet_name, chainCode: 'BTG', isImportKeySupported: true, - isSplittingDisabled: true + isSplittingDisabled: true, + unstoppableDomainsTicker: 'BTG' }, feathercoin: { maxSpendTargets: UTXO_MAX_SPEND_TARGETS, @@ -629,13 +659,15 @@ export const SPECIAL_CURRENCY_INFO: { maxSpendTargets: UTXO_MAX_SPEND_TARGETS, initWalletName: lstrings.string_first_groestlcoin_wallet_name, chainCode: 'GRS', - isImportKeySupported: true + isImportKeySupported: true, + unstoppableDomainsTicker: 'GRS' }, qtum: { maxSpendTargets: UTXO_MAX_SPEND_TARGETS, initWalletName: lstrings.string_first_qtum_wallet_name, chainCode: 'QTUM', - isImportKeySupported: true + isImportKeySupported: true, + unstoppableDomainsTicker: 'QTUM' }, eboost: { maxSpendTargets: UTXO_MAX_SPEND_TARGETS, @@ -659,7 +691,8 @@ export const SPECIAL_CURRENCY_INFO: { walletConnectV2ChainId: { namespace: 'eip155', reference: '250' - } + }, + unstoppableDomainsTicker: 'FTM' }, hedera: { initWalletName: lstrings.string_first_hedera_wallet_name, @@ -667,7 +700,8 @@ export const SPECIAL_CURRENCY_INFO: { dummyPublicAddress: '0.0.14625', isImportKeySupported: true, noMaxSpend: true, - noChangeMiningFee: true + noChangeMiningFee: true, + unstoppableDomainsTicker: 'HBAR' }, polkadot: { initWalletName: lstrings.string_first_polkadot_wallet_name, @@ -679,7 +713,8 @@ export const SPECIAL_CURRENCY_INFO: { modalMessage: lstrings.request_dot_minimum_notification_body, alertMessage: lstrings.request_dot_minimum_notification_alert_body }, - isImportKeySupported: true + isImportKeySupported: true, + unstoppableDomainsTicker: 'DOT' }, liberland: { initWalletName: lstrings.string_first_liberland_wallet_name, @@ -693,7 +728,7 @@ export const SPECIAL_CURRENCY_INFO: { modalMessage: lstrings.request_lld_minimum_notification_body, alertMessage: lstrings.request_lld_minimum_notification_alert_body }, - isTransactionListUnsupported: true, + isTransactionListUnsupported: false, isImportKeySupported: true }, liberlandtestnet: { @@ -735,7 +770,8 @@ export const SPECIAL_CURRENCY_INFO: { inputType: 'number-pad', inputValidation: (input: string) => /^\d+$/.test(input) && gte(input, '419200') // sapling activation height } - ] + ], + unstoppableDomainsTicker: 'ZEC' }, piratechain: { initWalletName: lstrings.string_first_piratechain_wallet_name, @@ -756,7 +792,8 @@ export const SPECIAL_CURRENCY_INFO: { inputType: 'number-pad', inputValidation: (input: string) => /^\d+$/.test(input) && gte(input, '152855') // sapling activation height } - ] + ], + unstoppableDomainsTicker: 'ARRR' }, polygon: { initWalletName: lstrings.string_first_polygon_wallet_name, @@ -768,7 +805,8 @@ export const SPECIAL_CURRENCY_INFO: { walletConnectV2ChainId: { namespace: 'eip155', reference: '137' - } + }, + unstoppableDomainsTicker: 'MATIC' }, pulsechain: { initWalletName: lstrings.string_first_pulsechain_wallet_name, @@ -793,7 +831,8 @@ export const SPECIAL_CURRENCY_INFO: { walletConnectV2ChainId: { namespace: 'eip155', reference: '43114' - } + }, + unstoppableDomainsTicker: 'AVAX' }, algorand: { initWalletName: lstrings.string_first_algorand_wallet_name, @@ -805,7 +844,8 @@ export const SPECIAL_CURRENCY_INFO: { walletConnectV2ChainId: { namespace: 'algorand', reference: 'wGHE2Pwdvd7S12BL5FaOP20EGYesN73k' - } + }, + unstoppableDomainsTicker: 'ALGO' }, holesky: { initWalletName: lstrings.string_first_holesky_wallet_name, diff --git a/src/constants/plugins/GuiPlugins.ts b/src/constants/plugins/GuiPlugins.ts index ddf78a2c131..fcd0341b9f1 100644 --- a/src/constants/plugins/GuiPlugins.ts +++ b/src/constants/plugins/GuiPlugins.ts @@ -253,9 +253,8 @@ export const guiPlugins: { [pluginId: string]: GuiPlugin } = { coinhub: { pluginId: 'coinhub', storeId: 'coinhub', - baseUri: 'https://coinhubatm.app', - displayName: 'Coinhub ATMs', - permissions: ['location'] + baseUri: 'https://coinhubbitcoinwallet.app', + displayName: 'Coinhub ATMs' }, custom: { pluginId: 'custom', diff --git a/src/constants/plugins/sellPluginList.json b/src/constants/plugins/sellPluginList.json index b4d4ef2a50e..94aa43aa1d6 100644 --- a/src/constants/plugins/sellPluginList.json +++ b/src/constants/plugins/sellPluginList.json @@ -12,7 +12,7 @@ "US" ], "notStateProvinces": { - "US": ["AK", "AR", "CT", "NC", "NY", "TX", "FL"] + "US": ["AK", "AR", "CT", "LA", "NC", "NY", "TX", "FL"] }, "cryptoCodes": [], "paymentTypeLogoKey": "bank" @@ -42,7 +42,7 @@ "title": "Bank Transfer via Debit Card", "description": "Fee: 4.0%\nSettlement: 5 min - 24 hours", "forCountries": [ - "AT", "AU", "BE", "BG", "CH", "CZ", "DE", "DK", "EE", "ES", + "AT", "AU", "BG", "CH", "CZ", "DE", "DK", "EE", "ES", "FI", "FR", "GB", "GR", "HR", "HU", "IE", "IT", "LI", "LT", "LU", "LV", "NL", "NO", "PL", "PT", "RO", "SE", "SI", "SK", "SM", "US" diff --git a/src/declare-modules.d.ts b/src/declare-modules.d.ts index cc740d8308b..a3933c557b5 100644 --- a/src/declare-modules.d.ts +++ b/src/declare-modules.d.ts @@ -30,11 +30,9 @@ declare module 'csv-stringify/lib/browser/sync' { export default function stringify(input: any[], options?: any): string } -declare module 'react-native-power-saving-mode' { - import { EmitterSubscription } from 'react-native' - - export const powerSavingOn: (() => Promise) | null - export const powerSavingModeChanged: ((callback: (state: boolean) => void) => EmitterSubscription) | null +declare module 'react-native-battery-optimization-check' { + export function BatteryOptEnabled(): Promise + export function RequestDisableOptimization(): Promise } declare module 'edge-currency-monero/lib/react-native-io' diff --git a/src/envConfig.ts b/src/envConfig.ts index 4bf3d927afa..5aee164ff03 100644 --- a/src/envConfig.ts +++ b/src/envConfig.ts @@ -123,6 +123,7 @@ export const asEnvConfig = asObject({ KILN_TESTNET_ACCOUNT_ID: asNullable(asString), KILN_MAINNET_API_KEY: asNullable(asString), KILN_MAINNET_ACCOUNT_ID: asNullable(asString), + UNSTOPPABLE_DOMAINS_API_KEY: asNullable(asString), // Core plugin options: ARBITRUM_INIT: asCorePluginInit(asEvmApiKeys), @@ -294,7 +295,7 @@ export const asEnvConfig = asObject({ thorname: asOptional(asString, 'ej') }).withRest ), - THORCHAIN_DA_INIT: asCorePluginInit( + SWAPKIT_INIT: asCorePluginInit( asObject({ affiliateFeeBasis: asOptional(asString, '50'), appId: asOptional(asString, 'edge'), diff --git a/src/locales/en_US.ts b/src/locales/en_US.ts index bcd3a059e45..55653cf1ea5 100644 --- a/src/locales/en_US.ts +++ b/src/locales/en_US.ts @@ -125,7 +125,7 @@ const strings = { warning_token_code_override_2s: 'The entered contract address differs from the contract address of built-in token %1$s. Please proceed with caution and verify the contract is legitimate as use of this token can result in loss of funds. If you have questions about this feature or contract please contact %2$s.', warning_token_exists_1s: 'The entered token already exists as a built-in token %1$s', - warning_battery_saver: `Battery Saver mode detected. Balances and transactions may be inaccurate`, + warning_battery_saver: `Battery Saver Detected! Balances may not update. For the best experience, please turn off battery saver mode.`, // Alert component: alert_dropdown_alert: 'Alert! ', @@ -456,7 +456,8 @@ const strings = { 'Edge uses Monero light wallet servers provided by MyMonero. These servers hold the private view key, which they use to scan for transactions. For enhanced privacy, you can run your own Monero light wallet server.', settings_hours: 'Hour(s)', settings_minutes: 'Minute(s)', - settings_modal_export_logs_message: 'You may add any additional notes here, and select whether to share logs with Edge, or export logs to your device.', + settings_modal_export_logs_warning: 'Do not enter seeds, private keys, password or other sensitive information', + settings_modal_export_logs_directions: 'Select whether to share logs with Edge or export logs to your device.', settings_modal_clear_logs_message: 'Are you sure you want to clear all logs on this device?', settings_modal_clear_logs_success: 'Logs have been cleared', settings_modal_send_logs_success: 'Logs have been sent', @@ -830,9 +831,12 @@ const strings = { buy_crypto_modal_title: 'Wallet Empty', buy_crypto_modal_message: 'Your %s wallet is empty. Would you like to buy %s or exchange another crypto into %s?', + buy_crypto_modal_message_no_exchange_s: 'Your %s wallet is empty. Would you like to buy %s?', buy_parent_crypto_modal_message_2s: '%1$s%2$s is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?', buy_parent_crypto_modal_message_3s: '%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?', + buy_parent_crypto_modal_message_no_exchange_2s: '%1$s%2$s is required to send this transaction. Would you like to buy %2$s?', + buy_parent_crypto_modal_message_no_exchange_3s: '%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s?', buy_crypto_decline: 'Not at this time', buy_1s: 'Buy %1$s', sell_1s: 'Sell %1$s', @@ -1382,6 +1386,7 @@ const strings = { stake_earning_1s: 'Earning: %1$s', stake_apy_1s: '%1$s APY', + stake_stable_apy: 'Stable APY', stake_variable_apy: 'Variable APY', stake_s_staked: '%s Staked', diff --git a/src/locales/strings/de.json b/src/locales/strings/de.json index 9ee956ca1eb..9aea04273fd 100644 --- a/src/locales/strings/de.json +++ b/src/locales/strings/de.json @@ -80,7 +80,7 @@ "warning_scam_message_yes_1s": "Please proceed with caution! Assistance with account creation has the potential for fraud. Users should never share passwords or private keys. Social media and chat platforms have been involved in attacks. Do not send cryptocurrency to strangers. If you believe you’re being taken advantage of, please contact our support team at %1$s.", "warning_token_code_override_2s": "The entered contract address differs from the contract address of built-in token %1$s. Please proceed with caution and verify the contract is legitimate as use of this token can result in loss of funds. If you have questions about this feature or contract please contact %2$s.", "warning_token_exists_1s": "The entered token already exists as a built-in token %1$s", - "warning_battery_saver": "Battery Saver mode detected. Balances and transactions may be inaccurate", + "warning_battery_saver": "Battery Saver Detected! Balances may not update. For the best experience, please turn off battery saver mode.", "alert_dropdown_alert": "Achtung!", "alert_dropdown_warning": "Warnung! ", "azteco_success": "Sie haben eine Azteco-Bitcoin-Karte eingelöst. Das Geld sollte in Kürze eintreffen.", @@ -391,7 +391,8 @@ "settings_monero_info": "Edge uses Monero light wallet servers provided by MyMonero. These servers hold the private view key, which they use to scan for transactions. For enhanced privacy, you can run your own Monero light wallet server.", "settings_hours": "Stunde(n)", "settings_minutes": "Minute(n)", - "settings_modal_export_logs_message": "You may add any additional notes here, and select whether to share logs with Edge, or export logs to your device.", + "settings_modal_export_logs_warning": "Do not enter seeds, private keys, password or other sensitive information", + "settings_modal_export_logs_directions": "Select whether to share logs with Edge or export logs to your device.", "settings_modal_clear_logs_message": "Are you sure you want to clear all logs on this device?", "settings_modal_clear_logs_success": "Logs have been cleared", "settings_modal_send_logs_success": "Protokolle wurden übermittelt", @@ -742,8 +743,11 @@ "password": "Passwort", "buy_crypto_modal_title": "Wallet ist leer ", "buy_crypto_modal_message": "Deine %s -Wallet ist leer. Möchtest du %s kaufen oder andere Krypto in %s tauschen?", + "buy_crypto_modal_message_no_exchange_s": "Your %s wallet is empty. Would you like to buy %s?", "buy_parent_crypto_modal_message_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", "buy_parent_crypto_modal_message_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", + "buy_parent_crypto_modal_message_no_exchange_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s?", + "buy_parent_crypto_modal_message_no_exchange_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s?", "buy_crypto_decline": "Momentan nicht", "buy_1s": "Buy %1$s", "sell_1s": "Sell %1$s", @@ -1389,6 +1393,7 @@ "survey_opt_in_person_event": "In-person Event", "survey_opt_personal_referral": "Personal Referral", "survey_opt_article": "Article", + "survey_opt_BTCTKVR_magazine": "BTCTKVR Magazine", "survey_opt_submit": "Submit", "survey_opt_dismiss": "Dismiss", "survey_opt_other_specify": "Other (Specify)", diff --git a/src/locales/strings/enUS.json b/src/locales/strings/enUS.json index cd63ede97be..28f5c7f5600 100644 --- a/src/locales/strings/enUS.json +++ b/src/locales/strings/enUS.json @@ -80,7 +80,7 @@ "warning_scam_message_yes_1s": "Please proceed with caution! Assistance with account creation has the potential for fraud. Users should never share passwords or private keys. Social media and chat platforms have been involved in attacks. Do not send cryptocurrency to strangers. If you believe you’re being taken advantage of, please contact our support team at %1$s.", "warning_token_code_override_2s": "The entered contract address differs from the contract address of built-in token %1$s. Please proceed with caution and verify the contract is legitimate as use of this token can result in loss of funds. If you have questions about this feature or contract please contact %2$s.", "warning_token_exists_1s": "The entered token already exists as a built-in token %1$s", - "warning_battery_saver": "Battery Saver mode detected. Balances and transactions may be inaccurate", + "warning_battery_saver": "Battery Saver Detected! Balances may not update. For the best experience, please turn off battery saver mode.", "alert_dropdown_alert": "Alert! ", "alert_dropdown_warning": "Warning! ", "azteco_success": "You've redeemed an Azteco bitcoin card. Funds should arrive shortly.", @@ -391,7 +391,8 @@ "settings_monero_info": "Edge uses Monero light wallet servers provided by MyMonero. These servers hold the private view key, which they use to scan for transactions. For enhanced privacy, you can run your own Monero light wallet server.", "settings_hours": "Hour(s)", "settings_minutes": "Minute(s)", - "settings_modal_export_logs_message": "You may add any additional notes here, and select whether to share logs with Edge, or export logs to your device.", + "settings_modal_export_logs_warning": "Do not enter seeds, private keys, password or other sensitive information", + "settings_modal_export_logs_directions": "Select whether to share logs with Edge or export logs to your device.", "settings_modal_clear_logs_message": "Are you sure you want to clear all logs on this device?", "settings_modal_clear_logs_success": "Logs have been cleared", "settings_modal_send_logs_success": "Logs have been sent", @@ -742,8 +743,11 @@ "password": "Password", "buy_crypto_modal_title": "Wallet Empty", "buy_crypto_modal_message": "Your %s wallet is empty. Would you like to buy %s or exchange another crypto into %s?", + "buy_crypto_modal_message_no_exchange_s": "Your %s wallet is empty. Would you like to buy %s?", "buy_parent_crypto_modal_message_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", "buy_parent_crypto_modal_message_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", + "buy_parent_crypto_modal_message_no_exchange_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s?", + "buy_parent_crypto_modal_message_no_exchange_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s?", "buy_crypto_decline": "Not at this time", "buy_1s": "Buy %1$s", "sell_1s": "Sell %1$s", @@ -1221,6 +1225,7 @@ "stake_earn_1s": "Earn: %1$s", "stake_earning_1s": "Earning: %1$s", "stake_apy_1s": "%1$s APY", + "stake_stable_apy": "Stable APY", "stake_variable_apy": "Variable APY", "stake_s_staked": "%s Staked", "stake_s_earned": "%s Earned", diff --git a/src/locales/strings/es.json b/src/locales/strings/es.json index 86c42fb8fcb..ac4d9914f69 100644 --- a/src/locales/strings/es.json +++ b/src/locales/strings/es.json @@ -80,7 +80,7 @@ "warning_scam_message_yes_1s": "Please proceed with caution! Assistance with account creation has the potential for fraud. Users should never share passwords or private keys. Social media and chat platforms have been involved in attacks. Do not send cryptocurrency to strangers. If you believe you’re being taken advantage of, please contact our support team at %1$s.", "warning_token_code_override_2s": "The entered contract address differs from the contract address of built-in token %1$s. Please proceed with caution and verify the contract is legitimate as use of this token can result in loss of funds. If you have questions about this feature or contract please contact %2$s.", "warning_token_exists_1s": "The entered token already exists as a built-in token %1$s", - "warning_battery_saver": "Battery Saver mode detected. Balances and transactions may be inaccurate", + "warning_battery_saver": "Battery Saver Detected! Balances may not update. For the best experience, please turn off battery saver mode.", "alert_dropdown_alert": "¡Alerta! ", "alert_dropdown_warning": "¡Advertencia! ", "azteco_success": "Has canjeado una tarjeta de bitcoin Azteco. Los fondos deberían llegar pronto.", @@ -391,7 +391,8 @@ "settings_monero_info": "Edge uses Monero light wallet servers provided by MyMonero. These servers hold the private view key, which they use to scan for transactions. For enhanced privacy, you can run your own Monero light wallet server.", "settings_hours": "Hora(s)", "settings_minutes": "Minuto(s)", - "settings_modal_export_logs_message": "You may add any additional notes here, and select whether to share logs with Edge, or export logs to your device.", + "settings_modal_export_logs_warning": "Do not enter seeds, private keys, password or other sensitive information", + "settings_modal_export_logs_directions": "Select whether to share logs with Edge or export logs to your device.", "settings_modal_clear_logs_message": "Está seguro que desea borrar todos los registros de este dispositivo?", "settings_modal_clear_logs_success": "Los registros han sido borrados", "settings_modal_send_logs_success": "Los registros han sido enviados", @@ -742,8 +743,11 @@ "password": "Contraseña", "buy_crypto_modal_title": "Cartera vacía", "buy_crypto_modal_message": "Tu cartera %s está vacía. ¿Quieres comprar %s o cambiar otra cripto en %s?", + "buy_crypto_modal_message_no_exchange_s": "Your %s wallet is empty. Would you like to buy %s?", "buy_parent_crypto_modal_message_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", "buy_parent_crypto_modal_message_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", + "buy_parent_crypto_modal_message_no_exchange_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s?", + "buy_parent_crypto_modal_message_no_exchange_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s?", "buy_crypto_decline": "No en este momento", "buy_1s": "Buy %1$s", "sell_1s": "Sell %1$s", @@ -1389,6 +1393,7 @@ "survey_opt_in_person_event": "In-person Event", "survey_opt_personal_referral": "Personal Referral", "survey_opt_article": "Article", + "survey_opt_BTCTKVR_magazine": "BTCTKVR Magazine", "survey_opt_submit": "Submit", "survey_opt_dismiss": "Dismiss", "survey_opt_other_specify": "Other (Specify)", diff --git a/src/locales/strings/esMX.json b/src/locales/strings/esMX.json index 5102ca9543a..ecb54ca3204 100644 --- a/src/locales/strings/esMX.json +++ b/src/locales/strings/esMX.json @@ -80,7 +80,7 @@ "warning_scam_message_yes_1s": "¡Por favor proceda con precaución! La asistencia con la creación de cuentas tiene el potencial de ser fraudulenta. Los usuarios nunca deben compartir contraseñas o claves privadas. Las redes sociales y las plataformas de chat han estado involucradas en los ataques. No envíes criptomonedas a extraños. Si cree que se están aprovechando de usted, comuníquese con nuestro equipo de soporte al %1$s.", "warning_token_code_override_2s": "La dirección del contrato ingresada difiere de la dirección del contrato del token integrado %1$s. Por favor. Proceda con precaución y verifique que el contrato sea legítimo, ya que el uso de este token puede provocar la pérdida de fondos. Si tiene preguntas sobre esta función o contrato, comuníquese con %2$s.", "warning_token_exists_1s": "El token ingresado ya existe como token integrado %1$s", - "warning_battery_saver": "Battery Saver mode detected. Balances and transactions may be inaccurate", + "warning_battery_saver": "Battery Saver Detected! Balances may not update. For the best experience, please turn off battery saver mode.", "alert_dropdown_alert": "¡Alerta! ", "alert_dropdown_warning": "¡Advertencia! ", "azteco_success": "Has canjeado una tarjeta de bitcoin Azteco. Los fondos deberían llegar pronto.", @@ -391,7 +391,8 @@ "settings_monero_info": "Edge utiliza servidores de billetera ligera Monero proporcionados por MyMonero. Estos servidores contienen la clave de vista privada, que utilizan para buscar transacciones. Para mayor privacidad, puede ejecutar su propio servidor de billetera ligera Monero.", "settings_hours": "Hora(s)", "settings_minutes": "Minuto(s)", - "settings_modal_export_logs_message": "Puede agregar notas adicionales aquí y seleccionar si desea compartir registros con Edge o exportarlos a su dispositivo.", + "settings_modal_export_logs_warning": "Do not enter seeds, private keys, password or other sensitive information", + "settings_modal_export_logs_directions": "Select whether to share logs with Edge or export logs to your device.", "settings_modal_clear_logs_message": "Está seguro que desea borrar todos los registros de este dispositivo?", "settings_modal_clear_logs_success": "Los registros han sido borrados", "settings_modal_send_logs_success": "Los registros han sido enviados", @@ -742,8 +743,11 @@ "password": "Contraseña", "buy_crypto_modal_title": "Cartera vacía", "buy_crypto_modal_message": "Tu cartera %s está vacía. ¿Quieres comprar %s o cambiar otra cripto en %s?", + "buy_crypto_modal_message_no_exchange_s": "Your %s wallet is empty. Would you like to buy %s?", "buy_parent_crypto_modal_message_2s": "Se requiere %1$s%2$s para enviar esta transacción. ¿Te gustaría comprar %2$s o cambiar otra criptomoneda por %2$s?", "buy_parent_crypto_modal_message_3s": "Se requiere %1$s%2$s (en %3$s) para enviar esta transacción. ¿Te gustaría comprar %2$s o cambiar otra criptomoneda por %2$s?", + "buy_parent_crypto_modal_message_no_exchange_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s?", + "buy_parent_crypto_modal_message_no_exchange_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s?", "buy_crypto_decline": "No en este momento", "buy_1s": "Buy %1$s", "sell_1s": "Sell %1$s", @@ -1389,6 +1393,7 @@ "survey_opt_in_person_event": "In-person Event", "survey_opt_personal_referral": "Personal Referral", "survey_opt_article": "Article", + "survey_opt_BTCTKVR_magazine": "BTCTKVR Magazine", "survey_opt_submit": "Submit", "survey_opt_dismiss": "Dismiss", "survey_opt_other_specify": "Other (Specify)", diff --git a/src/locales/strings/fr.json b/src/locales/strings/fr.json index 02133b6bb7e..44cede5668a 100644 --- a/src/locales/strings/fr.json +++ b/src/locales/strings/fr.json @@ -80,7 +80,7 @@ "warning_scam_message_yes_1s": "Please proceed with caution! Assistance with account creation has the potential for fraud. Users should never share passwords or private keys. Social media and chat platforms have been involved in attacks. Do not send cryptocurrency to strangers. If you believe you’re being taken advantage of, please contact our support team at %1$s.", "warning_token_code_override_2s": "The entered contract address differs from the contract address of built-in token %1$s. Please proceed with caution and verify the contract is legitimate as use of this token can result in loss of funds. If you have questions about this feature or contract please contact %2$s.", "warning_token_exists_1s": "The entered token already exists as a built-in token %1$s", - "warning_battery_saver": "Battery Saver mode detected. Balances and transactions may be inaccurate", + "warning_battery_saver": "Battery Saver Detected! Balances may not update. For the best experience, please turn off battery saver mode.", "alert_dropdown_alert": "Alert! ", "alert_dropdown_warning": "Warning! ", "azteco_success": "You've redeemed an Azteco bitcoin card. Funds should arrive shortly.", @@ -391,7 +391,8 @@ "settings_monero_info": "Edge uses Monero light wallet servers provided by MyMonero. These servers hold the private view key, which they use to scan for transactions. For enhanced privacy, you can run your own Monero light wallet server.", "settings_hours": "Heure(s)", "settings_minutes": "Minute(s)", - "settings_modal_export_logs_message": "You may add any additional notes here, and select whether to share logs with Edge, or export logs to your device.", + "settings_modal_export_logs_warning": "Do not enter seeds, private keys, password or other sensitive information", + "settings_modal_export_logs_directions": "Select whether to share logs with Edge or export logs to your device.", "settings_modal_clear_logs_message": "Are you sure you want to clear all logs on this device?", "settings_modal_clear_logs_success": "Logs have been cleared", "settings_modal_send_logs_success": "Logs a été bien envoyés ", @@ -742,8 +743,11 @@ "password": "Mot de passe", "buy_crypto_modal_title": "Portefeuille Vide", "buy_crypto_modal_message": "Votre portefeuille %s est vide. Voulez-vous échanger un autre crypto dans %s?", + "buy_crypto_modal_message_no_exchange_s": "Your %s wallet is empty. Would you like to buy %s?", "buy_parent_crypto_modal_message_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", "buy_parent_crypto_modal_message_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", + "buy_parent_crypto_modal_message_no_exchange_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s?", + "buy_parent_crypto_modal_message_no_exchange_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s?", "buy_crypto_decline": "Pas cette fois", "buy_1s": "Buy %1$s", "sell_1s": "Sell %1$s", @@ -1389,6 +1393,7 @@ "survey_opt_in_person_event": "In-person Event", "survey_opt_personal_referral": "Personal Referral", "survey_opt_article": "Article", + "survey_opt_BTCTKVR_magazine": "BTCTKVR Magazine", "survey_opt_submit": "Submit", "survey_opt_dismiss": "Dismiss", "survey_opt_other_specify": "Other (Specify)", diff --git a/src/locales/strings/it.json b/src/locales/strings/it.json index 1373422301b..2f112f85cf5 100644 --- a/src/locales/strings/it.json +++ b/src/locales/strings/it.json @@ -80,7 +80,7 @@ "warning_scam_message_yes_1s": "Per favore, procedi con cautela! Ricevere assistenza durante la creazione dell'account potrebbe portare a delle truffe. Gli utenti non dovrebbero mai condividere la password o le chiavi private. I social media e le piattaforme di chat sono stati coinvolti in tentativi di truffa, spesso riusciti. Non inviare criptovalute agli sconosciuti. Se hai anche solo il minimo sospetto di esserne vittima, contatta il nostro team di supporto qui %1$s.", "warning_token_code_override_2s": "L'indirizzo del contratto inserito differisce dall'indirizzo del contratto del token integrato %1$s. Si prega di procedere con cautela e verificare che il contratto sia legittimo in quanto l'uso di questo token può comportare la perdita di fondi. Se hai domande su questa funzione o sul contratto contatta %2$s.", "warning_token_exists_1s": "Il token inserito esiste già come token integrato %1$s", - "warning_battery_saver": "Modalità risparmio batteria rilevata. I saldi e le transazioni potrebbero essere imprecisi", + "warning_battery_saver": "Risparmio batteria rilevato! I bilanci potrebbero non essere aggiornati. Per una migliore esperienza, si prega di disattivare la modalità risparmio batteria.", "alert_dropdown_alert": "Avviso! ", "alert_dropdown_warning": "Attenzione! ", "azteco_success": "Hai riscattato una carta bitcoin Azteco. I fondi dovrebbero arrivare a breve.", @@ -391,7 +391,8 @@ "settings_monero_info": "Edge utilizza i Monero light wallet server forniti da MyMonero. Questi server mantengono la tua private view key, che usano per eseguire la scansione delle transazioni. Per una maggiore privacy, puoi utilizzare il tuo Monero light wallet server personale.", "settings_hours": "Ora(e)", "settings_minutes": "Minuto(i)", - "settings_modal_export_logs_message": "È possibile aggiungere eventuali note qui e selezionare se condividere i logs con Edge o esportarli sul dispositivo.", + "settings_modal_export_logs_warning": "Non inserire seed, chiavi private, password o altre informazioni sensibili", + "settings_modal_export_logs_directions": "Seleziona se condividere i log con Edge o esportare i log sul tuo dispositivo.", "settings_modal_clear_logs_message": "Sei sicuro di voler cancellare tutti i log su questo dispositivo?", "settings_modal_clear_logs_success": "I logs sono stati cancellati", "settings_modal_send_logs_success": "I log sono stati inviati", @@ -742,8 +743,11 @@ "password": "Password", "buy_crypto_modal_title": "Portafoglio vuoto", "buy_crypto_modal_message": "Il tuo portafoglio %s è vuoto. Vuoi comprare %s o scambiare delle criptovalute per %s?", + "buy_crypto_modal_message_no_exchange_s": "Il tuo portafoglio %s è vuoto. Vuoi acquistare %s?", "buy_parent_crypto_modal_message_2s": "%1$s%2$s necessari per inviare questa transazione. Vuoi acquistare %2$s o scambiare un'altra criptovaluta in %2$s?", "buy_parent_crypto_modal_message_3s": "%1$s%2$s (su %3$s) necessari per inviare questa transazione. Vuoi comprare %2$s o scambiare un'altra cripto per %2$s?", + "buy_parent_crypto_modal_message_no_exchange_2s": "Sono necessari %1$s%2$s per inviare questa transazione. Vuoi acquistare %2$s?", + "buy_parent_crypto_modal_message_no_exchange_3s": "Sono necessari %1$s%2$s (su %3$s) per inviare questa transazione. Vuoi acquistare %2$s?", "buy_crypto_decline": "Non ora", "buy_1s": "Compra %1$s", "sell_1s": "Vendi %1$s", @@ -1389,6 +1393,7 @@ "survey_opt_in_person_event": "Evento di persona", "survey_opt_personal_referral": "Segnalazione di persona", "survey_opt_article": "Articolo", + "survey_opt_BTCTKVR_magazine": "BTCTKVR Magazine", "survey_opt_submit": "Invia", "survey_opt_dismiss": "Ignora", "survey_opt_other_specify": "Altro (specificare)", diff --git a/src/locales/strings/ja.json b/src/locales/strings/ja.json index c39cb0e2c9a..8f822ba51f0 100644 --- a/src/locales/strings/ja.json +++ b/src/locales/strings/ja.json @@ -80,7 +80,7 @@ "warning_scam_message_yes_1s": "Please proceed with caution! Assistance with account creation has the potential for fraud. Users should never share passwords or private keys. Social media and chat platforms have been involved in attacks. Do not send cryptocurrency to strangers. If you believe you’re being taken advantage of, please contact our support team at %1$s.", "warning_token_code_override_2s": "The entered contract address differs from the contract address of built-in token %1$s. Please proceed with caution and verify the contract is legitimate as use of this token can result in loss of funds. If you have questions about this feature or contract please contact %2$s.", "warning_token_exists_1s": "The entered token already exists as a built-in token %1$s", - "warning_battery_saver": "Battery Saver mode detected. Balances and transactions may be inaccurate", + "warning_battery_saver": "Battery Saver Detected! Balances may not update. For the best experience, please turn off battery saver mode.", "alert_dropdown_alert": "警告！ ", "alert_dropdown_warning": "注意! ", "azteco_success": "Aztecoビットコインカードを使用しました。資金はまもなく届きます。", @@ -391,7 +391,8 @@ "settings_monero_info": "Edgeは、MyMoneroが提供するMoneroの軽量ウォレットサーバーを使用しています。これらのサーバーは、トランザクションをスキャンするために使用するプライベートビューキーを保持しています。さらなるプライバシー向上のために、独自のMonero軽量ウォレットサーバーを運用することもできます。", "settings_hours": "時間", "settings_minutes": "分", - "settings_modal_export_logs_message": "ここにノートを追加し、Edgeとログを共有するか、デバイスにログをエクスポートするかを選択できます。", + "settings_modal_export_logs_warning": "Do not enter seeds, private keys, password or other sensitive information", + "settings_modal_export_logs_directions": "Select whether to share logs with Edge or export logs to your device.", "settings_modal_clear_logs_message": "このデバイス上のすべてのログを消去してもよろしいですか？", "settings_modal_clear_logs_success": "ログを消去しました", "settings_modal_send_logs_success": "記録が送信されました", @@ -742,8 +743,11 @@ "password": "パスワード", "buy_crypto_modal_title": "空のウォレット", "buy_crypto_modal_message": "あなたの%sウォレットは空です。 %sを購入しますか、または別の暗号資産を%sに交換しますか？", + "buy_crypto_modal_message_no_exchange_s": "Your %s wallet is empty. Would you like to buy %s?", "buy_parent_crypto_modal_message_2s": "このトランザクションを送信するには、%1$s%2$s が必要です。 %2$s を購入するか、別の暗号通貨を %2$s に交換しますか？", "buy_parent_crypto_modal_message_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", + "buy_parent_crypto_modal_message_no_exchange_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s?", + "buy_parent_crypto_modal_message_no_exchange_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s?", "buy_crypto_decline": "キャンセル", "buy_1s": "Buy %1$s", "sell_1s": "Sell %1$s", @@ -1389,6 +1393,7 @@ "survey_opt_in_person_event": "In-person Event", "survey_opt_personal_referral": "Personal Referral", "survey_opt_article": "Article", + "survey_opt_BTCTKVR_magazine": "BTCTKVR Magazine", "survey_opt_submit": "Submit", "survey_opt_dismiss": "Dismiss", "survey_opt_other_specify": "Other (Specify)", diff --git a/src/locales/strings/kaa.json b/src/locales/strings/kaa.json index 96a83746517..a5f5ad49ca8 100644 --- a/src/locales/strings/kaa.json +++ b/src/locales/strings/kaa.json @@ -80,7 +80,7 @@ "warning_scam_message_yes_1s": "Please proceed with caution! Assistance with account creation has the potential for fraud. Users should never share passwords or private keys. Social media and chat platforms have been involved in attacks. Do not send cryptocurrency to strangers. If you believe you’re being taken advantage of, please contact our support team at %1$s.", "warning_token_code_override_2s": "The entered contract address differs from the contract address of built-in token %1$s. Please proceed with caution and verify the contract is legitimate as use of this token can result in loss of funds. If you have questions about this feature or contract please contact %2$s.", "warning_token_exists_1s": "The entered token already exists as a built-in token %1$s", - "warning_battery_saver": "Battery Saver mode detected. Balances and transactions may be inaccurate", + "warning_battery_saver": "Battery Saver Detected! Balances may not update. For the best experience, please turn off battery saver mode.", "alert_dropdown_alert": "Dıqqat! ", "alert_dropdown_warning": "Dıqqat! ", "azteco_success": "You've redeemed an Azteco bitcoin card. Funds should arrive shortly.", @@ -391,7 +391,8 @@ "settings_monero_info": "Edge uses Monero light wallet servers provided by MyMonero. These servers hold the private view key, which they use to scan for transactions. For enhanced privacy, you can run your own Monero light wallet server.", "settings_hours": "Saat", "settings_minutes": "Minut", - "settings_modal_export_logs_message": "You may add any additional notes here, and select whether to share logs with Edge, or export logs to your device.", + "settings_modal_export_logs_warning": "Do not enter seeds, private keys, password or other sensitive information", + "settings_modal_export_logs_directions": "Select whether to share logs with Edge or export logs to your device.", "settings_modal_clear_logs_message": "Are you sure you want to clear all logs on this device?", "settings_modal_clear_logs_success": "Logs have been cleared", "settings_modal_send_logs_success": "Logs have been sent", @@ -742,8 +743,11 @@ "password": "Password", "buy_crypto_modal_title": "Wallet Empty", "buy_crypto_modal_message": "Your %s wallet is empty. Would you like to buy %s or exchange another crypto into %s?", + "buy_crypto_modal_message_no_exchange_s": "Your %s wallet is empty. Would you like to buy %s?", "buy_parent_crypto_modal_message_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", "buy_parent_crypto_modal_message_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", + "buy_parent_crypto_modal_message_no_exchange_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s?", + "buy_parent_crypto_modal_message_no_exchange_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s?", "buy_crypto_decline": "Not at this time", "buy_1s": "Buy %1$s", "sell_1s": "Sell %1$s", @@ -1389,6 +1393,7 @@ "survey_opt_in_person_event": "In-person Event", "survey_opt_personal_referral": "Personal Referral", "survey_opt_article": "Article", + "survey_opt_BTCTKVR_magazine": "BTCTKVR Magazine", "survey_opt_submit": "Submit", "survey_opt_dismiss": "Dismiss", "survey_opt_other_specify": "Other (Specify)", diff --git a/src/locales/strings/ko.json b/src/locales/strings/ko.json index 58509941bb6..a3c64058c7a 100644 --- a/src/locales/strings/ko.json +++ b/src/locales/strings/ko.json @@ -80,7 +80,7 @@ "warning_scam_message_yes_1s": "Please proceed with caution! Assistance with account creation has the potential for fraud. Users should never share passwords or private keys. Social media and chat platforms have been involved in attacks. Do not send cryptocurrency to strangers. If you believe you’re being taken advantage of, please contact our support team at %1$s.", "warning_token_code_override_2s": "The entered contract address differs from the contract address of built-in token %1$s. Please proceed with caution and verify the contract is legitimate as use of this token can result in loss of funds. If you have questions about this feature or contract please contact %2$s.", "warning_token_exists_1s": "The entered token already exists as a built-in token %1$s", - "warning_battery_saver": "Battery Saver mode detected. Balances and transactions may be inaccurate", + "warning_battery_saver": "Battery Saver Detected! Balances may not update. For the best experience, please turn off battery saver mode.", "alert_dropdown_alert": "Alert! ", "alert_dropdown_warning": "Warning! ", "azteco_success": "You've redeemed an Azteco bitcoin card. Funds should arrive shortly.", @@ -391,7 +391,8 @@ "settings_monero_info": "Edge uses Monero light wallet servers provided by MyMonero. These servers hold the private view key, which they use to scan for transactions. For enhanced privacy, you can run your own Monero light wallet server.", "settings_hours": "시간", "settings_minutes": "분", - "settings_modal_export_logs_message": "You may add any additional notes here, and select whether to share logs with Edge, or export logs to your device.", + "settings_modal_export_logs_warning": "Do not enter seeds, private keys, password or other sensitive information", + "settings_modal_export_logs_directions": "Select whether to share logs with Edge or export logs to your device.", "settings_modal_clear_logs_message": "Are you sure you want to clear all logs on this device?", "settings_modal_clear_logs_success": "Logs have been cleared", "settings_modal_send_logs_success": "기록이 전송되었습니다.", @@ -742,8 +743,11 @@ "password": "암호", "buy_crypto_modal_title": "월릿이 비어있음", "buy_crypto_modal_message": "고객님의 %s 월릿은 현재 비어있는 상태입니다. %s 를 구매하시거나 다른 가상화폐를 %s 로 교환하시겠습니까?", + "buy_crypto_modal_message_no_exchange_s": "Your %s wallet is empty. Would you like to buy %s?", "buy_parent_crypto_modal_message_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", "buy_parent_crypto_modal_message_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", + "buy_parent_crypto_modal_message_no_exchange_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s?", + "buy_parent_crypto_modal_message_no_exchange_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s?", "buy_crypto_decline": "현재 불가한 동작입니다.", "buy_1s": "Buy %1$s", "sell_1s": "Sell %1$s", @@ -1389,6 +1393,7 @@ "survey_opt_in_person_event": "In-person Event", "survey_opt_personal_referral": "Personal Referral", "survey_opt_article": "Article", + "survey_opt_BTCTKVR_magazine": "BTCTKVR Magazine", "survey_opt_submit": "Submit", "survey_opt_dismiss": "Dismiss", "survey_opt_other_specify": "Other (Specify)", diff --git a/src/locales/strings/pt.json b/src/locales/strings/pt.json index 2919b131bf0..9f251311bc5 100644 --- a/src/locales/strings/pt.json +++ b/src/locales/strings/pt.json @@ -80,7 +80,7 @@ "warning_scam_message_yes_1s": "Please proceed with caution! Assistance with account creation has the potential for fraud. Users should never share passwords or private keys. Social media and chat platforms have been involved in attacks. Do not send cryptocurrency to strangers. If you believe you’re being taken advantage of, please contact our support team at %1$s.", "warning_token_code_override_2s": "O endereço do contrato informado difere do endereço do contrato do token %1$sincorporado. Proceda com cuidado e verifique se o contrato é legítimo, já que o uso desse token pode resultar em perda de fundos. Se você tiver dúvidas sobre este recurso ou contrato, entre em contato com %2$s.", "warning_token_exists_1s": "O token informado já existe como um token interno %1$s", - "warning_battery_saver": "Battery Saver mode detected. Balances and transactions may be inaccurate", + "warning_battery_saver": "Battery Saver Detected! Balances may not update. For the best experience, please turn off battery saver mode.", "alert_dropdown_alert": "Alerta! ", "alert_dropdown_warning": "Atenção! ", "azteco_success": "Você resgatou um cartão bitcoin Azteco. Os fundos devem chegar em breve.", @@ -391,7 +391,8 @@ "settings_monero_info": "Edge utiliza servidores Monero light wallet fornecidos pela MyMonero. Esses servidores guardam a sua private view key, que eles usam para escanear transações. Para maior privacidade, você pode usar o seu o próprio servidor Monero Light Wallet.", "settings_hours": "Hora(s)", "settings_minutes": "Minuto(s)", - "settings_modal_export_logs_message": "Pode adicionar quaisquer notas adicionais aqui e selecionar se deseja compartilhar logs com a Edge ou exportar logs para o seu dispositivo.", + "settings_modal_export_logs_warning": "Do not enter seeds, private keys, password or other sensitive information", + "settings_modal_export_logs_directions": "Select whether to share logs with Edge or export logs to your device.", "settings_modal_clear_logs_message": "Você tem certeza que deseja limpar todos os logs neste dispositivo?", "settings_modal_clear_logs_success": "Os Logs foram apagados", "settings_modal_send_logs_success": "Logs foram enviados", @@ -742,8 +743,11 @@ "password": "Senha", "buy_crypto_modal_title": "Carteira Vazia", "buy_crypto_modal_message": "A sua carteira %s está vazia. Gostaria de comprar %s ou trocar outra criptomoeda por %s?", + "buy_crypto_modal_message_no_exchange_s": "Your %s wallet is empty. Would you like to buy %s?", "buy_parent_crypto_modal_message_2s": "%1$s%2$s é necessário para enviar esta transação. Gostaria de comprar %2$s ou trocar outra criptomoeda por %2$s?", "buy_parent_crypto_modal_message_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", + "buy_parent_crypto_modal_message_no_exchange_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s?", + "buy_parent_crypto_modal_message_no_exchange_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s?", "buy_crypto_decline": "Agora não", "buy_1s": "Buy %1$s", "sell_1s": "Sell %1$s", @@ -1389,6 +1393,7 @@ "survey_opt_in_person_event": "In-person Event", "survey_opt_personal_referral": "Personal Referral", "survey_opt_article": "Article", + "survey_opt_BTCTKVR_magazine": "BTCTKVR Magazine", "survey_opt_submit": "Submit", "survey_opt_dismiss": "Dismiss", "survey_opt_other_specify": "Other (Specify)", diff --git a/src/locales/strings/ru.json b/src/locales/strings/ru.json index 462c298b38d..aea18aa58d1 100644 --- a/src/locales/strings/ru.json +++ b/src/locales/strings/ru.json @@ -80,7 +80,7 @@ "warning_scam_message_yes_1s": "Please proceed with caution! Assistance with account creation has the potential for fraud. Users should never share passwords or private keys. Social media and chat platforms have been involved in attacks. Do not send cryptocurrency to strangers. If you believe you’re being taken advantage of, please contact our support team at %1$s.", "warning_token_code_override_2s": "The entered contract address differs from the contract address of built-in token %1$s. Please proceed with caution and verify the contract is legitimate as use of this token can result in loss of funds. If you have questions about this feature or contract please contact %2$s.", "warning_token_exists_1s": "The entered token already exists as a built-in token %1$s", - "warning_battery_saver": "Battery Saver mode detected. Balances and transactions may be inaccurate", + "warning_battery_saver": "Battery Saver Detected! Balances may not update. For the best experience, please turn off battery saver mode.", "alert_dropdown_alert": "Внимание! ", "alert_dropdown_warning": "Внимание! ", "azteco_success": "You've redeemed an Azteco bitcoin card. Funds should arrive shortly.", @@ -391,7 +391,8 @@ "settings_monero_info": "Edge uses Monero light wallet servers provided by MyMonero. These servers hold the private view key, which they use to scan for transactions. For enhanced privacy, you can run your own Monero light wallet server.", "settings_hours": "Часов", "settings_minutes": "Минут", - "settings_modal_export_logs_message": "You may add any additional notes here, and select whether to share logs with Edge, or export logs to your device.", + "settings_modal_export_logs_warning": "Do not enter seeds, private keys, password or other sensitive information", + "settings_modal_export_logs_directions": "Select whether to share logs with Edge or export logs to your device.", "settings_modal_clear_logs_message": "Are you sure you want to clear all logs on this device?", "settings_modal_clear_logs_success": "Logs have been cleared", "settings_modal_send_logs_success": "Журналы отправлены", @@ -742,8 +743,11 @@ "password": "Пароль", "buy_crypto_modal_title": "Кошелек пуст", "buy_crypto_modal_message": "Ваш кошелёк %s пуст. Хотите купить %s или обменять что то для получения %s?", + "buy_crypto_modal_message_no_exchange_s": "Your %s wallet is empty. Would you like to buy %s?", "buy_parent_crypto_modal_message_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", "buy_parent_crypto_modal_message_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", + "buy_parent_crypto_modal_message_no_exchange_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s?", + "buy_parent_crypto_modal_message_no_exchange_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s?", "buy_crypto_decline": "Не в этот раз", "buy_1s": "Buy %1$s", "sell_1s": "Sell %1$s", @@ -1389,6 +1393,7 @@ "survey_opt_in_person_event": "In-person Event", "survey_opt_personal_referral": "Personal Referral", "survey_opt_article": "Article", + "survey_opt_BTCTKVR_magazine": "BTCTKVR Magazine", "survey_opt_submit": "Submit", "survey_opt_dismiss": "Dismiss", "survey_opt_other_specify": "Other (Specify)", diff --git a/src/locales/strings/vi.json b/src/locales/strings/vi.json index 5985d42f31d..cca64c00791 100644 --- a/src/locales/strings/vi.json +++ b/src/locales/strings/vi.json @@ -80,7 +80,7 @@ "warning_scam_message_yes_1s": "Please proceed with caution! Assistance with account creation has the potential for fraud. Users should never share passwords or private keys. Social media and chat platforms have been involved in attacks. Do not send cryptocurrency to strangers. If you believe you’re being taken advantage of, please contact our support team at %1$s.", "warning_token_code_override_2s": "The entered contract address differs from the contract address of built-in token %1$s. Please proceed with caution and verify the contract is legitimate as use of this token can result in loss of funds. If you have questions about this feature or contract please contact %2$s.", "warning_token_exists_1s": "The entered token already exists as a built-in token %1$s", - "warning_battery_saver": "Battery Saver mode detected. Balances and transactions may be inaccurate", + "warning_battery_saver": "Battery Saver Detected! Balances may not update. For the best experience, please turn off battery saver mode.", "alert_dropdown_alert": "Alert! ", "alert_dropdown_warning": "Warning! ", "azteco_success": "You've redeemed an Azteco bitcoin card. Funds should arrive shortly.", @@ -391,7 +391,8 @@ "settings_monero_info": "Edge uses Monero light wallet servers provided by MyMonero. These servers hold the private view key, which they use to scan for transactions. For enhanced privacy, you can run your own Monero light wallet server.", "settings_hours": "Giờ(s)", "settings_minutes": "Phút(s)", - "settings_modal_export_logs_message": "You may add any additional notes here, and select whether to share logs with Edge, or export logs to your device.", + "settings_modal_export_logs_warning": "Do not enter seeds, private keys, password or other sensitive information", + "settings_modal_export_logs_directions": "Select whether to share logs with Edge or export logs to your device.", "settings_modal_clear_logs_message": "Are you sure you want to clear all logs on this device?", "settings_modal_clear_logs_success": "Logs have been cleared", "settings_modal_send_logs_success": "Các bản ghi đã được gửi", @@ -742,8 +743,11 @@ "password": "Mật khẩu", "buy_crypto_modal_title": "Ví trống", "buy_crypto_modal_message": "Ví %s của bạn trống. Bạn có muốn mua %s hay chuyển đổi crypto khác vào ví?", + "buy_crypto_modal_message_no_exchange_s": "Your %s wallet is empty. Would you like to buy %s?", "buy_parent_crypto_modal_message_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", "buy_parent_crypto_modal_message_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", + "buy_parent_crypto_modal_message_no_exchange_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s?", + "buy_parent_crypto_modal_message_no_exchange_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s?", "buy_crypto_decline": "Không phải lúc này", "buy_1s": "Buy %1$s", "sell_1s": "Sell %1$s", @@ -1389,6 +1393,7 @@ "survey_opt_in_person_event": "In-person Event", "survey_opt_personal_referral": "Personal Referral", "survey_opt_article": "Article", + "survey_opt_BTCTKVR_magazine": "BTCTKVR Magazine", "survey_opt_submit": "Submit", "survey_opt_dismiss": "Dismiss", "survey_opt_other_specify": "Other (Specify)", diff --git a/src/locales/strings/zh.json b/src/locales/strings/zh.json index 6638a539d9c..752bdddb479 100644 --- a/src/locales/strings/zh.json +++ b/src/locales/strings/zh.json @@ -80,7 +80,7 @@ "warning_scam_message_yes_1s": "Please proceed with caution! Assistance with account creation has the potential for fraud. Users should never share passwords or private keys. Social media and chat platforms have been involved in attacks. Do not send cryptocurrency to strangers. If you believe you’re being taken advantage of, please contact our support team at %1$s.", "warning_token_code_override_2s": "The entered contract address differs from the contract address of built-in token %1$s. Please proceed with caution and verify the contract is legitimate as use of this token can result in loss of funds. If you have questions about this feature or contract please contact %2$s.", "warning_token_exists_1s": "The entered token already exists as a built-in token %1$s", - "warning_battery_saver": "Battery Saver mode detected. Balances and transactions may be inaccurate", + "warning_battery_saver": "Battery Saver Detected! Balances may not update. For the best experience, please turn off battery saver mode.", "alert_dropdown_alert": "Alert! ", "alert_dropdown_warning": "Warning! ", "azteco_success": "You've redeemed an Azteco bitcoin card. Funds should arrive shortly.", @@ -391,7 +391,8 @@ "settings_monero_info": "Edge uses Monero light wallet servers provided by MyMonero. These servers hold the private view key, which they use to scan for transactions. For enhanced privacy, you can run your own Monero light wallet server.", "settings_hours": "小时", "settings_minutes": "分钟", - "settings_modal_export_logs_message": "You may add any additional notes here, and select whether to share logs with Edge, or export logs to your device.", + "settings_modal_export_logs_warning": "Do not enter seeds, private keys, password or other sensitive information", + "settings_modal_export_logs_directions": "Select whether to share logs with Edge or export logs to your device.", "settings_modal_clear_logs_message": "Are you sure you want to clear all logs on this device?", "settings_modal_clear_logs_success": "Logs have been cleared", "settings_modal_send_logs_success": "已发送日志", @@ -742,8 +743,11 @@ "password": "密码", "buy_crypto_modal_title": "钱包是空的", "buy_crypto_modal_message": "您的 %s 钱包现在是空的。您想购买 %s 或将另一个加密产品兑转换成 %s？", + "buy_crypto_modal_message_no_exchange_s": "Your %s wallet is empty. Would you like to buy %s?", "buy_parent_crypto_modal_message_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", "buy_parent_crypto_modal_message_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s or exchange another crypto into %2$s?", + "buy_parent_crypto_modal_message_no_exchange_2s": "%1$s%2$s is required to send this transaction. Would you like to buy %2$s?", + "buy_parent_crypto_modal_message_no_exchange_3s": "%1$s%2$s (on %3$s) is required to send this transaction. Would you like to buy %2$s?", "buy_crypto_decline": "不是在这个时候", "buy_1s": "Buy %1$s", "sell_1s": "Sell %1$s", @@ -1389,6 +1393,7 @@ "survey_opt_in_person_event": "In-person Event", "survey_opt_personal_referral": "Personal Referral", "survey_opt_article": "Article", + "survey_opt_BTCTKVR_magazine": "BTCTKVR Magazine", "survey_opt_submit": "Submit", "survey_opt_dismiss": "Dismiss", "survey_opt_other_specify": "Other (Specify)", diff --git a/src/plugins/gui/providers/ProviderSupportStore.ts b/src/plugins/gui/providers/ProviderSupportStore.ts new file mode 100644 index 00000000000..503b62c43fd --- /dev/null +++ b/src/plugins/gui/providers/ProviderSupportStore.ts @@ -0,0 +1,347 @@ +import { asEither, asJSON, asString, asValue, uncleaner } from 'cleaners' +import { EdgeTokenId } from 'edge-core-js' + +import { asObjectIn, asObjectInOrTrue } from '../../../util/cleaners' +import { asFiatPaymentType, FiatPaymentType } from '../fiatPluginTypes' +import { FiatProviderAssetMap } from '../fiatProviderTypes' + +// '*' means 'all'; apply to all specified keys +// '' means 'any'; apply to all keys (even ones not specified) +export type SpecialQualifier = '*' | '' + +export type DirectionKey = 'buy' | 'sell' | SpecialQualifier +export type RegionKey = string // "US" | "US:CA" | "UK" | "US:*" | "*" | "" +export type FiatKey = string // "USD" | "GBP" | "*" | "" +export type PaymentKey = FiatPaymentType | SpecialQualifier +export type CryptoKey = string // "bitcoin:null" | "ethereum:null" | "ethereum:" + +// The internal in-memory data structure representing the support-tree +// for each provider +type InternalTree = Map +// The tree storing "other info" for each crypto currency +type CryptoAssetInfoTree = Map +// The tree storing "other info" for each fiat currency +type FiatAssetInfoTree = Map + +// The JSON-serializable object structure for the provider support tree +export type ProviderSupportObject = { + [direction in DirectionKey]?: + | true + | { + [region in RegionKey]?: + | true + | { + [fiat in FiatKey]?: + | true + | { + [payment in PaymentKey]?: + | true + | { + [crypto in CryptoKey]?: true + } + } + } + } +} + +// Cleaner for serializing/deserializing the provider support object: +const asSpecialQualifier = asValue('*', '') +const asDirectionKeyPartial = asValue('buy', 'sell') // Necessary to satisfy type inference +const asDirectionKey = asEither(asDirectionKeyPartial, asSpecialQualifier) +const asRegionKey = asString +const asFiatKey = asString +const asPaymentKey = asEither(asFiatPaymentType, asSpecialQualifier) +const asCryptoKey = asString +const asProviderSupportObject = asJSON( + asObjectIn( + asDirectionKey, + asObjectInOrTrue(asRegionKey, asObjectInOrTrue(asFiatKey, asObjectInOrTrue(asPaymentKey, asObjectInOrTrue(asCryptoKey, asValue(true))))) + ) +) +const wasProviderSupportObject = uncleaner(asProviderSupportObject) + +interface ProviderSupportAddApi { + direction: (key: DirectionKey) => { + region: (key: RegionKey) => { + fiat: (key: FiatKey) => { + payment: (key: PaymentKey) => { + crypto: (key: CryptoKey) => void + } + } + } + } +} + +interface ProviderSupportQueryApi { + direction: (key: DirectionKey) => { + supported: boolean + region: (key: RegionKey) => { + supported: boolean + fiat: (key: FiatKey) => { + supported: boolean + payment: (key: PaymentKey) => { + supported: boolean + crypto: (key: CryptoKey) => { + supported: boolean + } + } + } + } + } +} + +export interface FiatProviderAssetMapQuery { + direction: DirectionKey + region: RegionKey + payment: PaymentKey +} + +export class ProviderSupportStore { + readonly providerId: string + readonly add: ProviderSupportAddApi + readonly is: ProviderSupportQueryApi + + private readonly supportTree: InternalTree = new Map() + private readonly cryptoAssetInfo: CryptoAssetInfoTree = new Map() + private readonly fiatAssetInfo: FiatAssetInfoTree = new Map() + + constructor(providerId: string) { + this.providerId = providerId + this.add = makeAddApi(this.supportTree, ['direction', 'region', 'fiat', 'payment', 'crypto']) as any + this.is = makeQueryApi([this.supportTree], ['direction', 'region', 'fiat', 'payment', 'crypto']) as any + } + + addCryptoInfo(crypto: CryptoKey, otherInfo: unknown): void { + this.cryptoAssetInfo.set(crypto, otherInfo) + } + + addFiatInfo(fiat: FiatKey, otherInfo: unknown): void { + this.fiatAssetInfo.set(fiat, otherInfo) + } + + getCryptoInfo(crypto: CryptoKey): unknown { + return this.cryptoAssetInfo.get(crypto) + } + + getFiatInfo(fiat: FiatKey): unknown { + return this.fiatAssetInfo.get(fiat) + } + + getFiatProviderAssetMap(query: FiatProviderAssetMapQuery): FiatProviderAssetMap { + const fiatProviderAssetMap: FiatProviderAssetMap = { + providerId: this.providerId, + crypto: {}, + fiat: {} + } + + const regionNodes = queryNodes([this.supportTree], query.direction) + if (regionNodes.length === 0) return fiatProviderAssetMap + + const fiatNodes = queryNodes(regionNodes, query.region) + if (fiatNodes.length === 0) return fiatProviderAssetMap + + for (const fiatNode of fiatNodes) { + for (const fiatKey of fiatNode.keys()) { + const paymentNodes = fiatNode.get(fiatKey) + if (paymentNodes == null) continue + const result = queryNodes([paymentNodes], query.payment) + + // Skip if no payment matches: + if (result.length === 0) continue + + if (fiatKey === '*') { + // Add all fiat keys to fiat map: + for (const fiatKey of fiatNode.keys()) { + // Except for qualifiers: + if (fiatKey === '*') continue + fiatProviderAssetMap.fiat[fiatKey] = true + } + } else { + // Add fiat to fiat map: + fiatProviderAssetMap.fiat[fiatKey] = true + } + } + } + + // Fiat tree must had no payments: + const paymentNodes = queryNodes(fiatNodes, '*') + const cryptoNodes = queryNodes(paymentNodes, query.payment) + + const tokenIdMap: { [pluginId: string]: Set } = {} + for (const cryptoNode of cryptoNodes) { + for (const cryptoKey of cryptoNode.keys()) { + if (cryptoKey === '*') continue + const [pluginId, tokenIdString] = cryptoKey.split(':') + const tokenId: EdgeTokenId = tokenIdString === 'null' ? null : tokenIdString + + // Add fiat to crypto array for pluginId: + ;(tokenIdMap[pluginId] = tokenIdMap[pluginId] ?? new Set()).add(tokenId) + } + } + for (const [pluginId, tokenSet] of Object.entries(tokenIdMap)) { + fiatProviderAssetMap.crypto[pluginId] = Array.from(tokenSet).map(tokenId => ({ tokenId })) + } + + return fiatProviderAssetMap + } + + fromJson(json: string): void { + const obj = asProviderSupportObject(json) + this.fromJsonObject(obj) + } + + fromJsonObject(obj: ProviderSupportObject): void { + this.supportTree.clear() + fromJsonObject(this.supportTree, obj) + } + + toJson(): string { + return wasProviderSupportObject(this.toJsonObject()) + } + + toJsonObject(): ProviderSupportObject { + const obj: any = {} + return toJsonObject(obj, this.supportTree) + } +} + +function toJsonObject(obj: any, tree: InternalTree): ProviderSupportObject { + for (const [key, node] of tree.entries()) { + if (node.size === 0) { + obj[key] = true + continue + } + // Value is a nested object: + obj[key] = {} + toJsonObject(obj[key], node) + } + return obj +} + +function fromJsonObject(tree: InternalTree, obj: any): void { + for (const [key, value] of Object.entries(obj)) { + // Create node if doesn't exit: + const node = tree.get(key) ?? new Map() + tree.set(key, node) + // Recurse if value is an object: + if (typeof value === 'object') { + fromJsonObject(node, value) + } + } +} + +interface GenericAddApi { + [method: string]: (key: string) => GenericAddApi | undefined +} +function makeAddApi(tree: InternalTree, levels: string[], level: number = 0): GenericAddApi { + const method = levels[level] + return { + [method]: (key: string) => { + // Create node if it doesn't exist: + const node = tree.get(key) ?? new Map() + tree.set(key, node) + // Return more API if not at the end of the levels: + if (level < levels.length - 1) { + return makeAddApi(node, levels, level + 1) + } + } + } +} + +interface GenericQueryApi { + supported?: boolean + fn?: (key: string) => GenericQueryApi | undefined +} +function makeQueryApi(trees: InternalTree[], levels: string[], level: number = 0, supported?: boolean): GenericQueryApi { + const method = levels[level] as 'fn' // this is the magical hack to make TypeScript happy + return { + supported, + [method]: (query: string) => { + // Find all matching nodes: + const nextTrees: InternalTree[] = queryNodes(trees, query) + const supported = nextTrees.length !== 0 + + // Return more API if not at the end of the levels: + if (level < levels.length - 1) { + return makeQueryApi(nextTrees, levels, level + 1, supported) + } else { + return { supported } + } + } + } +} + +/** + * This is used to query the direct child nodes of a particular set of nodes. + * It follows the string matching rules respecting the special qualifiers '*' and ''. + * + * @param nodes An array of nodes to query against + * @param query A query string used to search for nested nodes (e.g. 'US:CA', 'US:*', '*', etc) + * @returns an array of nodes that match the query + */ +export function queryNodes(nodes: InternalTree[], query: string): InternalTree[] { + let matchFound = false + const result: InternalTree[] = [] + + const matchAnyNodes: InternalTree[] = [] + const matchAllNodes: InternalTree[] = [] + + // Handle regular nodes: + for (const node of nodes) { + for (const entry of node.entries()) { + const [nodeKey, childNodes] = entry + + // Ignore special nodes + if (nodeKey === '') { + matchAnyNodes.push(childNodes) + continue + } + if (nodeKey === '*') { + matchAllNodes.push(childNodes) + if (keyMatchesQuery(nodeKey, query)) { + matchFound = true + } + continue + } + + if (keyMatchesQuery(nodeKey, query)) { + matchFound = true + result.push(childNodes) + } else if (keyMatchesQuery(query, nodeKey)) { + matchAllNodes.push(childNodes) + } + } + } + + // Handle special nodes: + for (const childNodes of matchAnyNodes) { + result.push(childNodes) + } + if (matchFound) { + for (const childNodes of matchAllNodes) { + result.push(childNodes) + } + } + + return result +} + +function keyMatchesQuery(key: string, query: string): boolean { + const [keyGroup, keySub] = key.split(':') + const [queryGroup, subQuery] = query.split(':') + + // Match-all: + if (queryGroup === '*') return true + + // Match group: + if (queryGroup === keyGroup) { + // Exact-match: + if (subQuery === keySub) return true + // Group-sub match-all: + if (subQuery === '*') return true + // Group-sub match-any: + if (keySub == null || keySub === '') return true + } + + return false +} diff --git a/src/plugins/gui/providers/bityProvider.ts b/src/plugins/gui/providers/bityProvider.ts index fdd3ab3bbb5..82de2248589 100644 --- a/src/plugins/gui/providers/bityProvider.ts +++ b/src/plugins/gui/providers/bityProvider.ts @@ -18,10 +18,10 @@ import { FiatProviderFactory, FiatProviderFactoryParams, FiatProviderGetQuoteParams, - FiatProviderGetTokenId, FiatProviderQuote } from '../fiatProviderTypes' -import { addTokenToArray } from '../util/providerUtils' +import { makeCheckDue } from './common' +import { ProviderSupportStore } from './ProviderSupportStore' const providerId = 'bity' const storeId = 'com.bity' @@ -32,11 +32,6 @@ const supportEmail = 'support_edge@bity.com' const supportedPaymentType: FiatPaymentType = 'sepa' const partnerFee = 0.005 -const allowedCurrencyCodes: Record = { - buy: { providerId, fiat: {}, crypto: {} }, - sell: { providerId, fiat: {}, crypto: {} } -} - const noKycCurrencyCodes: Record = { buy: { providerId, @@ -58,38 +53,38 @@ const noKycCurrencyCodes: Record = { } } -const allowedCountryCodes: { readonly [code: string]: boolean } = { - AT: true, - BE: true, - BG: true, - CH: true, - CZ: true, - DK: true, - EE: true, - FI: true, - FR: true, - DE: true, - GR: true, - HU: true, - IE: true, // Ireland - IT: true, - LV: true, - LT: true, - LU: true, - NL: true, - PL: true, - PT: true, - RO: true, - SK: true, - SI: true, - ES: true, - SE: true, - HR: true, - LI: true, - NO: true, - SM: true, - GB: true -} +const supportedRegionCodes = [ + 'AT', + 'BE', + 'BG', + 'CH', + 'CZ', + 'DK', + 'EE', + 'FI', + 'FR', + 'DE', + 'GR', + 'HU', + 'IE', // Ireland + 'IT', + 'LV', + 'LT', + 'LU', + 'NL', + 'PL', + 'PT', + 'RO', + 'SK', + 'SI', + 'ES', + 'SE', + 'HR', + 'LI', + 'NO', + 'SM', + 'GB' +] const CURRENCY_PLUGINID_MAP: StringMap = { BTC: 'bitcoin', @@ -370,52 +365,98 @@ export const bityProvider: FiatProviderFactory = { const { apiKeys, getTokenId } = params const clientId = asBityApiKeys(apiKeys).clientId + const isCheckDue = makeCheckDue(1000 * 60 * 60) // 1 hour + const supportedAssets = new ProviderSupportStore(providerId) + + // Bit supports buy and sell directions + supportedAssets.add.direction('buy') + supportedAssets.add.direction('sell') + + // Bity supports regions for all directions + supportedRegionCodes.forEach(region => { + supportedAssets.add.direction('*').region(region) + }) + + // Add supported payment types + supportedAssets.add.direction('*').region('*').fiat('*').payment(supportedPaymentType) + const out: FiatProvider = { providerId, partnerIcon, pluginDisplayName, - getSupportedAssets: async ({ direction, paymentTypes }): Promise => { - // Return nothing if 'sepa' is not included in the props - if (!paymentTypes.includes(supportedPaymentType)) throw new FiatProviderError({ providerId, errorType: 'paymentUnsupported' }) - - const response = await fetch(`https://exchange.api.bity.com/v2/currencies`).catch(e => undefined) - if (response == null || !response.ok) { - console.error(`Bity getSupportedAssets response error: ${await response?.text()}`) - return allowedCurrencyCodes[direction] + getSupportedAssets: async ({ direction, paymentTypes, regionCode }): Promise => { + // Only one payment type is supported for getSupportedAssets query + const payment = paymentTypes[0] + // Region code is a combination of country and state/province + const region = regionCode.stateProvinceCode == null ? regionCode.countryCode : `${regionCode.countryCode}:${regionCode.stateProvinceCode}` + + // Check region support + if (!supportedAssets.is.direction('*').region(region).supported) { + throw new FiatProviderError({ providerId, errorType: 'regionRestricted' }) } - - const result = await response.json() - let bityCurrencies: BityCurrency[] = [] - try { - bityCurrencies = asBityCurrencyResponse(result).currencies - } catch (error: any) { - console.error(error) - return allowedCurrencyCodes[direction] + // Check payment type support + if (!supportedAssets.is.direction('*').region(region).fiat('*').payment(payment).supported) { + throw new FiatProviderError({ providerId, errorType: 'paymentUnsupported' }) } - for (const currency of bityCurrencies) { - let isAddCurrencySuccess = false - if (currency.tags.length === 1 && currency.tags[0] === 'fiat') { - allowedCurrencyCodes[direction].fiat['iso:' + currency.code.toUpperCase()] = currency - isAddCurrencySuccess = true - } else if (currency.tags.includes('crypto')) { - // Bity reports cryptos with a set of multiple tags such that there is - // overlap, such as USDC being 'crypto', 'ethereum', 'erc20'. - if (currency.tags.includes('erc20') && currency.tags.includes('ethereum')) { - // ETH tokens - addToAllowedCurrencies(direction, getTokenId, 'ethereum', currency, currency.code) - isAddCurrencySuccess = true - } else if (Object.keys(CURRENCY_PLUGINID_MAP).includes(currency.code)) { - // Mainnet currencies - addToAllowedCurrencies(direction, getTokenId, CURRENCY_PLUGINID_MAP[currency.code], currency, currency.code) - isAddCurrencySuccess = true - } + + if (isCheckDue()) { + const response = await fetch(`https://exchange.api.bity.com/v2/currencies`).catch(e => undefined) + if (response == null || !response.ok) { + console.error(`Bity getSupportedAssets response error: ${await response?.text()}`) + isCheckDue(true) + return supportedAssets.getFiatProviderAssetMap({ + direction, + region, + payment + }) } - // Unhandled combination not caught by cleaner. Skip to be safe. - if (!isAddCurrencySuccess) console.log('Unhandled Bity supported currency: ', currency) + const result = await response.json() + let bityCurrencies: BityCurrency[] = [] + try { + bityCurrencies = asBityCurrencyResponse(result).currencies + } catch (error: any) { + console.error(error) + return supportedAssets.getFiatProviderAssetMap({ + direction, + region, + payment + }) + } + + for (const currency of bityCurrencies) { + if (currency.tags.length === 1 && currency.tags[0] === 'fiat') { + const fiatCurrencyCode = 'iso:' + currency.code.toUpperCase() + supportedAssets.add.direction('*').region('*').fiat(fiatCurrencyCode).payment('*') + supportedAssets.addFiatInfo(fiatCurrencyCode, currency) + } else if (currency.tags.includes('crypto')) { + // Bity reports cryptos with a set of multiple tags such that there is + // overlap, such as USDC being 'crypto', 'ethereum', 'erc20'. + const pluginId = currency.tags.includes('erc20') && currency.tags.includes('ethereum') ? 'ethereum' : CURRENCY_PLUGINID_MAP[currency.code] + if (pluginId == null) continue + + const tokenId = getTokenId(pluginId, currency.code) + if (tokenId === undefined) continue + + // If token is not in the no-KYC list do not add it + const list = noKycCurrencyCodes[direction].crypto[pluginId] + if (list == null || !list.some(t => t.tokenId === tokenId)) { + continue + } + + const crypto = `${pluginId}:${tokenId}` + supportedAssets.add.direction('*').region('*').fiat('*').payment('*').crypto(crypto) + supportedAssets.addCryptoInfo(crypto, currency) + } else { + // Unhandled combination not caught by cleaner. Skip to be safe. + console.log('Unhandled Bity supported currency: ', currency) + } + } } - return allowedCurrencyCodes[direction] + const assetMap = supportedAssets.getFiatProviderAssetMap({ direction, region, payment }) + + return assetMap }, getQuote: async (params: FiatProviderGetQuoteParams): Promise => { const { @@ -430,12 +471,17 @@ export const bityProvider: FiatProviderFactory = { displayCurrencyCode } = params const isBuy = direction === 'buy' - if (!allowedCountryCodes[regionCode.countryCode]) throw new FiatProviderError({ providerId, errorType: 'regionRestricted', displayCurrencyCode }) - if (!paymentTypes.includes(supportedPaymentType)) throw new FiatProviderError({ providerId, errorType: 'paymentUnsupported' }) - const bityCurrency = allowedCurrencyCodes[direction].crypto[pluginId].find(t => t.tokenId === tokenId) - const cryptoCurrencyObj = asBityCurrency(bityCurrency?.otherInfo) - const fiatCurrencyObj = asBityCurrency(allowedCurrencyCodes[direction].fiat[fiatCurrencyCode]) + if (!supportedAssets.is.direction(direction).region(regionCode.countryCode).supported) + throw new FiatProviderError({ providerId, errorType: 'regionRestricted', displayCurrencyCode }) + if (!supportedAssets.is.direction(direction).region(regionCode.countryCode).fiat('*').payment(supportedPaymentType).supported) + throw new FiatProviderError({ providerId, errorType: 'regionRestricted', displayCurrencyCode }) + + const cryptoOtherInfo = supportedAssets.getCryptoInfo(`${pluginId}:${tokenId}`) + const cryptoCurrencyObj = asBityCurrency(cryptoOtherInfo) + + const fiatOtherInfo = supportedAssets.getFiatInfo(fiatCurrencyCode) + const fiatCurrencyObj = asBityCurrency(fiatOtherInfo) if (cryptoCurrencyObj == null || fiatCurrencyObj == null) throw new Error('Bity: Could not query supported currencies') const cryptoCode = cryptoCurrencyObj.code @@ -639,27 +685,6 @@ export const bityProvider: FiatProviderFactory = { } } -const addToAllowedCurrencies = ( - direction: FiatDirection, - getTokenId: FiatProviderGetTokenId, - pluginId: string, - currency: BityCurrency, - currencyCode: string -) => { - if (allowedCurrencyCodes[direction].crypto[pluginId] == null) allowedCurrencyCodes[direction].crypto[pluginId] = [] - const tokenId = getTokenId(pluginId, currencyCode) - if (tokenId === undefined) return - - const tokens = allowedCurrencyCodes[direction].crypto[pluginId] - - // If token is not in the no-KYC list do not add it - const list = noKycCurrencyCodes[direction].crypto[pluginId] - if (list == null || !list.some(t => t.tokenId === tokenId)) { - return - } - addTokenToArray({ tokenId, otherInfo: currency }, tokens) -} - /** * Transition to the send scene pre-populted with the payment address from the * previously opened/approved sell order diff --git a/src/plugins/gui/providers/common.ts b/src/plugins/gui/providers/common.ts index 5dcd5b0a6e1..ca146fb8333 100644 --- a/src/plugins/gui/providers/common.ts +++ b/src/plugins/gui/providers/common.ts @@ -106,3 +106,33 @@ export const isDailyCheckDue = (lastCheck: number): boolean => { const last = new Date(lastCheck).getTime() return now - last > DAILY_INTERVAL_MS } + +/** + * Checks if a interval has passed based on the last check time. If the check + * is due, the last check time is updated to the current time. + * + * @param interval the interval in milliseconds + * @returns a "check-due" function which will return `true` if the check interval + * has elapsed since the last check, `false` otherwise. Also allows for an override + * to reset the last check time. + */ +export const makeCheckDue = (interval: number) => { + let last: number = 0 + /** + * Checks if a interval has passed based on the last check time. If the check + * is due, the last check time is updated to the current time. + * Also allows for an override to reset the last check time. + */ + return function checkDue(override?: boolean): boolean { + if (override != null) { + last = override ? last : 0 + return override + } + const now = Date.now() + if (now - last > interval) { + last = now + return true + } + return false + } +} diff --git a/src/plugins/gui/providers/kadoProvider.ts b/src/plugins/gui/providers/kadoProvider.ts index 69d29f365c2..d0faea8100b 100644 --- a/src/plugins/gui/providers/kadoProvider.ts +++ b/src/plugins/gui/providers/kadoProvider.ts @@ -69,7 +69,7 @@ const CHAIN_ID_TO_PLUGIN_MAP: { [chainId: string]: string } = Object.entries(PLU const SUPPORTED_REGIONS: FiatProviderExactRegions = { US: { - notStateProvinces: ['FL', 'NY', 'TX'] + notStateProvinces: ['FL', 'LA', 'NY', 'TX'] } } diff --git a/src/plugins/gui/scenes/FiatPluginEnterAmountScene.tsx b/src/plugins/gui/scenes/FiatPluginEnterAmountScene.tsx index 2958f9eb684..594fae1a4e1 100644 --- a/src/plugins/gui/scenes/FiatPluginEnterAmountScene.tsx +++ b/src/plugins/gui/scenes/FiatPluginEnterAmountScene.tsx @@ -13,7 +13,9 @@ import { FilledTextInput } from '../../../components/themed/FilledTextInput' import { MainButton } from '../../../components/themed/MainButton' import { SceneHeader } from '../../../components/themed/SceneHeader' import { useHandler } from '../../../hooks/useHandler' +import { useWatch } from '../../../hooks/useWatch' import { lstrings } from '../../../locales/strings' +import { useSelector } from '../../../types/reactRedux' import { BuyTabSceneProps } from '../../../types/routerTypes' import { getPartnerIconUri } from '../../../util/CdnUris' import { FiatPluginEnterAmountResponse } from '../fiatPluginTypes' @@ -66,7 +68,7 @@ const defaultEnterAmountState: EnterAmountState = { export const FiatPluginEnterAmountScene = React.memo((props: Props) => { const theme = useTheme() const styles = getStyles(theme) - const { route } = props + const { route, navigation } = props const { disableInput, initState, @@ -85,6 +87,9 @@ export const FiatPluginEnterAmountScene = React.memo((props: Props) => { throw new Error('disableInput must be 1 or 2') } const lastUsed = React.useRef(1) + const account = useSelector(state => state.core.account) + const currentUsername = useWatch(account, 'username') + const initUsername = React.useRef(account.username) const stateManager = useStateManager({ ...defaultEnterAmountState, ...initState }) const { value1, value2, poweredBy, spinner1, spinner2, statusText } = stateManager.state @@ -102,6 +107,20 @@ export const FiatPluginEnterAmountScene = React.memo((props: Props) => { } }, [initState?.value1, convertValue, stateManager]) + // Handle light account backups initiated from this scene + useEffect(() => { + if (initUsername.current !== currentUsername) { + // TODO: Doesn't seem to be a straightforward way to update the stale + // fiat plugin with the new username state, so just go back to the + // `GuiPluginListScene` after upgrading. Ideally we somehow + // re-initialize the plugin and automatically end up back on this + // scene... + // For now, simply go back to the `GuiPluginListScene`. + navigation.goBack() + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [currentUsername]) + let headerIcon = null if (headerIconUri != null) { headerIcon = diff --git a/src/plugins/stake-plugins/generic/GenericStakePlugin.ts b/src/plugins/stake-plugins/generic/GenericStakePlugin.ts index 07b474c5dbc..38bc17fd5cf 100644 --- a/src/plugins/stake-plugins/generic/GenericStakePlugin.ts +++ b/src/plugins/stake-plugins/generic/GenericStakePlugin.ts @@ -1,4 +1,14 @@ -import { ChangeQuote, ChangeQuoteRequest, StakePlugin, StakePluginFactory, StakePolicy, StakePolicyFilter, StakePosition, StakePositionRequest } from '../types' +import { + ChangeQuote, + ChangeQuoteRequest, + filterStakePolicies, + StakePlugin, + StakePluginFactory, + StakePolicy, + StakePolicyFilter, + StakePosition, + StakePositionRequest +} from '../types' import { CardanoPooledKilnAdapterConfig, makeCardanoKilnAdapter } from './policyAdapters/CardanoKilnAdaptor' import { CoreumNativeSkateKitAdapterConfig, makeSkateKitAdapter } from './policyAdapters/CoreumStakeKitAdaptor' import { EthereumPooledKilnAdapterConfig, makeEthereumKilnAdapter } from './policyAdapters/EthereumKilnAdaptor' @@ -22,21 +32,7 @@ export const makeGenericStakePlugin = const instance: StakePlugin = { getPolicies(filter?: StakePolicyFilter): StakePolicy[] { - const { currencyCode, wallet } = filter ?? {} - let filteredPolicies: StakePolicy[] = policies - - if (wallet != null) { - filteredPolicies = filteredPolicies.filter(policy => - [...policy.rewardAssets, ...policy.stakeAssets].some(asset => asset.pluginId === wallet.currencyInfo.pluginId) - ) - } - if (currencyCode != null) { - filteredPolicies = filteredPolicies.filter(policy => - [...policy.rewardAssets, ...policy.stakeAssets].some(asset => asset.currencyCode === currencyCode) - ) - } - - return filteredPolicies + return filterStakePolicies(policies, filter) }, async fetchChangeQuote(request: ChangeQuoteRequest): Promise { diff --git a/src/plugins/stake-plugins/generic/policyAdapters/EthereumKilnAdaptor.ts b/src/plugins/stake-plugins/generic/policyAdapters/EthereumKilnAdaptor.ts index 6494d314b17..545dfaf91dc 100644 --- a/src/plugins/stake-plugins/generic/policyAdapters/EthereumKilnAdaptor.ts +++ b/src/plugins/stake-plugins/generic/policyAdapters/EthereumKilnAdaptor.ts @@ -68,8 +68,13 @@ export const makeEthereumKilnAdapter = (policyConfig: StakePolicyConfig txCount++ + let txCount: number | undefined + const nextNonce = async (): Promise => { + if (txCount == null) { + txCount = await walletSigner.getTransactionCount('pending') + } + return txCount++ + } const feeData = await provider.getFeeData() const maxFeePerGas = feeData.maxFeePerGas !== null ? feeData.maxFeePerGas : undefined @@ -113,7 +118,7 @@ export const makeEthereumKilnAdapter = (policyConfig: StakePolicyConfig txCount++ + let txCount: number | undefined + const nextNonce = async (): Promise => { + if (txCount == null) { + txCount = await walletSigner.getTransactionCount('pending') + } + return txCount++ + } const feeData = await provider.getFeeData() const maxFeePerGas = feeData.maxFeePerGas !== null ? feeData.maxFeePerGas : undefined @@ -109,7 +114,7 @@ export const makeGlifInfinityPoolAdapter = (policyConfig: StakePolicyConfig [...policy.rewardAssets, ...policy.stakeAssets].some(asset => asset.pluginId === wallet.currencyInfo.pluginId)) @@ -199,6 +200,9 @@ export const filterStakePolicies = (policies: StakePolicy[], filter?: StakePolic if (currencyCode != null) { out = out.filter(policy => [...policy.rewardAssets, ...policy.stakeAssets].some(asset => asset.currencyCode === currencyCode)) } + if (pluginId != null) { + out = out.filter(policy => [...policy.rewardAssets, ...policy.stakeAssets].some(asset => asset.pluginId === pluginId)) + } return out } diff --git a/src/plugins/stake-plugins/uniswapV2/uniV2Plugin.ts b/src/plugins/stake-plugins/uniswapV2/uniV2Plugin.ts index 0905f2e511d..b1dbd355e4c 100644 --- a/src/plugins/stake-plugins/uniswapV2/uniV2Plugin.ts +++ b/src/plugins/stake-plugins/uniswapV2/uniV2Plugin.ts @@ -13,10 +13,10 @@ export const makeUniV2StakePlugin = async (pluginId: string): Promise [...policy.rewardAssets, ...policy.stakeAssets].some(asset => asset.pluginId === wallet.currencyInfo.pluginId)) + if (pluginId != null) { + out = out.filter(policy => [...policy.rewardAssets, ...policy.stakeAssets].some(asset => asset.pluginId === pluginId)) } if (currencyCode != null) { out = out.filter(policy => [...policy.rewardAssets, ...policy.stakeAssets].some(asset => asset.currencyCode === currencyCode)) diff --git a/src/selectors/getCreateWalletList.ts b/src/selectors/getCreateWalletList.ts index aa131abf32f..c19766d8cac 100644 --- a/src/selectors/getCreateWalletList.ts +++ b/src/selectors/getCreateWalletList.ts @@ -169,7 +169,7 @@ export const filterWalletCreateItemListBySearchText = (createWalletList: WalletC const out: WalletCreateItem[] = [] const searchTarget = normalizeForSearch(searchText) for (const item of createWalletList) { - const { currencyCode, displayName, pluginId, walletType } = item + const { currencyCode, displayName, pluginId, tokenId, walletType } = item if (normalizeForSearch(currencyCode).includes(searchTarget) || normalizeForSearch(displayName).includes(searchTarget)) { out.push(item) continue @@ -177,6 +177,11 @@ export const filterWalletCreateItemListBySearchText = (createWalletList: WalletC // Do an additional search for pluginId for mainnet create items if (walletType != null && normalizeForSearch(pluginId).includes(searchTarget)) { out.push(item) + continue + } + // See if the search term contains the tokenId because we don't have contract addresses in scope. The tokenId is, in most cases, close enough to a contract address to be useful. + if (tokenId !== null && normalizeForSearch(searchTarget).includes(normalizeForSearch(tokenId))) { + out.push(item) } } return out diff --git a/src/state/SceneScrollState.tsx b/src/state/SceneScrollState.tsx index 836c2944ac8..adb2b7109de 100644 --- a/src/state/SceneScrollState.tsx +++ b/src/state/SceneScrollState.tsx @@ -1,7 +1,7 @@ import { useIsFocused } from '@react-navigation/native' import { useMemo } from 'react' import { NativeScrollEvent, NativeSyntheticEvent } from 'react-native' -import { SharedValue, useAnimatedReaction, useAnimatedScrollHandler, useSharedValue } from 'react-native-reanimated' +import { SharedValue, useAnimatedReaction, useAnimatedScrollHandler, useSharedValue, useWorkletCallback } from 'react-native-reanimated' import { createStateProvider } from './createStateProvider' @@ -113,3 +113,39 @@ export const useSceneScrollHandler = (): SceneScrollHandler => { return handler } + +/** Like `useSceneScrollHandler`, but specifically for worklets that need a + * `(event: NativeScrollEvent) => void` type prop */ +export const useSceneScrollWorkletHandler = () => { + const scrollY = useSceneScrollContext(state => state.scrollY) + + // Create shared values for scroll position + const isFocused = useIsFocused() + + const localScrollY = useSharedValue(0) + + useAnimatedReaction( + () => { + return isFocused + }, + isFocusedResult => { + if (isFocusedResult && localScrollY.value !== scrollY.value) { + scrollY.value = localScrollY.value + } + } + ) + + // Define the handleScroll function as a worklet using useWorkletCallback + const handleScroll = useWorkletCallback((event: NativeScrollEvent) => { + 'worklet' + if (!isFocused) return + + const y = event.contentOffset.y + if (scrollY.value !== y) { + localScrollY.value = y + scrollY.value = y + } + }, []) + + return handleScroll +} diff --git a/src/util/ActionProgramUtils.ts b/src/util/ActionProgramUtils.ts index c02219f5f73..e9fcb6ca61b 100644 --- a/src/util/ActionProgramUtils.ts +++ b/src/util/ActionProgramUtils.ts @@ -10,7 +10,7 @@ import { BorrowCollateral, BorrowDebt, BorrowEngine } from '../plugins/borrow-pl import { config } from '../theme/appConfig' import { GuiExchangeRates } from '../types/types' import { getToken } from './CurrencyInfoHelpers' -import { enableToken } from './CurrencyWalletHelpers' +import { enableTokenCurrencyCode } from './CurrencyWalletHelpers' import { convertCurrencyFromExchangeRates, convertNativeToExchange, @@ -69,7 +69,7 @@ export const makeAaveCreateActionProgram = async (params: AaveCreateActionParams // If no deposit token provided (i.e. buy from exchange provider), default to WBTC const depositTokenCc = depositToken == null ? 'WBTC' : depositToken.currencyCode - await enableToken(depositTokenCc, borrowEngineWallet) + await enableTokenCurrencyCode(depositTokenCc, borrowEngineWallet) const toTokenId = source.tokenId ?? Object.keys(allTokens).find(tokenId => allTokens[tokenId].currencyCode === 'WBTC') if (toTokenId == null) throw new Error(`makeAaveCreateActionProgram: Cannot find toTokenId`) @@ -148,7 +148,7 @@ export const makeAaveBorrowAction = async (params: AaveBorrowActionParams): Prom // If no borrow token specified (withdraw to bank), default to USDC for intermediate borrow step prior to withdrawing to bank const borrowTokenCc = borrowToken == null ? 'USDC' : borrowToken.currencyCode - await enableToken(borrowTokenCc, borrowEngineWallet) + await enableTokenCurrencyCode(borrowTokenCc, borrowEngineWallet) // TODO: ASSUMPTION: The only borrow destinations are: // 1. USDC @@ -202,7 +202,7 @@ export const makeAaveDepositAction = async ({ // If no deposit token provided (i.e. buy from exchange provider), default to WBTC const depositTokenCc = depositToken == null ? 'WBTC' : depositToken.currencyCode - await enableToken(depositTokenCc, borrowEngineWallet) + await enableTokenCurrencyCode(depositTokenCc, borrowEngineWallet) const allTokens = borrowEngineWallet.currencyConfig.allTokens const tokenId = depositTokenId ?? Object.keys(allTokens).find(tokenId => allTokens[tokenId].currencyCode === 'WBTC') if (tokenId == null) throw new Error(`makeAaveDepositAction: Cannot find tokenId`) @@ -270,7 +270,7 @@ export const makeAaveCloseAction = async ({ // We must ensure the token is enabled to get the user's token balance and // calculate exchange rates - await enableToken(collateralCurrencyCode, wallet) + await enableTokenCurrencyCode(collateralCurrencyCode, wallet) if (debt != null) { const debtTokenId = debt.tokenId @@ -281,7 +281,7 @@ export const makeAaveCloseAction = async ({ // We must ensure the token is enabled to get the user's token balance // and calculate exchange rates - await enableToken(debtCurrencyCode, wallet) + await enableTokenCurrencyCode(debtCurrencyCode, wallet) // #region Swap Validation diff --git a/src/util/CurrencyWalletHelpers.ts b/src/util/CurrencyWalletHelpers.ts index 7a5c0172d5f..4a347725bb8 100644 --- a/src/util/CurrencyWalletHelpers.ts +++ b/src/util/CurrencyWalletHelpers.ts @@ -43,13 +43,29 @@ export const getAvailableBalance = (wallet: EdgeCurrencyWallet, tokenId: EdgeTok return balance } -// TODO: Update to use tokenId. Integrate into the rest of the code base where the deprecated enableTokens is used. -export const enableToken = async (currencyCode: string, wallet: EdgeCurrencyWallet) => { +/** @deprecated - Use `enableTokens()` instead */ +export const enableTokenCurrencyCode = async (currencyCode: string, wallet: EdgeCurrencyWallet) => { const allTokens = wallet.currencyConfig.allTokens const newTokenId = Object.keys(allTokens).find(tokenId => allTokens[tokenId].currencyCode.toUpperCase() === currencyCode.toUpperCase()) if (newTokenId == null) throw Error(`Could not find token ${currencyCode} to add to ${wallet.currencyInfo.currencyCode} wallet`) - const enabledTokenIds = wallet.enabledTokenIds - if (enabledTokenIds.find(enabledTokenId => enabledTokenId === newTokenId) == null) - await showFullScreenSpinner(lstrings.wallet_list_modal_enabling_token, wallet.changeEnabledTokenIds([...enabledTokenIds, newTokenId])) + await enableTokens([newTokenId], wallet) +} + +/** + * Enables tokens in a wallet, if not already enabled. + * - If some tokens are not yet enabled, shows a full screen spinner while they + * get enabled. + * - If the tokens are all already enabled, this function call is a noop. + */ +export const enableTokens = async (newTokenIds: EdgeTokenId[], wallet: EdgeCurrencyWallet) => { + const { enabledTokenIds, currencyConfig } = wallet + const { allTokens } = currencyConfig + + const tokensToEnable = Object.keys(allTokens).filter( + tokenId => newTokenIds.filter(newTokenId => newTokenId != null).includes(tokenId) && !enabledTokenIds.includes(tokenId) + ) + + if (tokensToEnable.length > 0) + await showFullScreenSpinner(lstrings.wallet_list_modal_enabling_token, wallet.changeEnabledTokenIds([...enabledTokenIds, ...tokensToEnable])) } diff --git a/src/util/cleaners.ts b/src/util/cleaners.ts index f229e36bc39..2f92f078227 100644 --- a/src/util/cleaners.ts +++ b/src/util/cleaners.ts @@ -1,4 +1,4 @@ -import { asMaybe, asObject, asString } from 'cleaners' +import { asEither, asMaybe, asObject, asString, asValue, Cleaner } from 'cleaners' /** * Accepts strings that are valid numbers according to biggystring. @@ -26,3 +26,78 @@ export const asMaybeContractLocation = asMaybe( contractAddress: asString }) ) + +export const asObjectIn = (asKey: Cleaner, asT: Cleaner): Cleaner<{ [k in K]: T }> => { + return function asObject(raw) { + if (typeof raw !== 'object' || raw == null) { + throw new TypeError('Expected an object, got ' + showValue(raw)) + } + + const out: any = {} + const keys = Object.keys(raw) + for (let i = 0; i < keys.length; ++i) { + try { + const key = asKey(keys[i]) + if (key === '__proto__') continue + out[key] = asT(raw[key]) + } catch (error) { + throw locateError(error, '[' + JSON.stringify(keys[i]) + ']', 0) + } + } + return out + } +} + +export const asObjectInOrTrue = (asKey: Cleaner, asT: Cleaner) => + asEither(asObjectIn(asKey, asT), asValue<[true]>(true)) + +// ----------------------------------------------------------------------------- +// Internal functions taken from `cleaners` package +// ----------------------------------------------------------------------------- + +/** + * Given a JS value, produce a descriptive string. + */ +function showValue(value: any): string { + switch (typeof value) { + case 'function': + case 'object': + if (value == null) return 'null' + if (Array.isArray(value)) return 'array' + return typeof value + + case 'string': + return JSON.stringify(value) + + default: + return String(value) + } +} + +/** + * Adds location information to an error message. + * + * Errors can occur inside deeply-nested cleaners, + * such as "TypeError: Expected a string at .array[0].some.property". + * To build this information, each cleaner along the path + * should add its own location information as the stack unwinds. + * + * If the error has a `insertStepAt` property, that is the character offset + * where the next step will go in the error message. Otherwise, + * the next step just goes on the end of the string with the word "at". + */ +function locateError(error: unknown, step: string, offset: number): unknown { + if (error instanceof Error) { + // @ts-expect-error + if (error.insertStepAt == null) { + error.message += ' at ' + // @ts-expect-error + error.insertStepAt = error.message.length + } + // @ts-expect-error + error.message = error.message.slice(0, error.insertStepAt) + step + error.message.slice(error.insertStepAt) + // @ts-expect-error + error.insertStepAt += offset + } + return error +} diff --git a/src/util/corePlugins.ts b/src/util/corePlugins.ts index b5b9e2940b5..55d273f4a69 100644 --- a/src/util/corePlugins.ts +++ b/src/util/corePlugins.ts @@ -3,7 +3,7 @@ import { EdgeCorePluginsInit } from 'edge-core-js' import { ENV } from '../env' export const currencyPlugins: EdgeCorePluginsInit = { - // edge-currency-accountbased: + // // edge-currency-accountbased: algorand: ENV.ALGORAND_INIT, amoy: ENV.AMOY_INIT, arbitrum: ENV.ARBITRUM_INIT, @@ -91,7 +91,7 @@ export const swapPlugins = { spookySwap: false, mayaprotocol: ENV.MAYA_PROTOCOL_INIT, thorchain: ENV.THORCHAIN_INIT, - thorchainda: ENV.THORCHAIN_DA_INIT, + swapkit: ENV.SWAPKIT_INIT, tombSwap: ENV.TOMB_SWAP_INIT, velodrome: true, xrpdex: ENV.XRPDEX_INIT, diff --git a/src/util/stakeUtils.ts b/src/util/stakeUtils.ts index a723c8033d9..852d802ff0e 100644 --- a/src/util/stakeUtils.ts +++ b/src/util/stakeUtils.ts @@ -1,11 +1,13 @@ import { add } from 'biggystring' -import { EdgeCurrencyInfo, EdgeStakingStatus } from 'edge-core-js' +import { EdgeAccount, EdgeCurrencyInfo, EdgeCurrencyWallet, EdgeStakingStatus, EdgeTokenId } from 'edge-core-js' import { sprintf } from 'sprintf-js' import { formatTimeDate } from '../locales/intl' import { lstrings } from '../locales/strings' -import { PositionAllocation, StakePlugin, StakePolicy, StakePosition } from '../plugins/stake-plugins/types' +import { PositionAllocation, StakePlugin, StakePolicy, StakePolicyFilter, StakePosition } from '../plugins/stake-plugins/types' import { getCurrencyIconUris } from './CdnUris' +import { getTokenIdForced } from './CurrencyInfoHelpers' +import { enableTokens } from './CurrencyWalletHelpers' import { getUkCompliantString } from './ukComplianceUtils' /** @@ -88,8 +90,8 @@ export const getPolicyIconUris = ( return { stakeAssetUris, rewardAssetUris } } -export const getPluginFromPolicy = (stakePlugins: StakePlugin[], stakePolicy: StakePolicy): StakePlugin | undefined => { - return stakePlugins.find(plugin => plugin.getPolicies().find(policy => policy.stakePolicyId === stakePolicy.stakePolicyId)) +export const getPluginFromPolicy = (stakePlugins: StakePlugin[], stakePolicy: StakePolicy, filter?: StakePolicyFilter): StakePlugin | undefined => { + return stakePlugins.find(plugin => plugin.getPolicies(filter).find(policy => policy.stakePolicyId === stakePolicy.stakePolicyId)) } /** @@ -122,3 +124,14 @@ export const getFioStakingBalances = (stakingStatus?: EdgeStakingStatus): FioSta } return stakingBalances } + +export const enableStakeTokens = async (account: EdgeAccount, wallet: EdgeCurrencyWallet, stakePolicy: StakePolicy) => { + const requiredTokenIds: EdgeTokenId[] = [] + for (const stakeAssetInfo of [...stakePolicy.stakeAssets, ...stakePolicy.rewardAssets]) { + const pluginId = wallet.currencyInfo.pluginId + const tokenId = getTokenIdForced(account, pluginId, stakeAssetInfo.currencyCode) + requiredTokenIds.push(tokenId) + } + + await enableTokens(requiredTokenIds, wallet) +} diff --git a/yarn.lock b/yarn.lock index 44b58b54dcb..6d0b9d1a58b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1100,7 +1100,7 @@ "@babel/types" "^7.4.4" esutils "^2.0.2" -"@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.16.7", "@babel/preset-typescript@^7.17.12", "@babel/preset-typescript@^7.18.6": +"@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.16.7", "@babel/preset-typescript@^7.18.6": version "7.24.1" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.24.1.tgz#89bdf13a3149a17b3b2a2c9c62547f06db8845ec" integrity sha512-1DBaMmRDpuYQBPWD8Pf/WEwCrtgRHxsZnP4mIy9G/X+hFfbI47Q2G4t1Paakld84+qsk2fSsUPMKg71jkoOOaQ== @@ -1439,6 +1439,23 @@ resolved "https://registry.yarnpkg.com/@emurgo/cardano-serialization-lib-nodejs/-/cardano-serialization-lib-nodejs-11.5.0.tgz#0662e2a17d7d1e944f8cdb86396133c8edaec059" integrity sha512-IlVABlRgo9XaTR1NunwZpWcxnfEv04ba2l1vkUz4S1W7Jt36F4CtffP+jPeqBZGnAe+fnUwo0XjIJC3ZTNToNQ== +"@ensdomains/address-encoder@^0.2.22": + version "0.2.22" + resolved "https://registry.yarnpkg.com/@ensdomains/address-encoder/-/address-encoder-0.2.22.tgz#18bc17eb8f3722fc715a0d4669cded28fa128e8e" + integrity sha512-4it+XDvf0U0vLFECLi4oXFBhelz1I/Mo9AWVgS3zry3tMPUFBzM+a27ndNCPZk+glaQiY+R2GOIa3tYOypK29g== + dependencies: + bech32 "^2.0.0" + blakejs "^1.1.0" + bn.js "^4.11.8" + bs58 "^4.0.1" + crypto-addr-codec "^0.1.8" + js-crc "^0.2.0" + js-sha256 "^0.9.0" + js-sha512 "^0.8.0" + nano-base32 "^1.0.1" + ripemd160 "^2.0.2" + sha3 "^2.1.3" + "@esbuild/android-arm@0.15.15": version "0.15.15" resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.15.15.tgz#35b3cc0f9e69cb53932d44f60b99dd440335d2f0" @@ -1528,7 +1545,7 @@ "@ethereumjs/rlp" "^5.0.1" ethereum-cryptography "^2.1.2" -"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.6.3", "@ethersproject/abi@^5.7.0": +"@ethersproject/abi@5.7.0", "@ethersproject/abi@^5.0.1", "@ethersproject/abi@^5.6.3", "@ethersproject/abi@^5.7.0": version "5.7.0" resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.7.0.tgz#b3f3e045bbbeed1af3947335c247ad625a44e449" integrity sha512-351ktp42TiRcYB3H1OP8yajPeAQstMW/yCFokj/AthP9bLHzQFPlOrxOcwYEDkUAICmOHljvN4K39OMTMUa9RA== @@ -5412,6 +5429,22 @@ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== +"@unstoppabledomains/resolution@^9.3.0": + version "9.3.0" + resolved "https://registry.yarnpkg.com/@unstoppabledomains/resolution/-/resolution-9.3.0.tgz#2a446e8cbf569b81da83881f1ccd428c710d11bd" + integrity sha512-1pH0lI8w3C3T6SXKWzmthEvBQs3u034e6YmArT3SCeG7eW+JA1MuWRIp0bewe48TPyyHmw9wMPOUXLPcy5wByA== + dependencies: + "@ensdomains/address-encoder" "^0.2.22" + "@ethersproject/abi" "^5.0.1" + bip44-constants "^8.0.103" + bn.js "^4.4.0" + content-hash "^2.5.2" + cross-fetch "4.0.0" + crypto-js "^4.1.1" + elliptic "^6.5.4" + js-sha256 "^0.9.0" + js-sha3 "^0.8.0" + "@urql/core@2.3.6": version "2.3.6" resolved "https://registry.yarnpkg.com/@urql/core/-/core-2.3.6.tgz#ee0a6f8fde02251e9560c5f17dce5cd90f948552" @@ -6808,6 +6841,11 @@ bfs-path@^1.0.2: resolved "https://registry.yarnpkg.com/bfs-path/-/bfs-path-1.0.2.tgz#9b5fa4b8c4ad226597fc4d2ee15398bdcc644a07" integrity sha512-KTKx2JJtAAAT7C/rJYDXXWA2VLPycAS4kwFktKsxUo0hj4UTtw/Gm5PJuY7Uf3xSlIQNo7HRCSWei2ivncVwbQ== +big-integer@1.6.36: + version "1.6.36" + resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.36.tgz#78631076265d4ae3555c04f85e7d9d2f3a071a36" + integrity sha512-t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg== + big-integer@1.6.x, big-integer@^1.6.17, big-integer@^1.6.48, big-integer@^1.6.51: version "1.6.52" resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.52.tgz#60a887f3047614a8e1bffe5d7173490a97dc8c85" @@ -6933,6 +6971,11 @@ bip39@3.0.4, bip39@3.1.0, bip39@^3.0.2, bip39@^3.0.4: pbkdf2 "^3.0.9" randombytes "^2.0.1" +bip44-constants@^8.0.103: + version "8.0.103" + resolved "https://registry.yarnpkg.com/bip44-constants/-/bip44-constants-8.0.103.tgz#fc8c6718a2d8f38bf7fdb689732250e32333ba8b" + integrity sha512-wuGsY9IKUS9GC5Sf/Acb5jLJZI3Z8qsMoQHWldnQyoVUlij4y8e5srh28Iqul1HwK+elPsAYGNYKtYhovjvNxA== + bip66@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/bip66/-/bip66-1.1.5.tgz#01fa8748785ca70955d5011217d1b3139969ca22" @@ -7000,7 +7043,7 @@ bn.js@4.11.6: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.6.tgz#53344adb14617a13f6e8dd2ce28905d1c0ba3215" integrity sha512-XWwnNNFCuuSQ0m3r3C4LE3EiORltHd9M05pq6FOlVeiophzRbMo50Sbz1ehl8K3Z+jw9+vmgnXefY1hz8X+2wA== -bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.0, bn.js@^4.11.6, bn.js@^4.11.7, bn.js@^4.11.8, bn.js@^4.11.9: +bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.0, bn.js@^4.11.6, bn.js@^4.11.7, bn.js@^4.11.8, bn.js@^4.11.9, bn.js@^4.4.0: version "4.12.0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== @@ -8244,6 +8287,13 @@ create-jest@^29.7.0: jest-util "^29.7.0" prompts "^2.0.1" +cross-fetch@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-4.0.0.tgz#f037aef1580bb3a1a35164ea2a848ba81b445983" + integrity sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g== + dependencies: + node-fetch "^2.6.12" + cross-fetch@^3.1.4, cross-fetch@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" @@ -8281,6 +8331,19 @@ crypt@0.0.2, crypt@~0.0.1: resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b" integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow== +crypto-addr-codec@^0.1.8: + version "0.1.8" + resolved "https://registry.yarnpkg.com/crypto-addr-codec/-/crypto-addr-codec-0.1.8.tgz#45c4b24e2ebce8e24a54536ee0ca25b65787b016" + integrity sha512-GqAK90iLLgP3FvhNmHbpT3wR6dEdaM8hZyZtLX29SPardh3OA13RFLHDR6sntGCgRWOfiHqW6sIyohpNqOtV/g== + dependencies: + base-x "^3.0.8" + big-integer "1.6.36" + blakejs "^1.1.0" + bs58 "^4.0.1" + ripemd160-min "0.0.6" + safe-buffer "^5.2.0" + sha3 "^2.1.1" + crypto-browserify@3.12.0, crypto-browserify@^3.12.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" @@ -8303,7 +8366,7 @@ crypto-js@^3.1.9-1: resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.3.0.tgz#846dd1cce2f68aacfa156c8578f926a609b7976b" integrity sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q== -crypto-js@^4.2.0: +crypto-js@^4.1.1, crypto-js@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.2.0.tgz#4d931639ecdfd12ff80e8186dba6af2c2e856631" integrity sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q== @@ -9261,10 +9324,10 @@ edge-core-js@^2.20.1: yaob "^0.3.12" yavent "^0.1.3" -edge-currency-accountbased@^4.27.1: - version "4.27.1" - resolved "https://registry.yarnpkg.com/edge-currency-accountbased/-/edge-currency-accountbased-4.27.1.tgz#f932c2e11242967e883625e5e904dbc070cddd34" - integrity sha512-9yMFN1Mbn8PezynM5BN/2wptJMK6eWr25exWWWKLQM4hIlLcaL8sb/ivdeXgmSpx7J0dCQa4w2xwMGKe6zR2nw== +edge-currency-accountbased@^4.28.0: + version "4.28.0" + resolved "https://registry.yarnpkg.com/edge-currency-accountbased/-/edge-currency-accountbased-4.28.0.tgz#1513d9aac63b5bcc0ca89094c2a7fb41a7c1d143" + integrity sha512-0SPiX6JC4HUl9arqJGr4HhHgyi0zdwgg7s1XoMLkggyahUzT+M7CygvCyC3TTdGKhCZkzKqa/Oy44UXbBk2dbA== dependencies: "@binance-chain/javascript-sdk" "^4.2.0" "@chain-registry/client" "^1.15.0" @@ -9354,10 +9417,10 @@ edge-currency-plugins@^3.4.4: wifgrs "^2.0.6" ws "^7.4.6" -edge-exchange-plugins@^2.13.0: - version "2.13.0" - resolved "https://registry.yarnpkg.com/edge-exchange-plugins/-/edge-exchange-plugins-2.13.0.tgz#57dc633d8cdcd0e09412ef1d62c61550994ea530" - integrity sha512-aAzFjQ/suQHiZDEj+7h1tZbiFLiTOsl6Mv1wjT9o/cc1yLRZ+dUhPYSExVs9RpXRBgjmHb4gcnNwev2Nyn9JlA== +edge-exchange-plugins@^2.14.0: + version "2.14.0" + resolved "https://registry.yarnpkg.com/edge-exchange-plugins/-/edge-exchange-plugins-2.14.0.tgz#a9c1609f7f6f6930f36bdaa1f1941befa4ed840a" + integrity sha512-JXJK21gFoyAqKjLRmYOFU29NG3fQfirCH7Ot7OKN6Oa2/xp4IJI9QLUeyGbMehCR8fqTIY9iI3J1Tg72zlWO2w== dependencies: "@cosmjs/encoding" "^0.32.2" biggystring "^4.1.3" @@ -9373,10 +9436,10 @@ edge-info-server@^3.0.1: dependencies: cleaners "^0.3.16" -edge-login-ui-rn@^3.23.0: - version "3.23.0" - resolved "https://registry.yarnpkg.com/edge-login-ui-rn/-/edge-login-ui-rn-3.23.0.tgz#5d56be30ece6002f1212ec91ca9ac74ff375b437" - integrity sha512-jJsdhGJG9z60YmD7WHKjhA18vr2ULGSV/mVx+iFG0XnShp1IAHMCd6/+sGkBx/qHmcA9XbK361LU86nTtFScwg== +edge-login-ui-rn@^3.24.0: + version "3.24.0" + resolved "https://registry.yarnpkg.com/edge-login-ui-rn/-/edge-login-ui-rn-3.24.0.tgz#2cdebdb473410a746e4ac63f0953376718cb5e08" + integrity sha512-i+FqsGTv6q9jQhQQLqkmD6AetkIsh77ttos0QbsTLAC3QuPB1SB5FNcaFrc5EBgx5vWp6oH4bZoUBAl5dmsfRA== dependencies: base-x "^4.0.0" cleaners "^0.3.12" @@ -13168,6 +13231,11 @@ js-base64@^3.7.4: resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.7.tgz#e51b84bf78fbf5702b9541e2cb7bfcb893b43e79" integrity sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw== +js-crc@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/js-crc/-/js-crc-0.2.0.tgz#f72c5c7618176bff75cc812a1cedbde3d8eb6839" + integrity sha512-8DdCSAOACpF8WDAjyDFBC2rj8OS4HUP9mNZBDfl8jCiPCnJG+2bkuycalxwZh6heFy6PrMvoWTp47lp6gzT65A== + js-sha256@^0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966" @@ -14704,6 +14772,11 @@ nan@^2.0.9, nan@^2.13.2, nan@^2.14.0: resolved "https://registry.yarnpkg.com/nan/-/nan-2.16.0.tgz#664f43e45460fb98faf00edca0bb0d7b8dce7916" integrity sha512-UdAqHyFngu7TfQKsCBgAA6pWDkT8MAO7d0jyOecVhN5354xbLqdn8mV9Tat9gepAupm0bt2DbeaSC8vS52MuFA== +nano-base32@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/nano-base32/-/nano-base32-1.0.1.tgz#ba548c879efcfb90da1c4d9e097db4a46c9255ef" + integrity sha512-sxEtoTqAPdjWVGv71Q17koMFGsOMSiHsIFEvzOM7cNp8BXB4AnEwmDabm5dorusJf/v1z7QxaZYxUorU9RKaAw== + nano-json-stream-parser@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz#0cc8f6d0e2b622b479c40d499c46d64b755c6f5f" @@ -14869,7 +14942,7 @@ node-fetch@2.6.7, node-fetch@~2.6.7: dependencies: whatwg-url "^5.0.0" -node-fetch@2.x, node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@^2.7.0: +node-fetch@2.x, node-fetch@^2.2.0, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.12, node-fetch@^2.6.7, node-fetch@^2.7.0: version "2.7.0" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== @@ -16300,6 +16373,11 @@ react-native-airship@^0.2.12, react-native-airship@^0.2.9: dependencies: yavent "^0.1.1" +react-native-battery-optimization-check@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/react-native-battery-optimization-check/-/react-native-battery-optimization-check-1.0.8.tgz#1592e8662be02ac6dbff06e25523bf1835958a77" + integrity sha512-OXACVlMho/rmTg3YS2GQ0juGb7YKJTrvUnD7BMDNGpAUm6ykcgkU0i3vML76ZHRYTO1rB5Pdh4re+LeKSvVWsQ== + react-native-bootsplash@^4.7.4: version "4.7.4" resolved "https://registry.yarnpkg.com/react-native-bootsplash/-/react-native-bootsplash-4.7.4.tgz#5ff2b53751dcb2a380915ef6b853f3352b978a9f" @@ -16340,17 +16418,10 @@ react-native-contacts@^7.0.4: version "0.1.8" resolved "https://github.com/adminphoeniixx/react-native-custom-tabs#7605cda9d9d691c36367e98d8513937454627ecd" -react-native-device-info@^10.11.0: - version "10.11.0" - resolved "https://registry.yarnpkg.com/react-native-device-info/-/react-native-device-info-10.11.0.tgz#2c9f378f1c3c5eb9aafa803d015b84325991a9aa" - integrity sha512-qRzhuYOm5ZXQi5dhfJFjDq157oipxcEW/fo0QyMm5+TI6V6/+P/tju+Hif6z0rpLCf7MV7iDVRv2Kqha4D/yvQ== - -react-native-draggable-flatlist@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/react-native-draggable-flatlist/-/react-native-draggable-flatlist-4.0.1.tgz#2f027d387ba4b8f3eb0907340e32cb85e6460df2" - integrity sha512-ZO1QUTNx64KZfXGXeXcBfql67l38X7kBcJ3rxUVZzPHt5r035GnGzIC0F8rqSXp6zgnwgUYMfB6zQc5PKmPL9Q== - dependencies: - "@babel/preset-typescript" "^7.17.12" +react-native-device-info@^13.2.0: + version "13.2.0" + resolved "https://registry.yarnpkg.com/react-native-device-info/-/react-native-device-info-13.2.0.tgz#2b4026daf59dd08d82b6d65b63c18cb26f310ed2" + integrity sha512-VpTxHZsEZ7kes2alaZkB31278KuSPXfTZ4TmCCN77+bYxNnaHUDiBiQ1TSoKAOp51b7gZ/7EvM4McfgHofcTBQ== react-native-email-link@^1.14.5: version "1.14.5" @@ -16489,11 +16560,6 @@ react-native-piratechain@^0.5.5: dependencies: rfc4648 "^1.3.0" -react-native-power-saving-mode@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/react-native-power-saving-mode/-/react-native-power-saving-mode-0.1.1.tgz#8ec758971979f11c81410751a6ea228abfce269d" - integrity sha512-aWRtlpW55fqjLQDTb/dEw6LqlG0iWx8NZxlhu6QWp5DcvQMzx3EDxCX7RC1h/ofrISCoNisd8Lb7YSa+9SY5VQ== - react-native-reanimated@^3.14.0: version "3.14.0" resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-3.14.0.tgz#2118265f3a5cad8c142633e36d76d0f0cc8cc9e8" @@ -16508,6 +16574,11 @@ react-native-reanimated@^3.14.0: convert-source-map "^2.0.0" invariant "^2.2.4" +react-native-reorderable-list@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/react-native-reorderable-list/-/react-native-reorderable-list-0.5.0.tgz#5f85360d68988fdd350cea720b0201f413329101" + integrity sha512-p830KvMJP8r2nOsdEyGlNW6F1/CA4bvCTCoFsZR+HJ3RFjujHIX3C8tf+Sl75wFGBUlPd5SSuJMZ0t85wUJYZA== + react-native-safari-view@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/react-native-safari-view/-/react-native-safari-view-2.1.0.tgz#1e0cd12c62bce79bc1759c7e281646b08b61c959" @@ -17148,7 +17219,12 @@ rimraf@~2.6.2: dependencies: glob "^7.1.3" -ripemd160@^2.0.0, ripemd160@^2.0.1: +ripemd160-min@0.0.6: + version "0.0.6" + resolved "https://registry.yarnpkg.com/ripemd160-min/-/ripemd160-min-0.0.6.tgz#a904b77658114474d02503e819dcc55853b67e62" + integrity sha512-+GcJgQivhs6S9qvLogusiTcS9kQUfgR75whKuy5jIhuiOfQuJ8fjqxV6EGD5duH1Y/FawFUMtMhyeq3Fbnib8A== + +ripemd160@^2.0.0, ripemd160@^2.0.1, ripemd160@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== @@ -17278,7 +17354,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -17592,6 +17668,13 @@ sha.js@^2.3.6, sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8: inherits "^2.0.1" safe-buffer "^5.0.1" +sha3@^2.1.1, sha3@^2.1.3: + version "2.1.4" + resolved "https://registry.yarnpkg.com/sha3/-/sha3-2.1.4.tgz#000fac0fe7c2feac1f48a25e7a31b52a6492cc8f" + integrity sha512-S8cNxbyb0UGUM2VhRD4Poe5N58gJnJsLJ5vC7FYWGUmGhcsj4++WaIOBFVDxlG0W3To6xBuiRh+i0Qp2oNCOtg== + dependencies: + buffer "6.0.3" + shallow-clone@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-1.0.0.tgz#4480cd06e882ef68b2ad88a3ea54832e2c48b571"