diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 2e3a3075f3..68de2835cc 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -36,7 +36,7 @@ + android:value="RedWallet notifications" /> @@ -121,7 +121,7 @@ diff --git a/android/app/src/main/java/io/bluewallet/bluewallet/BitcoinPriceWidget.kt b/android/app/src/main/java/io/bluewallet/bluewallet/BitcoinPriceWidget.kt index 66100d6b0b..c4d385663f 100644 --- a/android/app/src/main/java/io/bluewallet/bluewallet/BitcoinPriceWidget.kt +++ b/android/app/src/main/java/io/bluewallet/bluewallet/BitcoinPriceWidget.kt @@ -13,7 +13,7 @@ class BitcoinPriceWidget : AppWidgetProvider() { companion object { private const val TAG = "BitcoinPriceWidget" - private const val SHARED_PREF_NAME = "group.io.bluewallet.bluewallet" + private const val SHARED_PREF_NAME = "group.com.layertwolabs.bluewallet" fun updateNetworkStatus(context: Context, appWidgetIds: IntArray) { val isNetworkAvailable = NetworkUtils.isNetworkAvailable(context) diff --git a/android/app/src/main/java/io/bluewallet/bluewallet/MainActivity.kt b/android/app/src/main/java/io/bluewallet/bluewallet/MainActivity.kt index ad2d173a13..7b8146507c 100644 --- a/android/app/src/main/java/io/bluewallet/bluewallet/MainActivity.kt +++ b/android/app/src/main/java/io/bluewallet/bluewallet/MainActivity.kt @@ -21,7 +21,7 @@ class MainActivity : ReactActivity() { * This is used to schedule rendering of the component. */ override fun getMainComponentName(): String { - return "BlueWallet" + return "RedWallet" } override fun onCreate(savedInstanceState: Bundle?) { @@ -42,7 +42,7 @@ class MainActivity : ReactActivity() { } private fun checkAndShowCacheClearedAlert() { - val sharedPref = getSharedPreferences("group.io.bluewallet.bluewallet", Context.MODE_PRIVATE) + val sharedPref = getSharedPreferences("group.com.layertwolabs.bluewallet", Context.MODE_PRIVATE) val shouldShowAlert = sharedPref.getBoolean("shouldShowCacheClearedAlert", false) if (shouldShowAlert) { diff --git a/android/app/src/main/java/io/bluewallet/bluewallet/MainApplication.kt b/android/app/src/main/java/io/bluewallet/bluewallet/MainApplication.kt index 7528e06150..4711ecce1f 100644 --- a/android/app/src/main/java/io/bluewallet/bluewallet/MainApplication.kt +++ b/android/app/src/main/java/io/bluewallet/bluewallet/MainApplication.kt @@ -89,7 +89,7 @@ class MainApplication : Application(), ReactApplication { override fun onCreate() { super.onCreate() - sharedPref = getSharedPreferences("group.io.bluewallet.bluewallet", Context.MODE_PRIVATE) + sharedPref = getSharedPreferences("group.com.layertwolabs.bluewallet", Context.MODE_PRIVATE) // Handle clearFilesOnLaunch before registering listeners clearFilesIfNeeded() diff --git a/android/app/src/main/java/io/bluewallet/bluewallet/MarketWidget.kt b/android/app/src/main/java/io/bluewallet/bluewallet/MarketWidget.kt index e0c7d168fb..91174cdd3e 100644 --- a/android/app/src/main/java/io/bluewallet/bluewallet/MarketWidget.kt +++ b/android/app/src/main/java/io/bluewallet/bluewallet/MarketWidget.kt @@ -19,7 +19,7 @@ class MarketWidget : AppWidgetProvider() { companion object { private const val TAG = "MarketWidget" - private const val SHARED_PREF_NAME = "group.io.bluewallet.bluewallet" + private const val SHARED_PREF_NAME = "group.com.layertwolabs.bluewallet" private const val DEFAULT_CURRENCY = "USD" private const val KEY_LAST_ONLINE_STATUS = "market_widget_last_online_status" diff --git a/android/app/src/main/java/io/bluewallet/bluewallet/MarketWidgetUpdateWorker.kt b/android/app/src/main/java/io/bluewallet/bluewallet/MarketWidgetUpdateWorker.kt index 236f727a83..aef684f215 100644 --- a/android/app/src/main/java/io/bluewallet/bluewallet/MarketWidgetUpdateWorker.kt +++ b/android/app/src/main/java/io/bluewallet/bluewallet/MarketWidgetUpdateWorker.kt @@ -16,7 +16,7 @@ class MarketWidgetUpdateWorker(context: Context, workerParams: WorkerParameters) const val TAG = "MarketWidgetUpdateWorker" const val WORK_NAME = "market_widget_update_work" const val NETWORK_RETRY_WORK_NAME = "market_network_retry_work" - private const val SHARED_PREF_NAME = "group.io.bluewallet.bluewallet" + private const val SHARED_PREF_NAME = "group.com.layertwolabs.bluewallet" private const val DEFAULT_CURRENCY = "USD" private const val KEY_LAST_UPDATE_TIME = "market_widget_last_update_time" private const val MIN_UPDATE_INTERVAL_MS = 15L * 60 * 1000 diff --git a/android/app/src/main/java/io/bluewallet/bluewallet/SettingsActivity.kt b/android/app/src/main/java/io/bluewallet/bluewallet/SettingsActivity.kt index 5eb40ce9ff..38a55e97a0 100644 --- a/android/app/src/main/java/io/bluewallet/bluewallet/SettingsActivity.kt +++ b/android/app/src/main/java/io/bluewallet/bluewallet/SettingsActivity.kt @@ -35,7 +35,7 @@ class SettingsActivity : AppCompatActivity() { class SettingsFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { // Set the SharedPreferences name to match the app's preferences - preferenceManager.sharedPreferencesName = "group.io.bluewallet.bluewallet" + preferenceManager.sharedPreferencesName = "group.com.layertwolabs.bluewallet" // Load preferences from XML setPreferencesFromResource(R.xml.settings_preferences, rootKey) diff --git a/android/app/src/main/java/io/bluewallet/bluewallet/SettingsModule.kt b/android/app/src/main/java/io/bluewallet/bluewallet/SettingsModule.kt index 99e4636cbd..c213929681 100644 --- a/android/app/src/main/java/io/bluewallet/bluewallet/SettingsModule.kt +++ b/android/app/src/main/java/io/bluewallet/bluewallet/SettingsModule.kt @@ -12,7 +12,7 @@ import java.util.UUID class SettingsModule(reactContext: ReactApplicationContext) : ReactContextBaseJavaModule(reactContext) { private val sharedPref: SharedPreferences = reactContext.getSharedPreferences( - "group.io.bluewallet.bluewallet", + "group.com.layertwolabs.bluewallet", Context.MODE_PRIVATE ) diff --git a/android/app/src/main/java/io/bluewallet/bluewallet/ThemeHelper.kt b/android/app/src/main/java/io/bluewallet/bluewallet/ThemeHelper.kt index 2872bb0215..eea8c75e76 100644 --- a/android/app/src/main/java/io/bluewallet/bluewallet/ThemeHelper.kt +++ b/android/app/src/main/java/io/bluewallet/bluewallet/ThemeHelper.kt @@ -5,7 +5,7 @@ import android.content.res.Configuration import androidx.appcompat.app.AppCompatDelegate object ThemeHelper { - private const val SHARED_PREF_NAME = "group.io.bluewallet.bluewallet" + private const val SHARED_PREF_NAME = "group.com.layertwolabs.bluewallet" private const val KEY_FORCE_DARK_MODE = "force_dark_mode" /** diff --git a/android/app/src/main/java/io/bluewallet/bluewallet/WidgetUpdateWorker.kt b/android/app/src/main/java/io/bluewallet/bluewallet/WidgetUpdateWorker.kt index 9a183fdb18..1cf7b5423f 100644 --- a/android/app/src/main/java/io/bluewallet/bluewallet/WidgetUpdateWorker.kt +++ b/android/app/src/main/java/io/bluewallet/bluewallet/WidgetUpdateWorker.kt @@ -26,7 +26,7 @@ class WidgetUpdateWorker(context: Context, workerParams: WorkerParameters) : Cor const val WORK_NAME = "bitcoin_price_widget_update_work" const val NETWORK_RETRY_WORK_NAME = "bitcoin_price_network_retry_work" const val REPEAT_INTERVAL_MINUTES = 15L - private const val SHARED_PREF_NAME = "group.io.bluewallet.bluewallet" + private const val SHARED_PREF_NAME = "group.com.layertwolabs.bluewallet" private const val DEFAULT_CURRENCY = "USD" private const val NETWORK_RETRY_DELAY_SECONDS = 30L diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index af6599907c..dee80d4ce8 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - BlueWallet + RedWallet Loading... Last Updated From diff --git a/android/settings.gradle b/android/settings.gradle index 2221f87814..abb4882f39 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,7 +1,7 @@ pluginManagement { includeBuild("../node_modules/@react-native/gradle-plugin") } plugins { id("com.facebook.react.settings") } extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() } -rootProject.name = 'BlueWallet' +rootProject.name = 'RedWallet' include ':app' includeBuild('../node_modules/@react-native/gradle-plugin') include ':detox' diff --git a/blue_modules/BlueElectrum.ts b/blue_modules/BlueElectrum.ts index 25df3fb77f..2b90b48fb4 100644 --- a/blue_modules/BlueElectrum.ts +++ b/blue_modules/BlueElectrum.ts @@ -85,12 +85,12 @@ const ELECTRUM_CONNECTION_DISABLED = 'electrum_disabled'; const storageKey = 'ELECTRUM_PEERS'; const defaultPeer = { host: 'electrum1.bluewallet.io', ssl: 443 }; export const hardcodedPeers: Peer[] = [ - { host: 'mainnet.foundationdevices.com', ssl: 50002 }, - { host: 'bitcoin.lu.ke', ssl: 50002 }, - // { host: 'electrum.jochen-hoenicke.de', ssl: '50006' }, - { host: 'electrum1.bluewallet.io', ssl: 443 }, - { host: 'electrum.acinq.co', ssl: 50002 }, - { host: 'electrum.bitaroo.net', ssl: 50002 }, + // forknet + + { host: '157.180.8.224', tcp: 50001 }, + + // signet + { host: 'node.drivechain.info', tcp: 50001 }, ]; export const suggestedServers: Peer[] = hardcodedPeers.map(peer => ({ diff --git a/blue_modules/currency.ts b/blue_modules/currency.ts index acdd3ba158..fd9b2c6ca8 100644 --- a/blue_modules/currency.ts +++ b/blue_modules/currency.ts @@ -8,7 +8,7 @@ const PREFERRED_CURRENCY_STORAGE_KEY = 'preferredCurrency'; const PREFERRED_CURRENCY_LOCALE_STORAGE_KEY = 'preferredCurrencyLocale'; const EXCHANGE_RATES_STORAGE_KEY = 'exchangeRates'; const LAST_UPDATED = 'LAST_UPDATED'; -export const GROUP_IO_BLUEWALLET = 'group.io.bluewallet.bluewallet'; +export const GROUP_IO_BLUEWALLET = 'group.com.layertwolabs.bluewallet'; const BTC_PREFIX = 'BTC_'; export interface CurrencyRate { diff --git a/components/types.ts b/components/types.ts index cca1824ecc..31fc1ade2b 100644 --- a/components/types.ts +++ b/components/types.ts @@ -43,9 +43,9 @@ export interface ToolTipMenuProps { } export enum HandOffActivityType { - ReceiveOnchain = 'io.bluewallet.bluewallet.receiveonchain', - Xpub = 'io.bluewallet.bluewallet.xpub', - ViewInBlockExplorer = 'io.bluewallet.bluewallet.blockexplorer', + ReceiveOnchain = 'com.layertwolabs.bluewallet.receiveonchain', + Xpub = 'com.layertwolabs.bluewallet.xpub', + ViewInBlockExplorer = 'com.layertwolabs.bluewallet.blockexplorer', } export interface HandOffComponentProps { diff --git a/fastlane/Appfile b/fastlane/Appfile index 18e61f786d..d70eee59da 100644 --- a/fastlane/Appfile +++ b/fastlane/Appfile @@ -1,3 +1,3 @@ -app_identifier("io.bluewallet.bluewallet") +app_identifier("com.layertwolabs.bluewallet") apple_id(ENV["APPLE_ID"]) # Your Apple email ID itc_team_id(ENV["ITC_TEAM_ID"]) # App Store Connect Team ID \ No newline at end of file diff --git a/fastlane/Fastfile b/fastlane/Fastfile index dbaf2e46b8..f63ea3b228 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -1,11 +1,7 @@ # Define app identifiers once for reuse across lanes def app_identifiers [ - "io.bluewallet.bluewallet", - "io.bluewallet.bluewallet.watch", - "io.bluewallet.bluewallet.watch.extension", - "io.bluewallet.bluewallet.Stickers", - "io.bluewallet.bluewallet.MarketWidget" + "com.layertwolabs.bluewallet" ] end @@ -357,7 +353,7 @@ platform :ios do desc "Synchronize certificates and provisioning profiles" lane :setup_provisioning_profiles do - required_vars = ["GIT_ACCESS_TOKEN", "GIT_URL", "ITC_TEAM_ID", "ITC_TEAM_NAME", "KEYCHAIN_PASSWORD"] + required_vars = ["GIT_USERNAME", "GIT_ACCESS_TOKEN", "GIT_URL", "ITC_TEAM_ID", "ITC_TEAM_NAME", "KEYCHAIN_PASSWORD"] ensure_env_vars(required_vars) UI.message("Setting up provisioning profiles...") @@ -367,7 +363,7 @@ platform :ios do with_retry(3, "Fetching provisioning profile for #{app_identifier}") do UI.message("Fetching provisioning profile for #{app_identifier}...") match( - git_basic_authorization: ENV["GIT_ACCESS_TOKEN"], + git_basic_authorization: Base64.strict_encode64("#{ENV["GIT_USERNAME"]}:#{ENV["GIT_ACCESS_TOKEN"]}"), git_url: ENV["GIT_URL"], type: "appstore", clone_branch_directly: true, @@ -493,7 +489,11 @@ platform :ios do upload_to_testflight( - api_key_path: "./appstore_api_key.json", + api_key: app_store_connect_api_key( + key_id: ENV["APPLE_API_KEY_ID"], + issuer_id: ENV["APPLE_API_ISSUER_ID"], + key_filepath: ENV["APPLE_API_KEY_PATH"], + ), ipa: ipa_path, skip_waiting_for_build_processing: true, changelog: changelog diff --git a/fastlane/Matchfile b/fastlane/Matchfile index 9772ca474d..9448000cf6 100644 --- a/fastlane/Matchfile +++ b/fastlane/Matchfile @@ -9,11 +9,7 @@ type(ENV["MATCH_TYPE"] || "appstore") # App identifiers for all BlueWallet apps app_identifier([ - "io.bluewallet.bluewallet", - "io.bluewallet.bluewallet.watch", - "io.bluewallet.bluewallet.watch.extension", - "io.bluewallet.bluewallet.Stickers", - "io.bluewallet.bluewallet.MarketWidget" + "com.layertwolabs.bluewallet" ]) # Your Apple Developer account email address diff --git a/img/icon.png b/img/icon.png index ec541528a9..02bc2883a2 100644 Binary files a/img/icon.png and b/img/icon.png differ diff --git a/img/icon@2x.png b/img/icon@2x.png deleted file mode 100644 index a72c80addc..0000000000 Binary files a/img/icon@2x.png and /dev/null differ diff --git a/img/icon@3x.png b/img/icon@3x.png deleted file mode 100644 index 5727bf3317..0000000000 Binary files a/img/icon@3x.png and /dev/null differ diff --git a/index.js b/index.js index e98c1137cb..f8bb885aea 100644 --- a/index.js +++ b/index.js @@ -30,4 +30,4 @@ const BlueAppComponent = () => { return ; }; -AppRegistry.registerComponent('BlueWallet', () => BlueAppComponent); +AppRegistry.registerComponent('RedWallet', () => BlueAppComponent); diff --git a/ios/BlueWallet.xcodeproj/project.pbxproj b/ios/BlueWallet.xcodeproj/project.pbxproj index 19ee2224ef..9409da0a49 100644 --- a/ios/BlueWallet.xcodeproj/project.pbxproj +++ b/ios/BlueWallet.xcodeproj/project.pbxproj @@ -10,170 +10,55 @@ 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 17CDA0718F42DB2CE856C872 /* libPods-BlueWallet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 040819EDF8BD9C50A9C83E24 /* libPods-BlueWallet.a */; }; 32B5A32A2334450100F8D608 /* Bridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32B5A3292334450100F8D608 /* Bridge.swift */; }; - 32F0A29A2311DBB20095C559 /* ComplicationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 32F0A2992311DBB20095C559 /* ComplicationController.swift */; }; - 6D2A6464258BA92D0092292B /* Stickers.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6D2A6463258BA92D0092292B /* Stickers.xcassets */; }; - 6D2A6468258BA92D0092292B /* Stickers.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 6D2A6461258BA92C0092292B /* Stickers.appex */; platformFilter = ios; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - 6D4AF15925D21172009DD853 /* MarketAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D9A2E6A254BAB1B007B5B82 /* MarketAPI.swift */; }; - 6D4AF16D25D21192009DD853 /* Placeholders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DEB4BFA254FBA0E00E9F9AA /* Placeholders.swift */; }; - 6D4AF17825D211A3009DD853 /* FiatUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D2AA8072568B8F40090B089 /* FiatUnit.swift */; }; - 6D4AF18425D215D1009DD853 /* UserDefaultsExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D4AF18325D215D1009DD853 /* UserDefaultsExtension.swift */; }; - 6DD4109D266CADF10087DE03 /* WidgetKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D333B3A252FE1A3004D72DF /* WidgetKit.framework */; }; - 6DD4109E266CADF10087DE03 /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6D333B3C252FE1A3004D72DF /* SwiftUI.framework */; }; - 6DD410A1266CADF10087DE03 /* Widgets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DD410A0266CADF10087DE03 /* Widgets.swift */; }; - 6DD410A7266CADF40087DE03 /* WidgetsExtension.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 6DD4109C266CADF10087DE03 /* WidgetsExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; - 6DD410AC266CAE470087DE03 /* PriceWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D6CA4BC255872E3009312A5 /* PriceWidget.swift */; }; - 6DD410AF266CAF5C0087DE03 /* WalletInformationAndMarketWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D9A2E06254BA347007B5B82 /* WalletInformationAndMarketWidget.swift */; }; - 6DD410B0266CAF5C0087DE03 /* WalletInformationWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DEB4AB1254FB59C00E9F9AA /* WalletInformationWidget.swift */; }; - 6DD410B1266CAF5C0087DE03 /* MarketAPI+Electrum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D6CA5142558EBA3009312A5 /* MarketAPI+Electrum.swift */; }; - 6DD410B2266CAF5C0087DE03 /* WalletInformationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D641F2225525053003792DF /* WalletInformationView.swift */; }; - 6DD410B3266CAF5C0087DE03 /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DEB4C3A254FBF4800E9F9AA /* Colors.swift */; }; - 6DD410B4266CAF5C0087DE03 /* MarketAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D9A2E6A254BAB1B007B5B82 /* MarketAPI.swift */; }; - 6DD410B6266CAF5C0087DE03 /* PriceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D6CA5272558EC52009312A5 /* PriceView.swift */; }; - 6DD410B7266CAF5C0087DE03 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6D9A2E08254BA348007B5B82 /* Assets.xcassets */; }; - 6DD410B8266CAF5C0087DE03 /* UserDefaultsExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D4AF18325D215D1009DD853 /* UserDefaultsExtension.swift */; }; - 6DD410B9266CAF5C0087DE03 /* UserDefaultsGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA7047D254E24D5005FE5E2 /* UserDefaultsGroup.swift */; }; - 6DD410BA266CAF5C0087DE03 /* FiatUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D2AA8072568B8F40090B089 /* FiatUnit.swift */; }; - 6DD410BB266CAF5C0087DE03 /* MarketView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D641F17255226DA003792DF /* MarketView.swift */; }; - 6DD410BE266CAF5C0087DE03 /* SendReceiveButtons.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D641F3425526311003792DF /* SendReceiveButtons.swift */; }; - 6DD410BF266CB13D0087DE03 /* Placeholders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DEB4BFA254FBA0E00E9F9AA /* Placeholders.swift */; }; - 6DD410C0266CB1460087DE03 /* MarketWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D9946622555A660000E52E8 /* MarketWidget.swift */; }; 6DF25A9F249DB97E001D06F5 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6DF25A9E249DB97E001D06F5 /* LaunchScreen.storyboard */; }; - 6DFC807024EA0B6C007B8700 /* EFQRCode in Frameworks */ = {isa = PBXBuildFile; productRef = 6DFC806F24EA0B6C007B8700 /* EFQRCode */; }; - 6DFC807224EA2FA9007B8700 /* ViewQRCodefaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DFC807124EA2FA9007B8700 /* ViewQRCodefaceController.swift */; }; 764B49B1420D4AEB8109BF62 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B468CC34D5B41F3950078EF /* libsqlite3.0.tbd */; }; 782F075B5DD048449E2DECE9 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = B9D9B3A7B2CB4255876B67AF /* libz.tbd */; }; - 849047CA2702A32A008EE567 /* Handoff.swift in Sources */ = {isa = PBXBuildFile; fileRef = 849047C92702A32A008EE567 /* Handoff.swift */; }; 84E05A842721191B001A0D3A /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 84E05A832721191B001A0D3A /* Settings.bundle */; }; B409AB062D71E07500BA06F8 /* MenuElementsEmitter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B409AB052D71E07500BA06F8 /* MenuElementsEmitter.swift */; }; - B40D4E34225841EC00428FCC /* Interface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = B40D4E32225841EC00428FCC /* Interface.storyboard */; }; - B40D4E36225841ED00428FCC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B40D4E35225841ED00428FCC /* Assets.xcassets */; }; - B40D4E46225841ED00428FCC /* NotificationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40D4E45225841ED00428FCC /* NotificationController.swift */; }; - B40D4E4D225841ED00428FCC /* BlueWalletWatch.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = B40D4E30225841EC00428FCC /* BlueWalletWatch.app */; platformFilter = ios; }; - B40D4E5D2258425500428FCC /* InterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40D4E552258425400428FCC /* InterfaceController.swift */; }; - B40D4E5E2258425500428FCC /* NumericKeypadInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40D4E562258425400428FCC /* NumericKeypadInterfaceController.swift */; }; - B40D4E602258425500428FCC /* SpecifyInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40D4E582258425400428FCC /* SpecifyInterfaceController.swift */; }; - B40D4E632258425500428FCC /* ReceiveInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40D4E5B2258425500428FCC /* ReceiveInterfaceController.swift */; }; - B40D4E642258425500428FCC /* WalletDetailsInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40D4E5C2258425500428FCC /* WalletDetailsInterfaceController.swift */; }; - B40FC3FA29CCD1D00007EBAC /* SwiftTCPClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = B40FC3F829CCD1AC0007EBAC /* SwiftTCPClient.swift */; }; - B41B76852B66B2FF002C48D5 /* Bugsnag in Frameworks */ = {isa = PBXBuildFile; productRef = B41B76842B66B2FF002C48D5 /* Bugsnag */; }; - B41B76872B66B2FF002C48D5 /* BugsnagNetworkRequestPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = B41B76862B66B2FF002C48D5 /* BugsnagNetworkRequestPlugin */; }; B41C2E562BB3DCB8000FE097 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = B41C2E552BB3DCB8000FE097 /* PrivacyInfo.xcprivacy */; }; - B41C2E572BB3DCB8000FE097 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = B41C2E552BB3DCB8000FE097 /* PrivacyInfo.xcprivacy */; }; - B41C2E582BB3DCB8000FE097 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = B41C2E552BB3DCB8000FE097 /* PrivacyInfo.xcprivacy */; }; - B43D0378225847C500FBAA95 /* WalletGradient.swift in Sources */ = {isa = PBXBuildFile; fileRef = B43D0372225847C500FBAA95 /* WalletGradient.swift */; }; - B43D0379225847C500FBAA95 /* WatchDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = B43D0373225847C500FBAA95 /* WatchDataSource.swift */; }; - B43D037A225847C500FBAA95 /* Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B43D0374225847C500FBAA95 /* Transaction.swift */; }; - B43D037B225847C500FBAA95 /* TransactionTableRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = B43D0375225847C500FBAA95 /* TransactionTableRow.swift */; }; - B43D037C225847C500FBAA95 /* Wallet.swift in Sources */ = {isa = PBXBuildFile; fileRef = B43D0376225847C500FBAA95 /* Wallet.swift */; }; - B43D037D225847C500FBAA95 /* WalletInformation.swift in Sources */ = {isa = PBXBuildFile; fileRef = B43D0377225847C500FBAA95 /* WalletInformation.swift */; }; B44033BF2BCC32F800162242 /* BitcoinUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033BE2BCC32F800162242 /* BitcoinUnit.swift */; }; - B44033C02BCC32F800162242 /* BitcoinUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033BE2BCC32F800162242 /* BitcoinUnit.swift */; }; - B44033C12BCC32F800162242 /* BitcoinUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033BE2BCC32F800162242 /* BitcoinUnit.swift */; }; B44033C42BCC332400162242 /* Balance.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033C32BCC332400162242 /* Balance.swift */; }; - B44033C52BCC332400162242 /* Balance.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033C32BCC332400162242 /* Balance.swift */; }; - B44033C62BCC332400162242 /* Balance.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033C32BCC332400162242 /* Balance.swift */; }; B44033CA2BCC350A00162242 /* Currency.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033C92BCC350A00162242 /* Currency.swift */; }; - B44033CB2BCC350A00162242 /* Currency.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033C92BCC350A00162242 /* Currency.swift */; }; - B44033CC2BCC350A00162242 /* Currency.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033C92BCC350A00162242 /* Currency.swift */; }; B44033CE2BCC352900162242 /* UserDefaultsGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA7047D254E24D5005FE5E2 /* UserDefaultsGroup.swift */; }; - B44033D02BCC352F00162242 /* UserDefaultsGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA7047D254E24D5005FE5E2 /* UserDefaultsGroup.swift */; }; B44033D32BCC368800162242 /* UserDefaultsGroupKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033D22BCC368800162242 /* UserDefaultsGroupKey.swift */; }; - B44033D42BCC368800162242 /* UserDefaultsGroupKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033D22BCC368800162242 /* UserDefaultsGroupKey.swift */; }; - B44033D52BCC368800162242 /* UserDefaultsGroupKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033D22BCC368800162242 /* UserDefaultsGroupKey.swift */; }; B44033D82BCC369500162242 /* UserDefaultsExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D4AF18325D215D1009DD853 /* UserDefaultsExtension.swift */; }; B44033DA2BCC369A00162242 /* Colors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DEB4C3A254FBF4800E9F9AA /* Colors.swift */; }; B44033DD2BCC36C300162242 /* LatestTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033DC2BCC36C300162242 /* LatestTransaction.swift */; }; - B44033DE2BCC36C300162242 /* LatestTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033DC2BCC36C300162242 /* LatestTransaction.swift */; }; - B44033DF2BCC36C300162242 /* LatestTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033DC2BCC36C300162242 /* LatestTransaction.swift */; }; B44033E22BCC36CB00162242 /* Placeholders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DEB4BFA254FBA0E00E9F9AA /* Placeholders.swift */; }; B44033E42BCC36FF00162242 /* WalletData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033E32BCC36FF00162242 /* WalletData.swift */; }; - B44033E52BCC36FF00162242 /* WalletData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033E32BCC36FF00162242 /* WalletData.swift */; }; - B44033E62BCC36FF00162242 /* WalletData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033E32BCC36FF00162242 /* WalletData.swift */; }; - B44033EA2BCC371A00162242 /* MarketData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033E82BCC371A00162242 /* MarketData.swift */; }; - B44033EB2BCC371A00162242 /* MarketData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033E82BCC371A00162242 /* MarketData.swift */; }; B44033EE2BCC374500162242 /* Numeric+abbreviated.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033ED2BCC374500162242 /* Numeric+abbreviated.swift */; }; - B44033EF2BCC374500162242 /* Numeric+abbreviated.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033ED2BCC374500162242 /* Numeric+abbreviated.swift */; }; - B44033F02BCC374500162242 /* Numeric+abbreviated.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033ED2BCC374500162242 /* Numeric+abbreviated.swift */; }; B44033F42BCC377F00162242 /* WidgetData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033F32BCC377F00162242 /* WidgetData.swift */; }; - B44033F52BCC377F00162242 /* WidgetData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033F32BCC377F00162242 /* WidgetData.swift */; }; - B44033F62BCC377F00162242 /* WidgetData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033F32BCC377F00162242 /* WidgetData.swift */; }; B44033F92BCC379200162242 /* WidgetDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033F82BCC379200162242 /* WidgetDataStore.swift */; }; - B44033FA2BCC379200162242 /* WidgetDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033F82BCC379200162242 /* WidgetDataStore.swift */; }; - B44033FB2BCC379200162242 /* WidgetDataStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033F82BCC379200162242 /* WidgetDataStore.swift */; }; B44033FE2BCC37D700162242 /* MarketAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D9A2E6A254BAB1B007B5B82 /* MarketAPI.swift */; }; B44034002BCC37F800162242 /* Bundle+decode.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033FF2BCC37F800162242 /* Bundle+decode.swift */; }; - B44034012BCC37F800162242 /* Bundle+decode.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033FF2BCC37F800162242 /* Bundle+decode.swift */; }; - B44034022BCC37F800162242 /* Bundle+decode.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033FF2BCC37F800162242 /* Bundle+decode.swift */; }; B44034052BCC389200162242 /* XMLParserDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4AB225C2B02AD12001F4328 /* XMLParserDelegate.swift */; }; B44034072BCC38A000162242 /* FiatUnit.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D2AA8072568B8F40090B089 /* FiatUnit.swift */; }; B440340F2BCC40A400162242 /* fiatUnits.json in Resources */ = {isa = PBXBuildFile; fileRef = B440340E2BCC40A400162242 /* fiatUnits.json */; }; - B44034102BCC40A400162242 /* fiatUnits.json in Resources */ = {isa = PBXBuildFile; fileRef = B440340E2BCC40A400162242 /* fiatUnits.json */; }; - B44034112BCC40A400162242 /* fiatUnits.json in Resources */ = {isa = PBXBuildFile; fileRef = B440340E2BCC40A400162242 /* fiatUnits.json */; }; B450109C2C0FCD8A00619044 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B450109B2C0FCD8A00619044 /* Utilities.swift */; }; - B450109D2C0FCD9F00619044 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B450109B2C0FCD8A00619044 /* Utilities.swift */; }; - B450109F2C0FCDA500619044 /* Utilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = B450109B2C0FCD8A00619044 /* Utilities.swift */; }; B4549F362B82B10D002E3153 /* ci_post_clone.sh in Resources */ = {isa = PBXBuildFile; fileRef = B4549F352B82B10D002E3153 /* ci_post_clone.sh */; }; B461B852299599F800E431AA /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B461B851299599F800E431AA /* AppDelegate.swift */; }; B4742E972CCDBE8300380EEE /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = B4742E962CCDBE8300380EEE /* Localizable.xcstrings */; }; - B4742E982CCDBE8300380EEE /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = B4742E962CCDBE8300380EEE /* Localizable.xcstrings */; }; - B4742E992CCDBE8300380EEE /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = B4742E962CCDBE8300380EEE /* Localizable.xcstrings */; }; - B4742E9A2CCDBE8300380EEE /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = B4742E962CCDBE8300380EEE /* Localizable.xcstrings */; }; - B4742E9B2CCDBE8300380EEE /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = B4742E962CCDBE8300380EEE /* Localizable.xcstrings */; }; B4793DBB2CEDACBD00C92C2E /* Chain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4793DBA2CEDACBD00C92C2E /* Chain.swift */; }; - B4793DBC2CEDACBD00C92C2E /* Chain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4793DBA2CEDACBD00C92C2E /* Chain.swift */; }; - B4793DBD2CEDACBD00C92C2E /* Chain.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4793DBA2CEDACBD00C92C2E /* Chain.swift */; }; - B4793DBF2CEDACDA00C92C2E /* TransactionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4793DBE2CEDACDA00C92C2E /* TransactionType.swift */; }; - B4793DC12CEDACE700C92C2E /* WalletType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4793DC02CEDACE700C92C2E /* WalletType.swift */; }; - B4793DC32CEDAD4400C92C2E /* KeychainHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4793DC22CEDAD4400C92C2E /* KeychainHelper.swift */; }; - B4793DC42CEDAD4400C92C2E /* KeychainHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4793DC22CEDAD4400C92C2E /* KeychainHelper.swift */; }; B4793DC52CEDAD4400C92C2E /* KeychainHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4793DC22CEDAD4400C92C2E /* KeychainHelper.swift */; }; - B48630D62CCEE67100A8425C /* PriceWidgetProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B48630D52CCEE67100A8425C /* PriceWidgetProvider.swift */; }; B48630DD2CCEE7AC00A8425C /* PriceWidgetEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = B48630DC2CCEE7AC00A8425C /* PriceWidgetEntry.swift */; }; - B48630DE2CCEE7AC00A8425C /* PriceWidgetEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = B48630DC2CCEE7AC00A8425C /* PriceWidgetEntry.swift */; }; - B48630E02CCEE7C800A8425C /* PriceWidgetEntryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B48630DF2CCEE7C800A8425C /* PriceWidgetEntryView.swift */; }; B48630E12CCEE7C800A8425C /* PriceWidgetEntryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B48630DF2CCEE7C800A8425C /* PriceWidgetEntryView.swift */; }; B48630E52CCEE8B800A8425C /* PriceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D6CA5272558EC52009312A5 /* PriceView.swift */; }; B48630E72CCEE91900A8425C /* PriceWidgetProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = B48630D52CCEE67100A8425C /* PriceWidgetProvider.swift */; }; B48630E82CCEE92400A8425C /* PriceWidget.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D6CA4BC255872E3009312A5 /* PriceWidget.swift */; }; - B48630EA2CCEED8400A8425C /* PriceIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = B48630D02CCEE3B300A8425C /* PriceIntent.swift */; }; - B48630EC2CCEEEA700A8425C /* WalletAppShortcuts.swift in Sources */ = {isa = PBXBuildFile; fileRef = B48630EB2CCEEEA700A8425C /* WalletAppShortcuts.swift */; }; B48630ED2CCEEEB000A8425C /* WalletAppShortcuts.swift in Sources */ = {isa = PBXBuildFile; fileRef = B48630EB2CCEEEA700A8425C /* WalletAppShortcuts.swift */; }; B48630EE2CCEEEE900A8425C /* PriceIntent.swift in Sources */ = {isa = PBXBuildFile; fileRef = B48630D02CCEE3B300A8425C /* PriceIntent.swift */; }; - B49A28BB2CD18999006B08E4 /* CompactPriceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B49A28BA2CD18999006B08E4 /* CompactPriceView.swift */; }; B49A28BC2CD18999006B08E4 /* CompactPriceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B49A28BA2CD18999006B08E4 /* CompactPriceView.swift */; }; - B49A28BE2CD189B0006B08E4 /* FiatUnitEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = B49A28BD2CD189B0006B08E4 /* FiatUnitEnum.swift */; }; B49A28BF2CD18A9A006B08E4 /* FiatUnitEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = B49A28BD2CD189B0006B08E4 /* FiatUnitEnum.swift */; }; B49A28C52CD1A894006B08E4 /* MarketData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B44033E82BCC371A00162242 /* MarketData.swift */; }; B4AA75242DAA339E00CF5CBE /* MenuElementsEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = B4AA75232DAA339E00CF5CBE /* MenuElementsEmitter.m */; }; - B4AB225D2B02AD12001F4328 /* XMLParserDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4AB225C2B02AD12001F4328 /* XMLParserDelegate.swift */; }; - B4AB225E2B02AD12001F4328 /* XMLParserDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4AB225C2B02AD12001F4328 /* XMLParserDelegate.swift */; }; B4B1A4622BFA73110072E3BB /* WidgetHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4B1A4612BFA73110072E3BB /* WidgetHelper.swift */; }; - B4B1A4642BFA73110072E3BB /* WidgetHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4B1A4612BFA73110072E3BB /* WidgetHelper.swift */; }; B4B3EC222D69FF6C00327F3D /* CustomSegmentedControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4B3EC202D69FF6C00327F3D /* CustomSegmentedControl.swift */; }; B4B3EC252D69FF8700327F3D /* EventEmitter.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4B3EC232D69FF8700327F3D /* EventEmitter.swift */; }; - B4D0B2622C1DEA11006B6B1B /* ReceivePageInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4D0B2612C1DEA11006B6B1B /* ReceivePageInterfaceController.swift */; }; - B4D0B2642C1DEA99006B6B1B /* ReceiveType.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4D0B2632C1DEA99006B6B1B /* ReceiveType.swift */; }; - B4D0B2662C1DEB7F006B6B1B /* ReceiveInterfaceMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4D0B2652C1DEB7F006B6B1B /* ReceiveInterfaceMode.swift */; }; - B4D0B2682C1DED67006B6B1B /* ReceiveMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4D0B2672C1DED67006B6B1B /* ReceiveMethod.swift */; }; - B4D59C1A2D8BAFE300B7025B /* EFQRCode in Frameworks */ = {isa = PBXBuildFile; productRef = B4D59C192D8BAFE300B7025B /* EFQRCode */; }; - B4D59C1C2D8BAFE300B7025B /* Bugsnag in Frameworks */ = {isa = PBXBuildFile; productRef = B4D59C1B2D8BAFE300B7025B /* Bugsnag */; }; - B4D59C1E2D8BAFE300B7025B /* BugsnagNetworkRequestPlugin in Frameworks */ = {isa = PBXBuildFile; productRef = B4D59C1D2D8BAFE300B7025B /* BugsnagNetworkRequestPlugin */; }; - B4D59C212D8BB42100B7025B /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4D59C202D8BB41F00B7025B /* File.swift */; }; - B4D59C272D8C5D6F00B7025B /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4D59C262D8C5D6E00B7025B /* main.swift */; }; B4D899942DCAE67700B959AA /* CustomSegmentedControl.m in Sources */ = {isa = PBXBuildFile; fileRef = B4D899932DCAE67700B959AA /* CustomSegmentedControl.m */; }; - B4EE583C226703320003363C /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = B40D4E35225841ED00428FCC /* Assets.xcassets */; }; - B4EFF73B2C3F6C5E0095D655 /* MockData.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4EFF73A2C3F6C5E0095D655 /* MockData.swift */; }; - C978A716948AB7DEC5B6F677 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; }; + C978A716948AB7DEC5B6F677 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 6D2A6466258BA92D0092292B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 6D2A6460258BA92C0092292B; - remoteInfo = Stickers; - }; 6D9946672555A661000E52E8 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; @@ -181,20 +66,6 @@ remoteGlobalIDString = 6D99465D2555A660000E52E8; remoteInfo = MarketWidgetExtension; }; - 6DD410A5266CADF40087DE03 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 6DD4109B266CADF10087DE03; - remoteInfo = WidgetsExtension; - }; - B40D4E4B225841ED00428FCC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; - proxyType = 1; - remoteGlobalIDString = B40D4E2F225841EC00428FCC; - remoteInfo = BlueWalletWatch; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -204,8 +75,6 @@ dstPath = ""; dstSubfolderSpec = 13; files = ( - 6D2A6468258BA92D0092292B /* Stickers.appex in Embed Foundation Extensions */, - 6DD410A7266CADF40087DE03 /* WidgetsExtension.appex in Embed Foundation Extensions */, ); name = "Embed Foundation Extensions"; runOnlyForDeploymentPostprocessing = 0; @@ -216,7 +85,6 @@ dstPath = "$(CONTENTS_FOLDER_PATH)/Watch"; dstSubfolderSpec = 16; files = ( - B40D4E4D225841ED00428FCC /* BlueWalletWatch.app in Embed Watch Content */, ); name = "Embed Watch Content"; runOnlyForDeploymentPostprocessing = 0; @@ -269,7 +137,6 @@ 6D294A9924D512690039E22B /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Interface.strings; sourceTree = ""; }; 6D294A9B24D512770039E22B /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Interface.strings; sourceTree = ""; }; 6D294A9D24D5127F0039E22B /* xh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = xh; path = xh.lproj/Interface.strings; sourceTree = ""; }; - 6D2A6461258BA92C0092292B /* Stickers.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = Stickers.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 6D2A6463258BA92D0092292B /* Stickers.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Stickers.xcassets; sourceTree = ""; }; 6D2A6465258BA92D0092292B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 6D2AA8072568B8F40090B089 /* FiatUnit.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FiatUnit.swift; sourceTree = ""; }; @@ -288,7 +155,6 @@ 6D9A2E08254BA348007B5B82 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 6D9A2E6A254BAB1B007B5B82 /* MarketAPI.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MarketAPI.swift; sourceTree = ""; }; 6DA7047D254E24D5005FE5E2 /* UserDefaultsGroup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsGroup.swift; sourceTree = ""; }; - 6DD4109C266CADF10087DE03 /* WidgetsExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = WidgetsExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 6DD410A0266CADF10087DE03 /* Widgets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Widgets.swift; sourceTree = ""; }; 6DD410A4266CADF40087DE03 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 6DD410C3266CCB780087DE03 /* WidgetsExtension.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = WidgetsExtension.entitlements; sourceTree = SOURCE_ROOT; }; @@ -314,7 +180,6 @@ A7C4B1FDAD264618BAF8C335 /* libRNCWebView.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNCWebView.a; sourceTree = ""; }; AB2325650CE04F018697ACFE /* libRNReactNativeHapticFeedback.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNReactNativeHapticFeedback.a; sourceTree = ""; }; B409AB052D71E07500BA06F8 /* MenuElementsEmitter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = MenuElementsEmitter.swift; path = MenuElementsEmitter/MenuElementsEmitter.swift; sourceTree = SOURCE_ROOT; }; - B40D4E30225841EC00428FCC /* BlueWalletWatch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BlueWalletWatch.app; sourceTree = BUILT_PRODUCTS_DIR; }; B40D4E33225841EC00428FCC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Interface.storyboard; sourceTree = ""; }; B40D4E35225841ED00428FCC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; B40D4E37225841ED00428FCC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -404,40 +269,11 @@ files = ( 782F075B5DD048449E2DECE9 /* libz.tbd in Frameworks */, 764B49B1420D4AEB8109BF62 /* libsqlite3.0.tbd in Frameworks */, - C978A716948AB7DEC5B6F677 /* BuildFile in Frameworks */, + C978A716948AB7DEC5B6F677 /* (null) in Frameworks */, 17CDA0718F42DB2CE856C872 /* libPods-BlueWallet.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 421830728822A20A50D8A07C /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - B4D59C1C2D8BAFE300B7025B /* Bugsnag in Frameworks */, - B4D59C1E2D8BAFE300B7025B /* BugsnagNetworkRequestPlugin in Frameworks */, - B41B76872B66B2FF002C48D5 /* BugsnagNetworkRequestPlugin in Frameworks */, - B41B76852B66B2FF002C48D5 /* Bugsnag in Frameworks */, - B4D59C1A2D8BAFE300B7025B /* EFQRCode in Frameworks */, - 6DFC807024EA0B6C007B8700 /* EFQRCode in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 6DD41099266CADF10087DE03 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 6DD4109E266CADF10087DE03 /* SwiftUI.framework in Frameworks */, - 6DD4109D266CADF10087DE03 /* WidgetKit.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8889F8F93C39BB72C97DD77E /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -634,9 +470,6 @@ isa = PBXGroup; children = ( 13B07F961A680F5B00A75B9A /* BlueWallet.app */, - B40D4E30225841EC00428FCC /* BlueWalletWatch.app */, - 6D2A6461258BA92C0092292B /* Stickers.appex */, - 6DD4109C266CADF10087DE03 /* WidgetsExtension.appex */, ); name = Products; sourceTree = ""; @@ -812,67 +645,13 @@ buildRules = ( ); dependencies = ( - B40D4E4C225841ED00428FCC /* PBXTargetDependency */, 6D9946682555A661000E52E8 /* PBXTargetDependency */, - 6D2A6467258BA92D0092292B /* PBXTargetDependency */, - 6DD410A6266CADF40087DE03 /* PBXTargetDependency */, ); name = BlueWallet; productName = "Hello World"; productReference = 13B07F961A680F5B00A75B9A /* BlueWallet.app */; productType = "com.apple.product-type.application"; }; - 6D2A6460258BA92C0092292B /* Stickers */ = { - isa = PBXNativeTarget; - buildConfigurationList = 6D2A646B258BA92D0092292B /* Build configuration list for PBXNativeTarget "Stickers" */; - buildPhases = ( - 6D2A645F258BA92C0092292B /* Resources */, - 8889F8F93C39BB72C97DD77E /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Stickers; - productName = Stickers; - productReference = 6D2A6461258BA92C0092292B /* Stickers.appex */; - productType = "com.apple.product-type.app-extension.messages-sticker-pack"; - }; - 6DD4109B266CADF10087DE03 /* WidgetsExtension */ = { - isa = PBXNativeTarget; - buildConfigurationList = 6DD410A9266CADF40087DE03 /* Build configuration list for PBXNativeTarget "WidgetsExtension" */; - buildPhases = ( - 6DD41098266CADF10087DE03 /* Sources */, - 6DD41099266CADF10087DE03 /* Frameworks */, - 6DD4109A266CADF10087DE03 /* Resources */, - CF0725821442A3000F20E874 /* Upload Bugsnag dSYM */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = WidgetsExtension; - productName = WidgetsExtension; - productReference = 6DD4109C266CADF10087DE03 /* WidgetsExtension.appex */; - productType = "com.apple.product-type.app-extension"; - }; - B40D4E2F225841EC00428FCC /* BlueWalletWatch */ = { - isa = PBXNativeTarget; - buildConfigurationList = B40D4E52225841ED00428FCC /* Build configuration list for PBXNativeTarget "BlueWalletWatch" */; - buildPhases = ( - B40D4E2E225841EC00428FCC /* Resources */, - 421830728822A20A50D8A07C /* Frameworks */, - B40D4E38225841ED00428FCC /* Sources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = BlueWalletWatch; - productName = BlueWalletWatch; - productReference = B40D4E30225841EC00428FCC /* BlueWalletWatch.app */; - productType = "com.apple.product-type.application"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -892,16 +671,6 @@ }; }; }; - 6D2A6460258BA92C0092292B = { - CreatedOnToolsVersion = 12.1; - }; - 6DD4109B266CADF10087DE03 = { - CreatedOnToolsVersion = 12.5; - }; - B40D4E2F225841EC00428FCC = { - CreatedOnToolsVersion = 10.2; - LastSwiftMigration = 1240; - }; }; }; buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "BlueWallet" */; @@ -947,9 +716,6 @@ projectRoot = ""; targets = ( 13B07F861A680F5B00A75B9A /* BlueWallet */, - B40D4E2F225841EC00428FCC /* BlueWalletWatch */, - 6D2A6460258BA92C0092292B /* Stickers */, - 6DD4109B266CADF10087DE03 /* WidgetsExtension */, ); }; /* End PBXProject section */ @@ -969,40 +735,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 6D2A645F258BA92C0092292B /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - B4742E9A2CCDBE8300380EEE /* Localizable.xcstrings in Resources */, - 6D2A6464258BA92D0092292B /* Stickers.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 6DD4109A266CADF10087DE03 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - B41C2E582BB3DCB8000FE097 /* PrivacyInfo.xcprivacy in Resources */, - B44034112BCC40A400162242 /* fiatUnits.json in Resources */, - B4742E9B2CCDBE8300380EEE /* Localizable.xcstrings in Resources */, - 6DD410B7266CAF5C0087DE03 /* Assets.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - B40D4E2E225841EC00428FCC /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - B4742E982CCDBE8300380EEE /* Localizable.xcstrings in Resources */, - B44034102BCC40A400162242 /* fiatUnits.json in Resources */, - B4742E992CCDBE8300380EEE /* Localizable.xcstrings in Resources */, - B40D4E36225841ED00428FCC /* Assets.xcassets in Resources */, - B4EE583C226703320003363C /* Assets.xcassets in Resources */, - B41C2E572BB3DCB8000FE097 /* PrivacyInfo.xcprivacy in Resources */, - B40D4E34225841EC00428FCC /* Interface.storyboard in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -1093,34 +825,17 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-BlueWallet/Pods-BlueWallet-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-BlueWallet/Pods-BlueWallet-frameworks-${CONFIGURATION}-output-files.xcfilelist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-BlueWallet/Pods-BlueWallet-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - CF0725821442A3000F20E874 /* Upload Bugsnag dSYM */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); inputPaths = ( - "${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}", - "${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}", ); - name = "Upload Bugsnag dSYM"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-BlueWallet/Pods-BlueWallet-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; - shellPath = "/usr/bin/env ruby"; - shellScript = "api_key = nil # Insert your key here to use it directly from this script\n\n# Attempt to get the API key from an environment variable\nunless api_key\n api_key = ENV[\"BUGSNAG_API_KEY\"]\n\n # If not present, attempt to lookup the value from the Info.plist\n unless api_key\n info_plist_path = \"#{ENV[\"BUILT_PRODUCTS_DIR\"]}/#{ENV[\"INFOPLIST_PATH\"]}\"\n plist_buddy_response = `/usr/libexec/PlistBuddy -c \"print :bugsnag:apiKey\" \"#{info_plist_path}\"`\n plist_buddy_response = `/usr/libexec/PlistBuddy -c \"print :BugsnagAPIKey\" \"#{info_plist_path}\"` if !$?.success?\n api_key = plist_buddy_response if $?.success?\n end\nend\n\nfail(\"No Bugsnag API key detected - add your key to your Info.plist, BUGSNAG_API_KEY environment variable or this Run Script phase\") unless api_key\n\nfork do\n Process.setsid\n STDIN.reopen(\"/dev/null\")\n STDOUT.reopen(\"/dev/null\", \"a\")\n STDERR.reopen(\"/dev/null\", \"a\")\n\n require 'shellwords'\n\n Dir[\"#{ENV[\"DWARF_DSYM_FOLDER_PATH\"]}/*/Contents/Resources/DWARF/*\"].each do |dsym|\n curl_command = \"curl --http1.1 -F dsym=@#{Shellwords.escape(dsym)} -F projectRoot=#{Shellwords.escape(ENV[\"PROJECT_DIR\"])} \"\n curl_command += \"-F apiKey=#{Shellwords.escape(api_key)} \"\n curl_command += \"https://upload.bugsnag.com/\"\n system(curl_command)\n end\nend\n\n"; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-BlueWallet/Pods-BlueWallet-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; D0E81659D2FBFDD27024CF05 /* [CP] Copy Pods Resources */ = { @@ -1131,10 +846,14 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-BlueWallet/Pods-BlueWallet-resources-${CONFIGURATION}-input-files.xcfilelist", ); + inputPaths = ( + ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-BlueWallet/Pods-BlueWallet-resources-${CONFIGURATION}-output-files.xcfilelist", ); + outputPaths = ( + ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-BlueWallet/Pods-BlueWallet-resources.sh\"\n"; @@ -1188,127 +907,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 6DD41098266CADF10087DE03 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 6DD410BE266CAF5C0087DE03 /* SendReceiveButtons.swift in Sources */, - B48630E02CCEE7C800A8425C /* PriceWidgetEntryView.swift in Sources */, - 6DD410B4266CAF5C0087DE03 /* MarketAPI.swift in Sources */, - B4793DC32CEDAD4400C92C2E /* KeychainHelper.swift in Sources */, - B40FC3FA29CCD1D00007EBAC /* SwiftTCPClient.swift in Sources */, - B48630EC2CCEEEA700A8425C /* WalletAppShortcuts.swift in Sources */, - 6DD410A1266CADF10087DE03 /* Widgets.swift in Sources */, - B450109D2C0FCD9F00619044 /* Utilities.swift in Sources */, - B49A28BE2CD189B0006B08E4 /* FiatUnitEnum.swift in Sources */, - 6DD410AC266CAE470087DE03 /* PriceWidget.swift in Sources */, - B4B1A4642BFA73110072E3BB /* WidgetHelper.swift in Sources */, - B44033D52BCC368800162242 /* UserDefaultsGroupKey.swift in Sources */, - 6DD410B2266CAF5C0087DE03 /* WalletInformationView.swift in Sources */, - B44034022BCC37F800162242 /* Bundle+decode.swift in Sources */, - B48630D62CCEE67100A8425C /* PriceWidgetProvider.swift in Sources */, - B44033CC2BCC350A00162242 /* Currency.swift in Sources */, - 6DD410B6266CAF5C0087DE03 /* PriceView.swift in Sources */, - B48630DE2CCEE7AC00A8425C /* PriceWidgetEntry.swift in Sources */, - B49A28BB2CD18999006B08E4 /* CompactPriceView.swift in Sources */, - 6DD410B3266CAF5C0087DE03 /* Colors.swift in Sources */, - B44033C12BCC32F800162242 /* BitcoinUnit.swift in Sources */, - 6DD410BB266CAF5C0087DE03 /* MarketView.swift in Sources */, - B44033F02BCC374500162242 /* Numeric+abbreviated.swift in Sources */, - B44033DF2BCC36C300162242 /* LatestTransaction.swift in Sources */, - 6DD410C0266CB1460087DE03 /* MarketWidget.swift in Sources */, - B4793DBC2CEDACBD00C92C2E /* Chain.swift in Sources */, - B4AB225E2B02AD12001F4328 /* XMLParserDelegate.swift in Sources */, - B44033F62BCC377F00162242 /* WidgetData.swift in Sources */, - 6DD410BA266CAF5C0087DE03 /* FiatUnit.swift in Sources */, - B44033FB2BCC379200162242 /* WidgetDataStore.swift in Sources */, - B44033EB2BCC371A00162242 /* MarketData.swift in Sources */, - 6DD410AF266CAF5C0087DE03 /* WalletInformationAndMarketWidget.swift in Sources */, - B44033C62BCC332400162242 /* Balance.swift in Sources */, - B44033E62BCC36FF00162242 /* WalletData.swift in Sources */, - 6DD410BF266CB13D0087DE03 /* Placeholders.swift in Sources */, - 6DD410B0266CAF5C0087DE03 /* WalletInformationWidget.swift in Sources */, - 6DD410B1266CAF5C0087DE03 /* MarketAPI+Electrum.swift in Sources */, - 6DD410B9266CAF5C0087DE03 /* UserDefaultsGroup.swift in Sources */, - 6DD410B8266CAF5C0087DE03 /* UserDefaultsExtension.swift in Sources */, - B48630EA2CCEED8400A8425C /* PriceIntent.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - B40D4E38225841ED00428FCC /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - B43D037C225847C500FBAA95 /* Wallet.swift in Sources */, - 6D4AF17825D211A3009DD853 /* FiatUnit.swift in Sources */, - B43D037A225847C500FBAA95 /* Transaction.swift in Sources */, - 32F0A29A2311DBB20095C559 /* ComplicationController.swift in Sources */, - B40D4E602258425500428FCC /* SpecifyInterfaceController.swift in Sources */, - B4D0B2642C1DEA99006B6B1B /* ReceiveType.swift in Sources */, - B43D0379225847C500FBAA95 /* WatchDataSource.swift in Sources */, - B450109F2C0FCDA500619044 /* Utilities.swift in Sources */, - B44033D42BCC368800162242 /* UserDefaultsGroupKey.swift in Sources */, - B4D59C212D8BB42100B7025B /* File.swift in Sources */, - B44034012BCC37F800162242 /* Bundle+decode.swift in Sources */, - B4D0B2682C1DED67006B6B1B /* ReceiveMethod.swift in Sources */, - 849047CA2702A32A008EE567 /* Handoff.swift in Sources */, - B44033EA2BCC371A00162242 /* MarketData.swift in Sources */, - B44033CB2BCC350A00162242 /* Currency.swift in Sources */, - 6DFC807224EA2FA9007B8700 /* ViewQRCodefaceController.swift in Sources */, - B40D4E46225841ED00428FCC /* NotificationController.swift in Sources */, - B40D4E5D2258425500428FCC /* InterfaceController.swift in Sources */, - B4D59C272D8C5D6F00B7025B /* main.swift in Sources */, - B4793DBD2CEDACBD00C92C2E /* Chain.swift in Sources */, - B44033FA2BCC379200162242 /* WidgetDataStore.swift in Sources */, - B44033DE2BCC36C300162242 /* LatestTransaction.swift in Sources */, - B4D0B2662C1DEB7F006B6B1B /* ReceiveInterfaceMode.swift in Sources */, - B43D037B225847C500FBAA95 /* TransactionTableRow.swift in Sources */, - B43D037D225847C500FBAA95 /* WalletInformation.swift in Sources */, - 6D4AF15925D21172009DD853 /* MarketAPI.swift in Sources */, - B40D4E642258425500428FCC /* WalletDetailsInterfaceController.swift in Sources */, - 6D4AF16D25D21192009DD853 /* Placeholders.swift in Sources */, - B4793DC42CEDAD4400C92C2E /* KeychainHelper.swift in Sources */, - B40D4E632258425500428FCC /* ReceiveInterfaceController.swift in Sources */, - B43D0378225847C500FBAA95 /* WalletGradient.swift in Sources */, - B4EFF73B2C3F6C5E0095D655 /* MockData.swift in Sources */, - B44033C02BCC32F800162242 /* BitcoinUnit.swift in Sources */, - B44033E52BCC36FF00162242 /* WalletData.swift in Sources */, - B44033EF2BCC374500162242 /* Numeric+abbreviated.swift in Sources */, - B4793DC12CEDACE700C92C2E /* WalletType.swift in Sources */, - B4793DBF2CEDACDA00C92C2E /* TransactionType.swift in Sources */, - B4D0B2622C1DEA11006B6B1B /* ReceivePageInterfaceController.swift in Sources */, - B44033D02BCC352F00162242 /* UserDefaultsGroup.swift in Sources */, - B44033C52BCC332400162242 /* Balance.swift in Sources */, - 6D4AF18425D215D1009DD853 /* UserDefaultsExtension.swift in Sources */, - B4AB225D2B02AD12001F4328 /* XMLParserDelegate.swift in Sources */, - B40D4E5E2258425500428FCC /* NumericKeypadInterfaceController.swift in Sources */, - B44033F52BCC377F00162242 /* WidgetData.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 6D2A6467258BA92D0092292B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 6D2A6460258BA92C0092292B /* Stickers */; - targetProxy = 6D2A6466258BA92D0092292B /* PBXContainerItemProxy */; - }; 6D9946682555A661000E52E8 /* PBXTargetDependency */ = { isa = PBXTargetDependency; targetProxy = 6D9946672555A661000E52E8 /* PBXContainerItemProxy */; }; - 6DD410A6266CADF40087DE03 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 6DD4109B266CADF10087DE03 /* WidgetsExtension */; - targetProxy = 6DD410A5266CADF40087DE03 /* PBXContainerItemProxy */; - }; - B40D4E4C225841ED00428FCC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - platformFilter = ios; - target = B40D4E2F225841EC00428FCC /* BlueWalletWatch */; - targetProxy = B40D4E4B225841ED00428FCC /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin PBXVariantGroup section */ @@ -1361,8 +966,8 @@ CURRENT_PROJECT_VERSION = 1703239999; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = A7W54YZ4WU; - "DEVELOPMENT_TEAM[sdk=macosx*]" = A7W54YZ4WU; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6AXPP357T2; + "DEVELOPMENT_TEAM[sdk=macosx*]" = 6AXPP357T2; ENABLE_BITCODE = NO; "ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1374,7 +979,7 @@ INFOPLIST_FILE = BlueWallet/Info.plist; INFOPLIST_KEY_CLKComplicationPrincipalClass = "$(PRODUCT_BUNDLE_IDENTIFIER).ComplicationController"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance"; - INFOPLIST_KEY_WKCompanionAppBundleIdentifier = io.bluewallet.bluewallet; + INFOPLIST_KEY_WKCompanionAppBundleIdentifier = com.layertwolabs.bluewallet; IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1392,11 +997,11 @@ "-lc++", ); PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet; + PRODUCT_BUNDLE_IDENTIFIER = com.layertwolabs.bluewallet; PRODUCT_NAME = BlueWallet; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.bluewallet.bluewallet"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match Development io.bluewallet.bluewallet catalyst"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.layertwolabs.bluewallet"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match Development com.layertwolabs.bluewallet catalyst"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = YES; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -1423,15 +1028,15 @@ CURRENT_PROJECT_VERSION = 1703239999; DEAD_CODE_STRIPPING = YES; DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = A7W54YZ4WU; - "DEVELOPMENT_TEAM[sdk=macosx*]" = A7W54YZ4WU; + "DEVELOPMENT_TEAM[sdk=iphoneos*]" = 6AXPP357T2; + "DEVELOPMENT_TEAM[sdk=macosx*]" = 6AXPP357T2; ENABLE_BITCODE = NO; "ENABLE_HARDENED_RUNTIME[sdk=macosx*]" = YES; HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = BlueWallet/Info.plist; INFOPLIST_KEY_CLKComplicationPrincipalClass = "$(PRODUCT_BUNDLE_IDENTIFIER).ComplicationController"; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance"; - INFOPLIST_KEY_WKCompanionAppBundleIdentifier = io.bluewallet.bluewallet; + INFOPLIST_KEY_WKCompanionAppBundleIdentifier = com.layertwolabs.bluewallet; IPHONEOS_DEPLOYMENT_TARGET = 15.6; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -1449,11 +1054,11 @@ "-lc++", ); PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet; + PRODUCT_BUNDLE_IDENTIFIER = com.layertwolabs.bluewallet; PRODUCT_NAME = BlueWallet; PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.bluewallet.bluewallet"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match AppStore io.bluewallet.bluewallet catalyst"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore com.layertwolabs.bluewallet"; + "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match AppStore com.layertwolabs.bluewallet catalyst"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = YES; SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; @@ -1465,209 +1070,6 @@ }; name = Release; }; - 6D2A6469258BA92D0092292B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon"; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1703239999; - DEAD_CODE_STRIPPING = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = A7W54YZ4WU; - GCC_C_LANGUAGE_STANDARD = gnu11; - INFOPLIST_FILE = Stickers/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; - LIBRARY_SEARCH_PATHS = ( - "$(SDKROOT)/usr/lib/swift", - "$(SDKROOT)/System/iOSSupport/usr/lib/swift", - "$(inherited)", - ); - MARKETING_VERSION = 7.2.1; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.Stickers; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.bluewallet.bluewallet.Stickers"; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 6D2A646A258BA92D0092292B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = "iMessage App Icon"; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1703239999; - DEAD_CODE_STRIPPING = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = A7W54YZ4WU; - GCC_C_LANGUAGE_STANDARD = gnu11; - INFOPLIST_FILE = Stickers/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; - LIBRARY_SEARCH_PATHS = ( - "$(SDKROOT)/usr/lib/swift", - "$(SDKROOT)/System/iOSSupport/usr/lib/swift", - "$(inherited)", - ); - MARKETING_VERSION = 7.2.1; - MTL_FAST_MATH = YES; - PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.Stickers; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.bluewallet.bluewallet.Stickers"; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - 6DD410AA266CADF40087DE03 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = WidgetsExtension.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1703239999; - DEAD_CODE_STRIPPING = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = A7W54YZ4WU; - "DEVELOPMENT_TEAM[sdk=macosx*]" = A7W54YZ4WU; - "DEVELOPMENT_TEAM[sdk=watchos*]" = A7W54YZ4WU; - GCC_C_LANGUAGE_STANDARD = gnu11; - INFOPLIST_FILE = Widgets/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 17.5; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - LIBRARY_SEARCH_PATHS = ( - "$(SDKROOT)/usr/lib/swift", - "$(SDKROOT)/System/iOSSupport/usr/lib/swift", - "$(inherited)", - ); - MARKETING_VERSION = 7.2.1; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.MarketWidget; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match Development io.bluewallet.bluewallet.MarketWidget"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match Development io.bluewallet.bluewallet.MarketWidget catalyst"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=watchos*]" = "match Development io.bluewallet.bluewallet.MarketWidget"; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator watchos watchsimulator"; - SUPPORTS_MACCATALYST = YES; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2,4,6"; - TVOS_DEPLOYMENT_TARGET = 15.6; - WATCHOS_DEPLOYMENT_TARGET = 9.6; - }; - name = Debug; - }; - 6DD410AB266CADF40087DE03 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = WidgetsExtension.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution"; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution"; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1703239999; - DEAD_CODE_STRIPPING = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=iphoneos*]" = A7W54YZ4WU; - "DEVELOPMENT_TEAM[sdk=macosx*]" = A7W54YZ4WU; - "DEVELOPMENT_TEAM[sdk=watchos*]" = A7W54YZ4WU; - GCC_C_LANGUAGE_STANDARD = gnu11; - INFOPLIST_FILE = Widgets/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 17.5; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - LIBRARY_SEARCH_PATHS = ( - "$(SDKROOT)/usr/lib/swift", - "$(SDKROOT)/System/iOSSupport/usr/lib/swift", - "$(inherited)", - ); - MARKETING_VERSION = 7.2.1; - MTL_FAST_MATH = YES; - PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.MarketWidget; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "match AppStore io.bluewallet.bluewallet.MarketWidget"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=macosx*]" = "match AppStore io.bluewallet.bluewallet.MarketWidget catalyst"; - "PROVISIONING_PROFILE_SPECIFIER[sdk=watchos*]" = "match AppStore io.bluewallet.bluewallet.MarketWidget"; - SKIP_INSTALL = YES; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator watchos watchsimulator"; - SUPPORTS_MACCATALYST = YES; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2,4,6"; - TVOS_DEPLOYMENT_TARGET = 15.6; - WATCHOS_DEPLOYMENT_TARGET = 9.6; - }; - name = Release; - }; 83CBBA201A601CBA00E9B192 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1804,120 +1206,6 @@ }; name = Release; }; - B40D4E53225841ED00428FCC /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = BlueWalletWatch/BlueWalletWatch.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Developer"; - CODE_SIGN_STYLE = Manual; - CURRENT_PROJECT_VERSION = 1703239999; - DEAD_CODE_STRIPPING = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=watchos*]" = A7W54YZ4WU; - GCC_C_LANGUAGE_STANDARD = gnu11; - INFOPLIST_FILE = BlueWalletWatch/Info.plist; - INFOPLIST_KEY_CLKComplicationPrincipalClass = io.bluewallet.bluewallet.watch.extension.ComplicationController; - INFOPLIST_KEY_UIMainStoryboardFile = Interface; - INFOPLIST_KEY_UIUserInterfaceStyle = Automatic; - INFOPLIST_KEY_WKCompanionAppBundleIdentifier = io.bluewallet.bluewallet; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; - LD_RUNPATH_SEARCH_PATHS = ( - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - LIBRARY_SEARCH_PATHS = ( - "$(SDKROOT)/usr/lib/swift", - "$(SDKROOT)/System/iOSSupport/usr/lib/swift", - "$(inherited)", - ); - MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 7.2.1; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.watch; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=watchos*]" = "match Development io.bluewallet.bluewallet.watch"; - SDKROOT = watchos; - SKIP_INSTALL = YES; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_OBJC_BRIDGING_HEADER = "BlueWalletWatch/BlueWalletWatch-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 11.0; - }; - name = Debug; - }; - B40D4E54225841ED00428FCC /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_COMPLICATION_NAME = Complication; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_ENTITLEMENTS = BlueWalletWatch/BlueWalletWatch.entitlements; - CODE_SIGN_IDENTITY = "Apple Development"; - "CODE_SIGN_IDENTITY[sdk=watchos*]" = "iPhone Distribution"; - CODE_SIGN_STYLE = Manual; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1703239999; - DEAD_CODE_STRIPPING = YES; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = ""; - "DEVELOPMENT_TEAM[sdk=watchos*]" = A7W54YZ4WU; - GCC_C_LANGUAGE_STANDARD = gnu11; - INFOPLIST_FILE = BlueWalletWatch/Info.plist; - INFOPLIST_KEY_CLKComplicationPrincipalClass = io.bluewallet.bluewallet.watch.extension.ComplicationController; - INFOPLIST_KEY_UIMainStoryboardFile = Interface; - INFOPLIST_KEY_UIUserInterfaceStyle = Automatic; - INFOPLIST_KEY_WKCompanionAppBundleIdentifier = io.bluewallet.bluewallet; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; - LD_RUNPATH_SEARCH_PATHS = ( - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - LIBRARY_SEARCH_PATHS = ( - "$(SDKROOT)/usr/lib/swift", - "$(SDKROOT)/System/iOSSupport/usr/lib/swift", - "$(inherited)", - ); - MACOSX_DEPLOYMENT_TARGET = 12.4; - MARKETING_VERSION = 7.2.1; - MTL_FAST_MATH = YES; - PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES; - PRODUCT_BUNDLE_IDENTIFIER = io.bluewallet.bluewallet.watch; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - "PROVISIONING_PROFILE_SPECIFIER[sdk=watchos*]" = "match AppStore io.bluewallet.bluewallet.watch"; - SDKROOT = watchos; - SKIP_INSTALL = YES; - SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_OBJC_BRIDGING_HEADER = "BlueWalletWatch/BlueWalletWatch-Bridging-Header.h"; - SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = 4; - WATCHOS_DEPLOYMENT_TARGET = 11.0; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1930,24 +1218,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 6D2A646B258BA92D0092292B /* Build configuration list for PBXNativeTarget "Stickers" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 6D2A6469258BA92D0092292B /* Debug */, - 6D2A646A258BA92D0092292B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 6DD410A9266CADF40087DE03 /* Build configuration list for PBXNativeTarget "WidgetsExtension" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 6DD410AA266CADF40087DE03 /* Debug */, - 6DD410AB266CADF40087DE03 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "BlueWallet" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1957,15 +1227,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B40D4E52225841ED00428FCC /* Build configuration list for PBXNativeTarget "BlueWalletWatch" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - B40D4E53225841ED00428FCC /* Debug */, - B40D4E54225841ED00428FCC /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ @@ -1986,39 +1247,6 @@ }; }; /* End XCRemoteSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - 6DFC806F24EA0B6C007B8700 /* EFQRCode */ = { - isa = XCSwiftPackageProductDependency; - package = 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */; - productName = EFQRCode; - }; - B41B76842B66B2FF002C48D5 /* Bugsnag */ = { - isa = XCSwiftPackageProductDependency; - package = B41B76832B66B2FF002C48D5 /* XCRemoteSwiftPackageReference "bugsnag-cocoa" */; - productName = Bugsnag; - }; - B41B76862B66B2FF002C48D5 /* BugsnagNetworkRequestPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = B41B76832B66B2FF002C48D5 /* XCRemoteSwiftPackageReference "bugsnag-cocoa" */; - productName = BugsnagNetworkRequestPlugin; - }; - B4D59C192D8BAFE300B7025B /* EFQRCode */ = { - isa = XCSwiftPackageProductDependency; - package = 6DFC806E24EA0B6C007B8700 /* XCRemoteSwiftPackageReference "EFQRCode" */; - productName = EFQRCode; - }; - B4D59C1B2D8BAFE300B7025B /* Bugsnag */ = { - isa = XCSwiftPackageProductDependency; - package = B41B76832B66B2FF002C48D5 /* XCRemoteSwiftPackageReference "bugsnag-cocoa" */; - productName = Bugsnag; - }; - B4D59C1D2D8BAFE300B7025B /* BugsnagNetworkRequestPlugin */ = { - isa = XCSwiftPackageProductDependency; - package = B41B76832B66B2FF002C48D5 /* XCRemoteSwiftPackageReference "bugsnag-cocoa" */; - productName = BugsnagNetworkRequestPlugin; - }; -/* End XCSwiftPackageProductDependency section */ }; rootObject = 83CBB9F71A601CBA00E9B192 /* Project object */; } diff --git a/ios/BlueWallet/AppDelegate.swift b/ios/BlueWallet/AppDelegate.swift index abbd11c779..6a41a11288 100644 --- a/ios/BlueWallet/AppDelegate.swift +++ b/ios/BlueWallet/AppDelegate.swift @@ -44,7 +44,7 @@ class AppDelegate: RCTAppDelegate, UNUserNotificationCenterDelegate { #endif } - self.moduleName = "BlueWallet" + self.moduleName = "RedWallet" self.dependencyProvider = RCTAppDependencyProvider() self.initialProps = [:] @@ -304,7 +304,7 @@ class AppDelegate: RCTAppDelegate, UNUserNotificationCenterDelegate { userDefaultsGroup?.setValue(userActivityData, forKey: "onUserActivityOpen") - if ["io.bluewallet.bluewallet.receiveonchain", "io.bluewallet.bluewallet.xpub", "io.bluewallet.bluewallet.blockexplorer"].contains(activityType) { + if ["com.layertwolabs.bluewallet.receiveonchain", "com.layertwolabs.bluewallet.xpub", "com.layertwolabs.bluewallet.blockexplorer"].contains(activityType) { EventEmitter.shared().sendUserActivity(userActivityData) return true } diff --git a/ios/BlueWallet/BlueWallet.entitlements b/ios/BlueWallet/BlueWallet.entitlements index b2b8e48bb0..fd4c532376 100644 --- a/ios/BlueWallet/BlueWallet.entitlements +++ b/ios/BlueWallet/BlueWallet.entitlements @@ -8,7 +8,7 @@ com.apple.security.application-groups - group.io.bluewallet.bluewallet + group.com.layertwolabs.bluewallet com.apple.security.device.camera diff --git a/ios/BlueWallet/BlueWalletRelease.entitlements b/ios/BlueWallet/BlueWalletRelease.entitlements index b2b8e48bb0..fd4c532376 100644 --- a/ios/BlueWallet/BlueWalletRelease.entitlements +++ b/ios/BlueWallet/BlueWalletRelease.entitlements @@ -8,7 +8,7 @@ com.apple.security.application-groups - group.io.bluewallet.bluewallet + group.com.layertwolabs.bluewallet com.apple.security.device.camera diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/100.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/100.png new file mode 100644 index 0000000000..f5cad14551 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/100.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/102.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/102.png new file mode 100644 index 0000000000..ab0ec8c57b Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/102.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/1024 1.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/1024 1.png deleted file mode 100644 index 594857ecda..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/1024 1.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/1024 2.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/1024 2.png deleted file mode 100644 index 94ff21813d..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/1024 2.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/1024.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/1024.png index 9c2422d9c2..1a5fff7642 100644 Binary files a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/1024.png and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/1024.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/108.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/108.png new file mode 100644 index 0000000000..5920378de3 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/108.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/114.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/114.png new file mode 100644 index 0000000000..314d02e99e Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/114.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/120.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/120.png new file mode 100644 index 0000000000..f0e8007782 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/120.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/128.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/128.png new file mode 100644 index 0000000000..cfc9fee93f Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/128.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/144.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/144.png new file mode 100644 index 0000000000..a266a27118 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/144.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/152.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/152.png new file mode 100644 index 0000000000..22d1bc7a98 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/152.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/16.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/16.png new file mode 100644 index 0000000000..8c514665db Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/16.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/167.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/167.png new file mode 100644 index 0000000000..a17eda7117 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/167.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/172.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/172.png new file mode 100644 index 0000000000..ef76e0ae93 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/172.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/180.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/180.png new file mode 100644 index 0000000000..48fcc8f956 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/180.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/196.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/196.png new file mode 100644 index 0000000000..047ac363bd Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/196.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/20.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/20.png new file mode 100644 index 0000000000..77b6a9a875 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/20.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/216.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/216.png new file mode 100644 index 0000000000..e1b9056770 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/216.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/234.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/234.png new file mode 100644 index 0000000000..2f34eab961 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/234.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/256.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/256.png new file mode 100644 index 0000000000..9808c7b933 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/256.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/258.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/258.png new file mode 100644 index 0000000000..e3df91e657 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/258.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/29.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/29.png new file mode 100644 index 0000000000..cd85d1b346 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/29.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/32.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/32.png new file mode 100644 index 0000000000..70965f3cc1 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/32.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/40.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/40.png new file mode 100644 index 0000000000..c31cdb5d95 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/40.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/48.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/48.png new file mode 100644 index 0000000000..2ac6112d90 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/48.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/50.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/50.png new file mode 100644 index 0000000000..9a242fd253 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/50.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/512.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/512.png new file mode 100644 index 0000000000..f08247c09f Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/512.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/55.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/55.png new file mode 100644 index 0000000000..51def0eabc Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/55.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/57.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/57.png new file mode 100644 index 0000000000..7651c5f595 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/57.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/58.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/58.png new file mode 100644 index 0000000000..52f94fca3d Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/58.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/60.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/60.png new file mode 100644 index 0000000000..e7caf09fb2 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/60.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/64.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/64.png new file mode 100644 index 0000000000..419232fc9a Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/64.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/66.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/66.png new file mode 100644 index 0000000000..abf73177f1 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/66.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/72.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/72.png new file mode 100644 index 0000000000..ff66f0d6aa Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/72.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/76.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/76.png new file mode 100644 index 0000000000..566bd83601 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/76.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/80.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/80.png new file mode 100644 index 0000000000..37288cee1c Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/80.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/87.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/87.png new file mode 100644 index 0000000000..7b8541dbe9 Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/87.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/88.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/88.png new file mode 100644 index 0000000000..7dac68d11d Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/88.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/92.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/92.png new file mode 100644 index 0000000000..fe94b1dfaf Binary files /dev/null and b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/92.png differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/BlueWallet-1024.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/BlueWallet-1024.png deleted file mode 100644 index 33f4a58f69..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/BlueWallet-1024.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/Contents.json index 052b626a2f..ed14dd1d02 100644 --- a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,104 +1,450 @@ { - "images" : [ + "images": [ { - "filename" : "BlueWallet-1024.png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" + "size": "60x60", + "expected-size": "180", + "filename": "180.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "iphone", + "scale": "3x" }, { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "dark" - } - ], - "filename" : "1024.png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" + "size": "40x40", + "expected-size": "80", + "filename": "80.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "iphone", + "scale": "2x" }, { - "appearances" : [ - { - "appearance" : "luminosity", - "value" : "tinted" - } - ], - "filename" : "1024 1.png", - "idiom" : "universal", - "platform" : "ios", - "size" : "1024x1024" + "size": "40x40", + "expected-size": "120", + "filename": "120.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "iphone", + "scale": "3x" }, { - "filename" : "icon_16x16.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" + "size": "60x60", + "expected-size": "120", + "filename": "120.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "iphone", + "scale": "2x" }, { - "filename" : "icon_16x16@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "16x16" + "size": "57x57", + "expected-size": "57", + "filename": "57.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "iphone", + "scale": "1x" }, { - "filename" : "icon_32x32.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "32x32" + "size": "29x29", + "expected-size": "58", + "filename": "58.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "iphone", + "scale": "2x" }, { - "filename" : "icon_32x32@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "32x32" + "size": "29x29", + "expected-size": "29", + "filename": "29.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "iphone", + "scale": "1x" }, { - "filename" : "icon_128x128.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" + "size": "29x29", + "expected-size": "87", + "filename": "87.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "iphone", + "scale": "3x" }, { - "filename" : "icon_128x128@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" + "size": "57x57", + "expected-size": "114", + "filename": "114.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "iphone", + "scale": "2x" }, { - "filename" : "icon_256x256.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "256x256" + "size": "20x20", + "expected-size": "40", + "filename": "40.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "iphone", + "scale": "2x" }, { - "filename" : "icon_256x256@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "256x256" + "size": "20x20", + "expected-size": "60", + "filename": "60.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "iphone", + "scale": "3x" }, { - "filename" : "icon_512x512.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "512x512" + "size": "1024x1024", + "filename": "1024.png", + "expected-size": "1024", + "idiom": "ios-marketing", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "scale": "1x" }, { - "filename" : "icon_512x512@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "512x512" + "size": "40x40", + "expected-size": "80", + "filename": "80.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "ipad", + "scale": "2x" }, { - "filename" : "1024 2.png", - "idiom" : "universal", - "platform" : "watchos", - "size" : "1024x1024" + "size": "72x72", + "expected-size": "72", + "filename": "72.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "ipad", + "scale": "1x" + }, + { + "size": "76x76", + "expected-size": "152", + "filename": "152.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "ipad", + "scale": "2x" + }, + { + "size": "50x50", + "expected-size": "100", + "filename": "100.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "ipad", + "scale": "2x" + }, + { + "size": "29x29", + "expected-size": "58", + "filename": "58.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "ipad", + "scale": "2x" + }, + { + "size": "76x76", + "expected-size": "76", + "filename": "76.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "ipad", + "scale": "1x" + }, + { + "size": "29x29", + "expected-size": "29", + "filename": "29.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "ipad", + "scale": "1x" + }, + { + "size": "50x50", + "expected-size": "50", + "filename": "50.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "ipad", + "scale": "1x" + }, + { + "size": "72x72", + "expected-size": "144", + "filename": "144.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "ipad", + "scale": "2x" + }, + { + "size": "40x40", + "expected-size": "40", + "filename": "40.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "ipad", + "scale": "1x" + }, + { + "size": "83.5x83.5", + "expected-size": "167", + "filename": "167.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "ipad", + "scale": "2x" + }, + { + "size": "20x20", + "expected-size": "20", + "filename": "20.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "ipad", + "scale": "1x" + }, + { + "size": "20x20", + "expected-size": "40", + "filename": "40.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "ipad", + "scale": "2x" + }, + { + "idiom": "watch", + "filename": "172.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "subtype": "38mm", + "scale": "2x", + "size": "86x86", + "expected-size": "172", + "role": "quickLook" + }, + { + "idiom": "watch", + "filename": "80.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "subtype": "38mm", + "scale": "2x", + "size": "40x40", + "expected-size": "80", + "role": "appLauncher" + }, + { + "idiom": "watch", + "filename": "88.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "subtype": "40mm", + "scale": "2x", + "size": "44x44", + "expected-size": "88", + "role": "appLauncher" + }, + { + "idiom": "watch", + "filename": "102.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "subtype": "45mm", + "scale": "2x", + "size": "51x51", + "expected-size": "102", + "role": "appLauncher" + }, + { + "idiom": "watch", + "filename": "108.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "subtype": "49mm", + "scale": "2x", + "size": "54x54", + "expected-size": "108", + "role": "appLauncher" + }, + { + "idiom": "watch", + "filename": "92.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "subtype": "41mm", + "scale": "2x", + "size": "46x46", + "expected-size": "92", + "role": "appLauncher" + }, + { + "idiom": "watch", + "filename": "100.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "subtype": "44mm", + "scale": "2x", + "size": "50x50", + "expected-size": "100", + "role": "appLauncher" + }, + { + "idiom": "watch", + "filename": "196.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "subtype": "42mm", + "scale": "2x", + "size": "98x98", + "expected-size": "196", + "role": "quickLook" + }, + { + "idiom": "watch", + "filename": "216.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "subtype": "44mm", + "scale": "2x", + "size": "108x108", + "expected-size": "216", + "role": "quickLook" + }, + { + "idiom": "watch", + "filename": "234.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "subtype": "45mm", + "scale": "2x", + "size": "117x117", + "expected-size": "234", + "role": "quickLook" + }, + { + "idiom": "watch", + "filename": "258.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "subtype": "49mm", + "scale": "2x", + "size": "129x129", + "expected-size": "258", + "role": "quickLook" + }, + { + "idiom": "watch", + "filename": "48.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "subtype": "38mm", + "scale": "2x", + "size": "24x24", + "expected-size": "48", + "role": "notificationCenter" + }, + { + "idiom": "watch", + "filename": "55.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "subtype": "42mm", + "scale": "2x", + "size": "27.5x27.5", + "expected-size": "55", + "role": "notificationCenter" + }, + { + "idiom": "watch", + "filename": "66.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "subtype": "45mm", + "scale": "2x", + "size": "33x33", + "expected-size": "66", + "role": "notificationCenter" + }, + { + "size": "29x29", + "expected-size": "87", + "filename": "87.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "watch", + "role": "companionSettings", + "scale": "3x" + }, + { + "size": "29x29", + "expected-size": "58", + "filename": "58.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "watch", + "role": "companionSettings", + "scale": "2x" + }, + { + "size": "1024x1024", + "expected-size": "1024", + "filename": "1024.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "watch-marketing", + "scale": "1x" + }, + { + "size": "128x128", + "expected-size": "128", + "filename": "128.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "mac", + "scale": "1x" + }, + { + "size": "256x256", + "expected-size": "256", + "filename": "256.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "mac", + "scale": "1x" + }, + { + "size": "128x128", + "expected-size": "256", + "filename": "256.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "mac", + "scale": "2x" + }, + { + "size": "256x256", + "expected-size": "512", + "filename": "512.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "mac", + "scale": "2x" + }, + { + "size": "32x32", + "expected-size": "32", + "filename": "32.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "mac", + "scale": "1x" + }, + { + "size": "512x512", + "expected-size": "512", + "filename": "512.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "mac", + "scale": "1x" + }, + { + "size": "16x16", + "expected-size": "16", + "filename": "16.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "mac", + "scale": "1x" + }, + { + "size": "16x16", + "expected-size": "32", + "filename": "32.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "mac", + "scale": "2x" + }, + { + "size": "32x32", + "expected-size": "64", + "filename": "64.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "mac", + "scale": "2x" + }, + { + "size": "512x512", + "expected-size": "1024", + "filename": "1024.png", + "folder": "Assets.xcassets/AppIcon.appiconset/", + "idiom": "mac", + "scale": "2x" } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } + ] } diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_128x128.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_128x128.png deleted file mode 100644 index 9222970acc..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_128x128.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png deleted file mode 100644 index a970347b62..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_128x128@2x.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_16x16.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_16x16.png deleted file mode 100644 index afb26ac629..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_16x16.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png deleted file mode 100644 index 9fa78ea4bf..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_16x16@2x.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_256x256.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_256x256.png deleted file mode 100644 index a970347b62..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_256x256.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png deleted file mode 100644 index 6e2c901938..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_256x256@2x.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_32x32.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_32x32.png deleted file mode 100644 index 9fa78ea4bf..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_32x32.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png deleted file mode 100644 index cc9ddb6241..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_32x32@2x.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_512x512.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_512x512.png deleted file mode 100644 index 6e2c901938..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_512x512.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png deleted file mode 100644 index cb6f9d6e1c..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/AppIcon.appiconset/icon_512x512@2x.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/SplashIcon.imageset/Contents.json b/ios/BlueWallet/Images.xcassets/SplashIcon.imageset/Contents.json index add923b2af..cf816e6bdd 100644 --- a/ios/BlueWallet/Images.xcassets/SplashIcon.imageset/Contents.json +++ b/ios/BlueWallet/Images.xcassets/SplashIcon.imageset/Contents.json @@ -4,16 +4,6 @@ "filename" : "icon.png", "idiom" : "universal", "scale" : "1x" - }, - { - "filename" : "icon@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "icon@3x.png", - "idiom" : "universal", - "scale" : "3x" } ], "info" : { diff --git a/ios/BlueWallet/Images.xcassets/SplashIcon.imageset/icon.png b/ios/BlueWallet/Images.xcassets/SplashIcon.imageset/icon.png index ec541528a9..02bc2883a2 100644 Binary files a/ios/BlueWallet/Images.xcassets/SplashIcon.imageset/icon.png and b/ios/BlueWallet/Images.xcassets/SplashIcon.imageset/icon.png differ diff --git a/ios/BlueWallet/Images.xcassets/SplashIcon.imageset/icon@2x.png b/ios/BlueWallet/Images.xcassets/SplashIcon.imageset/icon@2x.png deleted file mode 100644 index a72c80addc..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/SplashIcon.imageset/icon@2x.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/SplashIcon.imageset/icon@3x.png b/ios/BlueWallet/Images.xcassets/SplashIcon.imageset/icon@3x.png deleted file mode 100644 index 5727bf3317..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/SplashIcon.imageset/icon@3x.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/icon.imageset/Contents.json b/ios/BlueWallet/Images.xcassets/icon.imageset/Contents.json deleted file mode 100644 index add923b2af..0000000000 --- a/ios/BlueWallet/Images.xcassets/icon.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "filename" : "icon.png", - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "icon@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "icon@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/ios/BlueWallet/Images.xcassets/icon.imageset/icon.png b/ios/BlueWallet/Images.xcassets/icon.imageset/icon.png deleted file mode 100644 index b1479e4f61..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/icon.imageset/icon.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/icon.imageset/icon@2x.png b/ios/BlueWallet/Images.xcassets/icon.imageset/icon@2x.png deleted file mode 100644 index 1337cd8016..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/icon.imageset/icon@2x.png and /dev/null differ diff --git a/ios/BlueWallet/Images.xcassets/icon.imageset/icon@3x.png b/ios/BlueWallet/Images.xcassets/icon.imageset/icon@3x.png deleted file mode 100644 index dc96d56797..0000000000 Binary files a/ios/BlueWallet/Images.xcassets/icon.imageset/icon@3x.png and /dev/null differ diff --git a/ios/BlueWallet/Info.plist b/ios/BlueWallet/Info.plist index e239613c2c..1bdec0675a 100644 --- a/ios/BlueWallet/Info.plist +++ b/ios/BlueWallet/Info.plist @@ -4,14 +4,14 @@ BGTaskSchedulerPermittedIdentifiers - io.bluewallet.bluewallet.fetchTxsForWallet + com.layertwolabs.bluewallet.fetchTxsForWallet CADisableMinimumFrameDurationOnPhone CFBundleDevelopmentRegion en CFBundleDisplayName - BlueWallet + RedWallet CFBundleDocumentTypes @@ -25,7 +25,7 @@ Owner LSItemContentTypes - io.bluewallet.psbt + com.layertwolabs.psbt @@ -54,7 +54,7 @@ Owner LSItemContentTypes - io.bluewallet.psbt.txn + com.layertwolabs.psbt.txn @@ -68,7 +68,7 @@ Owner LSItemContentTypes - io.bluewallet.backup + com.layertwolabs.backup @@ -82,7 +82,7 @@ Owner LSItemContentTypes - io.bluewallet.bwcosigner + com.layertwolabs.bwcosigner @@ -191,8 +191,8 @@ In order to import an image for scanning, we need your permission to access your photo library. NSUserActivityTypes - io.bluewallet.bluewallet.receiveonchain - io.bluewallet.bluewallet.xpub + com.layertwolabs.bluewallet.receiveonchain + com.layertwolabs.bluewallet.xpub UIAppFonts @@ -251,7 +251,7 @@ UTTypeDescription Partially Signed Bitcoin Transaction UTTypeIdentifier - io.bluewallet.psbt + com.layertwolabs.psbt UTTypeTagSpecification public.filename-extension @@ -264,7 +264,7 @@ UTTypeDescription BW COSIGNER UTTypeIdentifier - io.bluewallet.bwcosigner + com.layertwolabs.bwcosigner UTTypeTagSpecification public.filename-extension @@ -281,7 +281,7 @@ UTTypeDescription Bitcoin Transaction UTTypeIdentifier - io.bluewallet.psbt.txn + com.layertwolabs.psbt.txn UTTypeTagSpecification public.filename-extension @@ -298,7 +298,7 @@ UTTypeDescription Electrum Backup UTTypeIdentifier - io.bluewallet.backup + com.layertwolabs.backup UTTypeTagSpecification public.filename-extension @@ -335,7 +335,7 @@ WKCompanionAppBundleIdentifier - io.bluewallet.bluewallet + com.layertwolabs.bluewallet bugsnag apiKey diff --git a/ios/BlueWalletWatch/BlueWalletWatch.entitlements b/ios/BlueWalletWatch/BlueWalletWatch.entitlements index 86bfd6c51c..8b65dff27f 100644 --- a/ios/BlueWalletWatch/BlueWalletWatch.entitlements +++ b/ios/BlueWalletWatch/BlueWalletWatch.entitlements @@ -4,7 +4,7 @@ com.apple.security.application-groups - group.io.bluewallet.bluewallet + group.com.layertwolabs.bluewallet diff --git a/ios/BlueWalletWatch/ComplicationController.swift b/ios/BlueWalletWatch/ComplicationController.swift index 184f6ff54c..13a20cf014 100644 --- a/ios/BlueWalletWatch/ComplicationController.swift +++ b/ios/BlueWalletWatch/ComplicationController.swift @@ -25,7 +25,7 @@ class ComplicationController: NSObject, CLKComplicationDataSource { @available(watchOSApplicationExtension 7.0, *) func complicationDescriptors() async -> [CLKComplicationDescriptor] { return [CLKComplicationDescriptor( - identifier: "io.bluewallet.bluewallet", + identifier: "com.layertwolabs.bluewallet", displayName: "Market Price", supportedFamilies: CLKComplicationFamily.allCases)] } diff --git a/ios/BlueWalletWatch/Info.plist b/ios/BlueWalletWatch/Info.plist index 5d476e681f..cb0078a8e7 100644 --- a/ios/BlueWalletWatch/Info.plist +++ b/ios/BlueWalletWatch/Info.plist @@ -49,7 +49,7 @@ WKApplication WKCompanionAppBundleIdentifier - io.bluewallet.bluewallet + com.layertwolabs.bluewallet bugsnag apiKey diff --git a/ios/BlueWalletWatch/Objects/Handoff.swift b/ios/BlueWalletWatch/Objects/Handoff.swift index b11ad2b835..34f1109f79 100644 --- a/ios/BlueWalletWatch/Objects/Handoff.swift +++ b/ios/BlueWalletWatch/Objects/Handoff.swift @@ -9,9 +9,9 @@ import Foundation enum HandoffIdentifier: String { - case ReceiveOnchain = "io.bluewallet.bluewallet.receiveonchain" - case Xpub = "io.bluewallet.bluewallet.xpub" - case ViewInBlockExplorer = "io.bluewallet.bluewallet.blockexplorer" + case ReceiveOnchain = "com.layertwolabs.bluewallet.receiveonchain" + case Xpub = "com.layertwolabs.bluewallet.xpub" + case ViewInBlockExplorer = "com.layertwolabs.bluewallet.blockexplorer" } enum HandOffUserInfoKey: String { diff --git a/ios/Components/EventEmitter.swift b/ios/Components/EventEmitter.swift index f7b43bb002..e7e560e74b 100644 --- a/ios/Components/EventEmitter.swift +++ b/ios/Components/EventEmitter.swift @@ -23,7 +23,7 @@ class EventEmitter: RCTEventEmitter { @objc func getMostRecentUserActivity(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: RCTPromiseRejectBlock) { - if let defaults = UserDefaults(suiteName: "group.io.bluewallet.bluewallet") { + if let defaults = UserDefaults(suiteName: "group.com.layertwolabs.bluewallet") { resolve(defaults.value(forKey: "onUserActivityOpen")) } else { resolve(nil) diff --git a/ios/Localizable.xcstrings b/ios/Localizable.xcstrings index 0ca2b12ca0..0078f23062 100644 --- a/ios/Localizable.xcstrings +++ b/ios/Localizable.xcstrings @@ -18,9 +18,6 @@ }, "Bahrain (Bahraini Dinar)" : { - }, - "Balance" : { - }, "Bitcoin (%@)" : { @@ -39,9 +36,6 @@ }, "Central African Republic (Central African Franc)" : { - }, - "Checked at %@" : { - }, "Chile (Chilean Peso)" : { @@ -51,36 +45,18 @@ }, "Choose your preferred currency." : { - }, - "Choose your preferred fiat currency." : { - }, "Colombia (Colombian Peso)" : { - }, - "Configure Market Widget with ${electrumHost}" : { - - }, - "Configure Market Widget with ${electrumHost} and show error messages: ${showErrorMessages}" : { - - }, - "Configure the Market Widget to show the Electrum host connected to/being attempted and display error messages if data retrieval fails." : { - }, "Croatia (Croatian Kuna)" : { }, "Currency" : { - }, - "Currency: %@" : { - }, "Current Bitcoin Market Rate" : { - }, - "Current Bitcoin Price: %@" : { - }, "Czech Republic (Czech Koruna)" : { @@ -89,6 +65,7 @@ }, "display_in_BROWSER_TITLE" : { + "extractionState" : "stale", "localizations" : { "en_US" : { "stringUnit" : { @@ -110,10 +87,7 @@ } } }, - "Electrum Host" : { - - }, - "Error" : { + "Egypt (Egyptian Pound)" : { }, "European Union (Euro)" : { @@ -121,9 +95,6 @@ }, "Failed to retrieve the Bitcoin market rate." : { - }, - "Fiat Currency" : { - }, "from" : { @@ -166,40 +137,15 @@ }, "Last Updated" : { - }, - "Last updated %@ from %@" : { - "localizations" : { - "en_US" : { - "stringUnit" : { - "state" : "new", - "value" : "Last updated %1$@ from %2$@" - } - } - } - }, - "Latest transaction" : { - }, "Lebanon (Lebanese Pound)" : { }, "Malaysia (Malaysian Ringgit)" : { - }, - "Market" : { - }, "Market Rate" : { - }, - "Market Widget" : { - - }, - "Market Widget Configuration" : { - - }, - "Market Widget is connected to ${electrumHost}" : { - }, "Mexico (Mexican Peso)" : { @@ -209,9 +155,6 @@ }, "New Zealand (New Zealand Dollar)" : { - }, - "Next Block" : { - }, "Nigeria (Nigerian Naira)" : { @@ -233,33 +176,18 @@ }, "Qatar (Qatari Riyal)" : { - }, - "receive" : { - }, "Romania (Romanian Leu)" : { }, "Russia (Russian Ruble)" : { - }, - "Sats/%@" : { - }, "Saudi Arabia (Saudi Riyal)" : { - }, - "send" : { - - }, - "Show Error Messages" : { - }, "Singapore (Singapore Dollar)" : { - }, - "Source: %@" : { - }, "South Africa (South African Rand)" : { @@ -302,9 +230,6 @@ }, "United States of America (US Dollar)" : { - }, - "Updated: %@" : { - }, "Uruguay (Uruguayan Peso)" : { @@ -317,30 +242,9 @@ }, "View the current Bitcoin market rate in your preferred currency." : { - }, - "View the current Bitcoin market rate in your preferred fiat currency." : { - - }, - "View the current Bitcoin market rate." : { - - }, - "View the current market information." : { - - }, - "View the current price of Bitcoin" : { - }, "View the current price of Bitcoin." : { - }, - "View the Electrum host connected to/being attempted" : { - - }, - "View your accumulated balance." : { - - }, - "View your total wallet balance and network prices." : { - }, "VIEW_ADDRESS_TRANSACTIONS_TITLE" : { "extractionState" : "manual", @@ -375,9 +279,6 @@ } } } - }, - "Wallet and Market" : { - } }, "version" : "1.0" diff --git a/ios/Podfile b/ios/Podfile index e6c1158ce7..606931ae2f 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -28,24 +28,17 @@ if linkage != nil use_frameworks! :linkage => linkage.to_sym end -# Define a common function to configure shared settings for targets -def configure_target() - config = use_native_modules! +target 'BlueWallet' do + use_native_modules! use_react_native!( - # Specify the path directly if use_native_modules! does not provide it - :path => config[:reactNativePath], + :path => "../node_modules/react-native", :app_path => "#{Pod::Config.instance.installation_root}/.." - ) + pod 'react-native-bw-file-access', :path => '../blue_modules/react-native-bw-file-access' end - -target 'BlueWallet' do - configure_target() -end - post_install do |installer| react_native_post_install( installer, @@ -59,7 +52,7 @@ post_install do |installer| if ['React-Core-AccessibilityResources'].include? target.name config.build_settings['CODE_SIGN_STYLE'] = "Manual" config.build_settings['CODE_SIGN_IDENTITY'] = "Apple Distribution: Bluewallet Services, S. R. L. (A7W54YZ4WU)" - config.build_settings['DEVELOPMENT_TEAM'] = "A7W54YZ4WU" + config.build_settings['DEVELOPMENT_TEAM'] = "6AXPP357T2" end end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index fee7966979..260fcf60e5 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1666,7 +1666,7 @@ PODS: - React-Core - RNDefaultPreference (1.5.1): - React-Core - - RNDeviceInfo (14.0.4): + - RNDeviceInfo (14.1.1): - React-Core - RNFS (2.20.0): - React-Core @@ -1716,7 +1716,7 @@ PODS: - Yoga - RNLocalize (3.5.4): - React-Core - - RNPermissions (5.4.2): + - RNPermissions (5.4.4): - React-Core - RNQrGenerator (1.4.3): - React @@ -2354,13 +2354,13 @@ SPEC CHECKSUMS: RNCClipboard: f6679d470d0da2bce2a37b0af7b9e0bf369ecda5 RNCPushNotificationIOS: 6c4ca3388c7434e4a662b92e4dfeeee858e6f440 RNDefaultPreference: 8a089ee8ce829a66c5453e3c5434f0785499d1c3 - RNDeviceInfo: d863506092aef7e7af3a1c350c913d867d795047 + RNDeviceInfo: bcce8752b5043a623fe3c26789679b473f705d3c RNFS: 89de7d7f4c0f6bafa05343c578f61118c8282ed8 RNGestureHandler: 92e89a04cd0d1c77f383a55d14c15e7f423f4c00 RNHandoff: bc8af5a86853ff13b033e7ba1114c3c5b38e6385 RNKeychain: fa7765e6af5a8ec866bea4e86d2a1086f562d69f RNLocalize: d7859f87f1083349c73aa089e360af33ef89efc2 - RNPermissions: c48851513712284b650e8a166fdd409aa81b6104 + RNPermissions: 3f86a2c7cd6d76b307cc57ac774038e4571b4722 RNQrGenerator: afacf12b55dfba0e3aaca963eec23691e8426431 RNQuickAction: c2c8f379e614428be0babe4d53a575739667744d RNRate: 7641919330e0d6688ad885a985b4bd697ed7d14c @@ -2375,6 +2375,6 @@ SPEC CHECKSUMS: Yoga: e14bad835e12b6c7e2260fc320bd00e0f4b45add ZXingObjC: 8898711ab495761b2dbbdec76d90164a6d7e14c5 -PODFILE CHECKSUM: eb430c3fd96af23d4962c4c041798d65efc6843e +PODFILE CHECKSUM: 3e7be4c4bf66ab7f596608f4f63db80a311a8fc4 -COCOAPODS: 1.15.2 +COCOAPODS: 1.16.2 diff --git a/ios/Shared/UserDefaultsGroupKey.swift b/ios/Shared/UserDefaultsGroupKey.swift index c4a4554eef..a2e3f9844c 100644 --- a/ios/Shared/UserDefaultsGroupKey.swift +++ b/ios/Shared/UserDefaultsGroupKey.swift @@ -9,10 +9,10 @@ import Foundation enum UserDefaultsGroupKey: String { - case GroupName = "group.io.bluewallet.bluewallet" + case GroupName = "group.com.layertwolabs.bluewallet" case PreferredCurrency = "preferredCurrency" - case WatchAppBundleIdentifier = "io.bluewallet.bluewallet.watch" - case BundleIdentifier = "io.bluewallet.bluewallet" + case WatchAppBundleIdentifier = "com.layertwolabs.bluewallet.watch" + case BundleIdentifier = "com.layertwolabs.bluewallet" case ElectrumSettingsHost = "electrum_host" case ElectrumSettingsTCPPort = "electrum_tcp_port" case ElectrumSettingsSSLPort = "electrum_ssl_port" diff --git a/ios/WidgetHelper.swift b/ios/WidgetHelper.swift index 7b3fa22679..0740120224 100644 --- a/ios/WidgetHelper.swift +++ b/ios/WidgetHelper.swift @@ -11,7 +11,7 @@ class WidgetHelper { } static func getSharedUserDefaults() -> UserDefaults? { - let suiteName = "group.io.bluewallet.bluewallet" + let suiteName = "group.com.layertwolabs.bluewallet" let defaults = UserDefaults(suiteName: suiteName) if defaults == nil { NSLog("[WidgetHelper] Warning: Could not access shared UserDefaults") diff --git a/ios/WidgetsExtension.entitlements b/ios/WidgetsExtension.entitlements index 8030e49041..4fb4bd70f2 100644 --- a/ios/WidgetsExtension.entitlements +++ b/ios/WidgetsExtension.entitlements @@ -6,7 +6,7 @@ com.apple.security.application-groups - group.io.bluewallet.bluewallet + group.com.layertwolabs.bluewallet com.apple.security.network.client diff --git a/ios/export_options.plist b/ios/export_options.plist index 99d4b96c67..dddcc50648 100644 --- a/ios/export_options.plist +++ b/ios/export_options.plist @@ -7,7 +7,7 @@ signingStyle manual teamID - A7W54YZ4WU + 6AXPP357T2 uploadSymbols compileBitcode @@ -18,16 +18,16 @@ export provisioningProfiles - io.bluewallet.bluewallet - match AppStore io.bluewallet.bluewallet - io.bluewallet.bluewallet.watch - match AppStore io.bluewallet.bluewallet.watch - io.bluewallet.bluewallet.watch.extension - match AppStore io.bluewallet.bluewallet.watch.extension - io.bluewallet.bluewallet.Stickers - match AppStore io.bluewallet.bluewallet.Stickers - io.bluewallet.bluewallet.MarketWidget - match AppStore io.bluewallet.bluewallet.MarketWidget + com.layertwolabs.bluewallet + match AppStore com.layertwolabs.bluewallet + com.layertwolabs.bluewallet.watch + match AppStore com.layertwolabs.bluewallet.watch + com.layertwolabs.bluewallet.watch.extension + match AppStore com.layertwolabs.bluewallet.watch.extension + com.layertwolabs.bluewallet.Stickers + match AppStore com.layertwolabs.bluewallet.Stickers + com.layertwolabs.bluewallet.MarketWidget + match AppStore com.layertwolabs.bluewallet.MarketWidget \ No newline at end of file diff --git a/models/blockExplorer.ts b/models/blockExplorer.ts index 7f2189c884..357b247d96 100644 --- a/models/blockExplorer.ts +++ b/models/blockExplorer.ts @@ -8,9 +8,7 @@ export interface BlockExplorer { } export const BLOCK_EXPLORERS: { [key: string]: BlockExplorer } = { - default: { key: 'default', name: 'Mempool.space', url: 'https://mempool.space' }, - blockchair: { key: 'blockchair', name: 'Blockchair', url: 'https://blockchair.com/bitcoin' }, - blockstream: { key: 'blockstream', name: 'Blockstream.info', url: 'https://blockstream.info' }, + default: { key: 'default', name: 'Drivechain Explorer', url: 'https://explorer.drivechain.info' }, custom: { key: 'custom', name: 'Custom', url: '' }, // Custom URL will be handled separately }; diff --git a/package.json b/package.json index 48c3757216..3c019320dd 100644 --- a/package.json +++ b/package.json @@ -58,10 +58,10 @@ "branch2json": "./scripts/current-branch.sh > current-branch.json", "start": "react-native start", "android": "react-native run-android", - "android:relaunch": "adb shell am force-stop io.bluewallet.bluewallet; adb shell monkey -p io.bluewallet.bluewallet -c android.intent.category.LAUNCHER 1", + "android:relaunch": "adb shell am force-stop com.layertwolabs.bluewallet; adb shell monkey -p com.layertwolabs.bluewallet -c android.intent.category.LAUNCHER 1", "adb": "adb reverse tcp:8081 tcp:8081", "android:clean": "cd android; ./gradlew clean ; cd .. ; npm run android", - "android:restart": "adb shell am force-stop io.bluewallet.bluewallet; adb shell monkey -p io.bluewallet.bluewallet -c android.intent.category.LAUNCHER 1", + "android:restart": "adb shell am force-stop com.layertwolabs.bluewallet; adb shell monkey -p com.layertwolabs.bluewallet -c android.intent.category.LAUNCHER 1", "ios": "react-native run-ios", "postinstall": "npm run releasenotes2json; npm run branch2json; npm run patches", "patches": "", diff --git a/screen/settings/About.tsx b/screen/settings/About.tsx index 350a28e63f..971e8372ba 100644 --- a/screen/settings/About.tsx +++ b/screen/settings/About.tsx @@ -1,14 +1,12 @@ import React from 'react'; import Clipboard from '@react-native-clipboard/clipboard'; import { Alert, Image, Linking, Platform, Pressable, StyleSheet, Text, useWindowDimensions, View } from 'react-native'; -import { getApplicationName, getBuildNumber, getBundleId, getUniqueIdSync, getVersion, hasGmsSync } from 'react-native-device-info'; +import { getApplicationName, getBuildNumber, getBundleId, getUniqueIdSync, getVersion } from 'react-native-device-info'; import { Icon } from '@rneui/themed'; -import Rate, { AndroidMarket } from 'react-native-rate'; import A from '../../blue_modules/analytics'; import { BlueCard, BlueTextCentered } from '../../BlueComponents'; import { HDSegwitBech32Wallet } from '../../class'; import presentAlert from '../../components/Alert'; -import Button from '../../components/Button'; import ListItem from '../../components/ListItem'; import { useTheme } from '../../components/themes'; import loc, { formatStringAddTwoWhiteSpaces } from '../../loc'; @@ -26,9 +24,6 @@ const About: React.FC = () => { const { isElectrumDisabled } = useSettings(); const stylesHook = StyleSheet.create({ - textBackup: { - color: colors.foregroundColor, - }, buildWith: { backgroundColor: colors.inputBackgroundColor, }, @@ -56,36 +51,12 @@ const About: React.FC = () => { navigate('Licensing'); }; - const handleOnTwitterPress = () => { - Linking.openURL('https://twitter.com/bluewalletio'); - }; - - const handleOnDiscordPress = () => { - Linking.openURL('https://discord.gg/btWq2Aby2z'); - }; - const handleOnTelegramPress = () => { - Linking.openURL('https://t.me/bluewallethat'); + Linking.openURL('http://www.t.me/DcInsiders'); }; const handleOnGithubPress = () => { - Linking.openURL('https://github.com/BlueWallet/BlueWallet'); - }; - - const handleOnRatePress = () => { - const options = { - AppleAppID: '1376878040', - GooglePackageName: 'io.bluewallet.bluewallet', - preferredAndroidMarket: AndroidMarket.Google, - preferInApp: Platform.OS !== 'android', - openAppStoreIfInAppFails: true, - fallbackPlatformURL: 'https://bluewallet.io', - }; - Rate.rate(options, success => { - if (success) { - console.log('User Rated.'); - } - }); + Linking.openURL('https://github.com/layerTwo-Labs/bluewallet'); }; return ( @@ -93,22 +64,11 @@ const About: React.FC = () => { - {loc.settings.about_free} - {formatStringAddTwoWhiteSpaces(loc.settings.about_backup)} - {((Platform.OS === 'android' && hasGmsSync()) || Platform.OS !== 'android') && ( -