diff --git a/assets/new-ui/cake_squircle_icon.svg b/assets/new-ui/cake_squircle_icon.svg new file mode 100644 index 000000000..499e41acc --- /dev/null +++ b/assets/new-ui/cake_squircle_icon.svg @@ -0,0 +1,7 @@ + + +Hash Wallet app icon +Hash Wallet app icon: brand-green rounded square with a centered white hash. + +# + diff --git a/assets/new-ui/cakewallet-wordmark-light.svg b/assets/new-ui/cakewallet-wordmark-light.svg new file mode 100644 index 000000000..24bc03917 --- /dev/null +++ b/assets/new-ui/cakewallet-wordmark-light.svg @@ -0,0 +1,8 @@ + + +Hash Wallet horizontal lockup +Hash Wallet logo with green-boxed hash mark on the left and Hash Wallet wordmark to the right. + +# +Hash Wallet + diff --git a/assets/new-ui/cakewallet-wordmark.svg b/assets/new-ui/cakewallet-wordmark.svg new file mode 100644 index 000000000..61f281489 --- /dev/null +++ b/assets/new-ui/cakewallet-wordmark.svg @@ -0,0 +1,8 @@ + + +Hash Wallet horizontal lockup (dark theme) +Hash Wallet logo with green-boxed hash mark on the left and a white wordmark to the right, intended for dark-theme backgrounds. + +# +Hash Wallet + diff --git a/lib/di.dart b/lib/di.dart index ccbd2b10f..23edfd38f 100644 --- a/lib/di.dart +++ b/lib/di.dart @@ -435,8 +435,8 @@ Future setup({ getIt.registerLazySingleton(() => BitboxViewModel()); - getIt.registerLazySingleton(() => TrezorConnect("cakewallet://trezor_connect", - appName: "Cake Wallet")); + getIt.registerLazySingleton(() => TrezorConnect("hashwallet://trezor_connect", + appName: "Hash Wallet")); getIt.registerLazySingleton(() => TrezorViewModel(getIt())); diff --git a/lib/main.dart b/lib/main.dart index 1145029f8..a062d9805 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -97,7 +97,7 @@ Future runAppWithZone({Key? topLevelKey}) async { } // Convert the shortcut type to a URI and add it to the stream - final uri = Uri.parse('cakewallet://quickaction/$shortcutType'); + final uri = Uri.parse('hashwallet://quickaction/$shortcutType'); quickActionsStream.sink.add(uri); }); diff --git a/lib/new-ui/widgets/apps_widget.dart b/lib/new-ui/widgets/apps_widget.dart index 717a8a81b..a9278406e 100644 --- a/lib/new-ui/widgets/apps_widget.dart +++ b/lib/new-ui/widgets/apps_widget.dart @@ -94,7 +94,7 @@ class AppsWidget extends StatelessWidget { ), softWrap: true, ), - isCake == true ? CakeImageWidget(imageUrl: "assets/new-ui/cakelabs-icon.svg", color: Theme.of(context).colorScheme.onSurfaceVariant) : SizedBox(), + SizedBox(), ], ), SizedBox(height: 5), diff --git a/lib/new-ui/widgets/swap_page/swap_provider_initial_preference_modal.dart b/lib/new-ui/widgets/swap_page/swap_provider_initial_preference_modal.dart index d01ff419f..07b024150 100644 --- a/lib/new-ui/widgets/swap_page/swap_provider_initial_preference_modal.dart +++ b/lib/new-ui/widgets/swap_page/swap_provider_initial_preference_modal.dart @@ -26,7 +26,7 @@ class SwapProviderInitialPreferenceModal extends StatelessWidget { children: [ CakeImageWidget(imageUrl:"assets/new-ui/exchange_providers.svg"), Text( - "${S.of(context).swap_provider_initial_desc} Cake Wallet.", + "${S.of(context).swap_provider_initial_desc} Hash Wallet.", textAlign: TextAlign.center, style: TextStyle( color: Theme.of(context).colorScheme.onSurfaceVariant, fontSize: 16), diff --git a/lib/src/screens/dashboard/pages/balance/balance_row_widget.dart b/lib/src/screens/dashboard/pages/balance/balance_row_widget.dart index 9ea183ccf..7374234b3 100644 --- a/lib/src/screens/dashboard/pages/balance/balance_row_widget.dart +++ b/lib/src/screens/dashboard/pages/balance/balance_row_widget.dart @@ -670,9 +670,9 @@ class BalanceRowWidget extends StatelessWidget { } void onPressedHelp() { - var helpUri = Uri.parse("https://docs.cakewallet.com/cryptos/bitcoin#lightning"); + var helpUri = Uri.parse("https://github.com/Such-Software/hash-wallet"); if (dashboardViewModel.type == WalletType.litecoin) { - helpUri = Uri.parse("https://docs.cakewallet.com/cryptos/litecoin#mweb"); + helpUri = Uri.parse("https://github.com/Such-Software/hash-wallet"); } launchUrl(helpUri, mode: LaunchMode.externalApplication); diff --git a/lib/src/screens/dashboard/pages/balance/crypto_balance_widget.dart b/lib/src/screens/dashboard/pages/balance/crypto_balance_widget.dart index 173843a23..c07fdd017 100644 --- a/lib/src/screens/dashboard/pages/balance/crypto_balance_widget.dart +++ b/lib/src/screens/dashboard/pages/balance/crypto_balance_widget.dart @@ -263,7 +263,7 @@ class CryptoBalanceWidget extends StatelessWidget { behavior: HitTestBehavior.opaque, onTap: () => launchUrl( Uri.parse( - "https://docs.cakewallet.com/cryptos/bitcoin#silent-payments"), + "https://github.com/Such-Software/hash-wallet"), mode: LaunchMode.externalApplication, ), child: Row( @@ -319,7 +319,7 @@ class CryptoBalanceWidget extends StatelessWidget { hintWidget: GestureDetector( behavior: HitTestBehavior.opaque, onTap: () => launchUrl( - Uri.parse("https://docs.cakewallet.com/cryptos/litecoin/#mweb"), + Uri.parse("https://github.com/Such-Software/hash-wallet"), mode: LaunchMode.externalApplication, ), child: Text( @@ -349,7 +349,7 @@ class CryptoBalanceWidget extends StatelessWidget { hintWidget: GestureDetector( behavior: HitTestBehavior.opaque, onTap: () => launchUrl( - Uri.parse("https://docs.cakewallet.com/tutorials/zashi/#creating-a-new-zcash-wallet-on-cake"), + Uri.parse("https://github.com/Such-Software/hash-wallet"), mode: LaunchMode.externalApplication, ), child: Text( @@ -376,7 +376,7 @@ class CryptoBalanceWidget extends StatelessWidget { rightButtonTitle: S.of(context).learn_more, leftButtonAction: () => dashboardViewModel.dismissDecredInfoCard(), rightButtonAction: () => launchUrl( - Uri.parse("https://docs.cakewallet.com/cryptos/decred/#spv-sync")), + Uri.parse("https://github.com/Such-Software/hash-wallet")), ), ), ], @@ -390,7 +390,7 @@ class CryptoBalanceWidget extends StatelessWidget { hintWidget: GestureDetector( behavior: HitTestBehavior.opaque, onTap: () => launchUrl( - Uri.parse("https://docs.cakewallet.com/cryptos/bitcoin/#payjoin"), + Uri.parse("https://github.com/Such-Software/hash-wallet"), mode: LaunchMode.externalApplication, ), child: Row( diff --git a/lib/src/screens/dashboard/pages/transactions_page.dart b/lib/src/screens/dashboard/pages/transactions_page.dart index 4ba4a3b22..798ca3b90 100644 --- a/lib/src/screens/dashboard/pages/transactions_page.dart +++ b/lib/src/screens/dashboard/pages/transactions_page.dart @@ -52,7 +52,7 @@ class TransactionsPage extends StatelessWidget { key: ValueKey('transactions_page_syncing_alert_card_key'), onTap: () { try { - final uri = Uri.parse("https://docs.cakewallet.com/faq/funds-not-appearing"); + final uri = Uri.parse("https://github.com/Such-Software/hash-wallet"); launchUrl(uri, mode: LaunchMode.externalApplication); } catch (_) {} }, diff --git a/lib/src/screens/receive/widgets/qr_widget.dart b/lib/src/screens/receive/widgets/qr_widget.dart index c5f7abef1..a826b6c49 100644 --- a/lib/src/screens/receive/widgets/qr_widget.dart +++ b/lib/src/screens/receive/widgets/qr_widget.dart @@ -311,7 +311,7 @@ class QRWidget extends StatelessWidget { footerType: FooterType.doubleActionButton, doubleActionLeftButtonText: S.of(context).learn_more, onLeftActionButtonPressed: () => launchUrl( - Uri.parse("https://docs.cakewallet.com/cryptos/bitcoin/#payjoin"), + Uri.parse("https://github.com/Such-Software/hash-wallet"), mode: LaunchMode.externalApplication), doubleActionRightButtonText: S.of(context).ok, onRightActionButtonPressed: () => Navigator.of(context).pop(), diff --git a/lib/src/screens/root/root.dart b/lib/src/screens/root/root.dart index 264532322..144efd427 100644 --- a/lib/src/screens/root/root.dart +++ b/lib/src/screens/root/root.dart @@ -115,7 +115,7 @@ class RootState extends State with WidgetsBindingObserver { handleDeepLinking(await getInitialUri()); if (widget.initialQuickAction != null) { - final uri = Uri.parse('cakewallet://quickaction/${widget.initialQuickAction}'); + final uri = Uri.parse('hashwallet://quickaction/${widget.initialQuickAction}'); handleDeepLinking(uri); } diff --git a/lib/src/screens/setup_2fa/setup_2fa.dart b/lib/src/screens/setup_2fa/setup_2fa.dart index db8a7da96..c5c9ef75e 100644 --- a/lib/src/screens/setup_2fa/setup_2fa.dart +++ b/lib/src/screens/setup_2fa/setup_2fa.dart @@ -21,7 +21,7 @@ class Setup2FAPage extends BasePage { Widget body(BuildContext context) { final cake2FAGuideTitle = 'Cake 2FA Guide'; final cake2FAGuideUri = - Uri.parse('https://docs.cakewallet.com/features/advanced/authentication/'); + Uri.parse('https://github.com/Such-Software/hash-wallet'); return Column( crossAxisAlignment: CrossAxisAlignment.center, children: [ diff --git a/lib/src/screens/setup_2fa/setup_2fa_qr_page.dart b/lib/src/screens/setup_2fa/setup_2fa_qr_page.dart index 6706b7f7b..0a83dbd60 100644 --- a/lib/src/screens/setup_2fa/setup_2fa_qr_page.dart +++ b/lib/src/screens/setup_2fa/setup_2fa_qr_page.dart @@ -26,7 +26,7 @@ class Setup2FAQRPage extends BasePage { final copyImage = Image.asset('assets/images/copy_content.png', height: 16, width: 16, color: Theme.of(context).colorScheme.onSurface); final cake2FAHowToUseUrl = Uri.parse( - 'https://docs.cakewallet.com/features/advanced/authentication/#enabling-cake-2fa'); + 'https://github.com/Such-Software/hash-wallet'); return Padding( padding: const EdgeInsets.symmetric(horizontal: 24), child: Column( diff --git a/lib/src/screens/wallet_connect/services/walletkit_service.dart b/lib/src/screens/wallet_connect/services/walletkit_service.dart index 3b06d644e..554e55a92 100644 --- a/lib/src/screens/wallet_connect/services/walletkit_service.dart +++ b/lib/src/screens/wallet_connect/services/walletkit_service.dart @@ -74,11 +74,11 @@ abstract class WalletKitServiceBase with Store { projectId: secrets.walletConnectProjectId, ), metadata: const PairingMetadata( - name: 'Cake Wallet', - description: 'Cake Wallet', - url: 'https://cakewallet.com', - icons: ['https://cakewallet.com/assets/image/cake_logo.png'], - redirect: Redirect(native: 'cakewallet://'), + name: 'Hash Wallet', + description: 'Hash Wallet', + url: 'https://github.com/Such-Software/hash-wallet', + icons: ['https://github.com/Such-Software/hash-wallet/raw/dev/assets/images/app_logo.png'], + redirect: Redirect(native: 'hashwallet://'), ), ); diff --git a/lib/src/screens/welcome/welcome_page.dart b/lib/src/screens/welcome/welcome_page.dart index 0f9b6f320..56205e7cd 100644 --- a/lib/src/screens/welcome/welcome_page.dart +++ b/lib/src/screens/welcome/welcome_page.dart @@ -30,7 +30,7 @@ class WelcomePage extends BasePage { @override Widget trailing(BuildContext context) { final Uri _url = - Uri.parse('https://docs.cakewallet.com/get-started/setup/'); + Uri.parse('https://github.com/Such-Software/hash-wallet'); return IconButton( icon: Icon(Icons.info_outline, size: 26,), onPressed: () async { diff --git a/lib/src/widgets/haven_wallet_removal_popup.dart b/lib/src/widgets/haven_wallet_removal_popup.dart index 470587cc4..809c26fd6 100644 --- a/lib/src/widgets/haven_wallet_removal_popup.dart +++ b/lib/src/widgets/haven_wallet_removal_popup.dart @@ -59,7 +59,7 @@ class HavenWalletRemovalPopup extends StatelessWidget { maxHeight: MediaQuery.of(context).size.height * 0.7, ), child: Text( - "It looks like you have Haven wallets in your list. Haven is getting removed in next release of Cake Wallet, and you currently have Haven in the following wallets:\n\n[${affectedWalletNames.join(", ")}]\n\nPlease move your funds to other wallet, as you will lose access to your Haven funds in next update.\n\nFor assistance, please use the in-app support or email support@cakewallet.com", + "It looks like you have Haven wallets in your list. Haven is getting removed in the Hash Wallet fork, and you currently have Haven in the following wallets:\n\n[${affectedWalletNames.join(", ")}]\n\nPlease move your funds to other wallet, as you will lose access to your Haven funds in next update.\n\nFor assistance, please use the in-app support or open an issue at github.com/Such-Software/hash-wallet", style: Theme.of(context).textTheme.bodyMedium!.copyWith( decoration: TextDecoration.none, fontSize: 16.0, diff --git a/lib/src/widgets/services_updates_widget.dart b/lib/src/widgets/services_updates_widget.dart index d67f5aee9..69511b2a6 100644 --- a/lib/src/widgets/services_updates_widget.dart +++ b/lib/src/widgets/services_updates_widget.dart @@ -113,7 +113,7 @@ class _ServicesUpdatesWidgetState extends State { try { launchUrl( Uri.parse( - "https://status.cakewallet.com/", + "https://github.com/Such-Software/hash-wallet/issues", ), mode: LaunchMode.externalApplication); } catch (_) {} diff --git a/lib/src/widgets/vulnerable_seeds_popup.dart b/lib/src/widgets/vulnerable_seeds_popup.dart index d1111cae6..6fb93f2ca 100644 --- a/lib/src/widgets/vulnerable_seeds_popup.dart +++ b/lib/src/widgets/vulnerable_seeds_popup.dart @@ -59,7 +59,7 @@ class VulnerableSeedsPopup extends StatelessWidget { maxHeight: MediaQuery.of(context).size.height * 0.7, ), child: Text( - "Your Bitcoin wallet(s) below use a legacy seed format that is vulnerable, which MAY result in you losing money from these wallet(s) if no action is taken.\nWe recommend that you IMMEDIATELY create wallet(s) in Cake Wallet and immediately transfer the funds to these wallet(s).\nVulnerable wallet name(s):\n\n[${affectedWalletNames.join(", ")}]\n\nFor assistance, please use the in-app support or email support@cakewallet.com", + "Your Bitcoin wallet(s) below use a legacy seed format that is vulnerable, which MAY result in you losing money from these wallet(s) if no action is taken.\nWe recommend that you IMMEDIATELY create wallet(s) in Hash Wallet and immediately transfer the funds to these wallet(s).\nVulnerable wallet name(s):\n\n[${affectedWalletNames.join(", ")}]\n\nFor assistance, please use the in-app support or open an issue at github.com/Such-Software/hash-wallet", style: Theme.of(context).textTheme.bodyMedium!.copyWith( decoration: TextDecoration.none, fontSize: 16.0, diff --git a/lib/view_model/link_view_model.dart b/lib/view_model/link_view_model.dart index fcecc86f0..6f6a0b501 100644 --- a/lib/view_model/link_view_model.dart +++ b/lib/view_model/link_view_model.dart @@ -29,7 +29,7 @@ class LinkViewModel { bool get isWalletConnectLink => currentLink?.authority == 'wc'; bool get isNanoGptLink => currentLink?.scheme == 'nano-gpt'; bool get isQuickActionLink => - currentLink?.scheme == 'cakewallet' && currentLink?.host == 'quickaction'; + currentLink?.scheme == 'hashwallet' && currentLink?.host == 'quickaction'; String? getRouteToGo() { if (isWalletConnectLink) { diff --git a/lib/view_model/payjoin_details_view_model.dart b/lib/view_model/payjoin_details_view_model.dart index de3c2ac4e..4c59cb22f 100644 --- a/lib/view_model/payjoin_details_view_model.dart +++ b/lib/view_model/payjoin_details_view_model.dart @@ -83,7 +83,7 @@ abstract class PayjoinDetailsViewModelBase with Store { value: '${S.current.view_transaction_on}mempool.space', onTap: () async { try { - final uri = Uri.parse('https://mempool.cakewallet.com/tx/${payjoinSession.txId!}'); + final uri = Uri.parse('https://mempool.space/tx/${payjoinSession.txId!}'); if (await canLaunchUrl(uri)) await launchUrl(uri, mode: LaunchMode.externalApplication); } catch (e) {} diff --git a/lib/view_model/support_view_model.dart b/lib/view_model/support_view_model.dart index de39520a1..5fc2e624f 100644 --- a/lib/view_model/support_view_model.dart +++ b/lib/view_model/support_view_model.dart @@ -15,42 +15,24 @@ abstract class SupportViewModelBase with Store { SupportViewModelBase(this._appStore) : items = [ + // Hash Wallet: Cake's own support channels (email, website, forum, + // Discord, Telegram, Telegram bot) gutted — those are Cake Labs + // properties, not ours. Replaced with the only channel we have right + // now: GitHub Issues. The third-party provider support links below + // are kept because they're genuinely useful when a user has trouble + // with a swap/buy via that provider. LinkListItem( - title: 'Email', - icon: 'assets/images/support_icon.png', - linkTitle: 'support@cakewallet.com', - link: 'mailto:support@cakewallet.com'), + title: 'GitHub Issues', + icon: 'assets/images/github.png', + hasIconColor: true, + linkTitle: 'github.com/Such-Software/hash-wallet/issues', + link: 'https://github.com/Such-Software/hash-wallet/issues'), LinkListItem( - title: 'Website', - icon: 'assets/images/global.png', - linkTitle: 'cakewallet.com', - link: 'https://cakewallet.com'), - LinkListItem( - title: 'Forum', - icon: 'assets/images/discourse.png', - linkTitle: 'forum.cakewallet.com', - link: 'https://forum.cakewallet.com'), - LinkListItem( - title: 'GitHub', + title: 'GitHub Releases', icon: 'assets/images/github.png', hasIconColor: true, linkTitle: S.current.apk_update, - link: 'https://github.com/cake-tech/cake_wallet/releases'), - LinkListItem( - title: 'Discord', - icon: 'assets/images/discord.png', - linkTitle: 'discord.gg/pwmWa6aFpX', - link: 'https://discord.gg/pwmWa6aFpX'), - LinkListItem( - title: 'Telegram', - icon: 'assets/images/Telegram.png', - linkTitle: 't.me/cakewallet', - link: 'https://t.me/cakewalletannouncements'), - LinkListItem( - title: 'Telegram Support Bot', - icon: 'assets/images/Telegram.png', - linkTitle: '@cakewallet_bot', - link: 'https://t.me/cakewallet_bot'), + link: 'https://github.com/Such-Software/hash-wallet/releases'), LinkListItem( title: 'ChangeNow', icon: 'assets/images/change_now.png', @@ -86,7 +68,7 @@ abstract class SupportViewModelBase with Store { icon: 'assets/images/onramper_dark.png', lightIcon: 'assets/images/onramper_light.png', linkTitle: 'View exchanges', - link: 'https://docs.cakewallet.com/support/buy/#onramper'), + link: 'https://onramper.com/'), LinkListItem( title: 'DFX', icon: 'assets/images/dfx_dark.png', @@ -114,7 +96,7 @@ abstract class SupportViewModelBase with Store { link: 'mailto:contact@support.kryptonim.com'), ]; - final docsUrl = 'https://docs.cakewallet.com'; + final docsUrl = 'https://github.com/Such-Software/hash-wallet'; String fetchUrl({String locale = "en", String authToken = ""}) { var supportUrl = @@ -126,7 +108,7 @@ abstract class SupportViewModelBase with Store { } String get appVersion => - "${isMoneroOnly ? "Monero.com" : "Cake Wallet"} - ${_appStore.settingsStore.appVersion}"; + "${isMoneroOnly ? "Monero.com" : "Hash Wallet"} - ${_appStore.settingsStore.appVersion}"; String get fiatApiMode => _appStore.settingsStore.fiatApiMode.title; diff --git a/lib/view_model/transaction_details_view_model.dart b/lib/view_model/transaction_details_view_model.dart index c87eb0a04..fe453500d 100644 --- a/lib/view_model/transaction_details_view_model.dart +++ b/lib/view_model/transaction_details_view_model.dart @@ -416,7 +416,7 @@ abstract class TransactionDetailsViewModelBase with Store { case WalletType.monero: return 'https://monero.com/tx/${txId}'; case WalletType.bitcoin: - return 'https://mempool.cakewallet.com/${wallet.isTestnet ? "testnet/" : ""}tx/${txId}'; + return 'https://mempool.space/${wallet.isTestnet ? "testnet/" : ""}tx/${txId}'; case WalletType.litecoin: return bitcoin!.txIsMweb(transactionInfo) ? "https://www.mwebexplorer.com/blocks/block/${transactionInfo.height}"