Merge branch 'main' of https://github.com/cake-tech/cake_wallet into cw_linux_direct_input_password

This commit is contained in:
OmarHatem 2024-03-14 20:26:49 +02:00
commit 411f054a45
31 changed files with 429 additions and 84 deletions

View file

@ -16,6 +16,7 @@ jobs:
env: env:
STORE_PASS: test@cake_wallet STORE_PASS: test@cake_wallet
KEY_PASS: test@cake_wallet KEY_PASS: test@cake_wallet
PR_NUMBER: ${{ github.event.number }}
steps: steps:
- name: is pr - name: is pr
@ -150,10 +151,7 @@ jobs:
- name: Rename app - name: Rename app
run: | run: |
hash=`sha512sum <<<"${{ env.BRANCH_NAME }}"` echo -e "id=com.cakewallet.test_${{ env.PR_NUMBER }}\nname=${{ env.BRANCH_NAME }}" > /opt/android/cake_wallet/android/app.properties
substring=${hash:0:15}
echo substring
echo -e "id=com.cakewallet.test_$(substring)\nname=${{ env.BRANCH_NAME }}" > /opt/android/cake_wallet/android/app.properties
- name: Build - name: Build
run: | run: |

View file

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Capa_1"
x="0px"
y="0px"
width="510px"
height="510px"
viewBox="0 0 510 510"
style="enable-background:new 0 0 510 510;"
xml:space="preserve"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="notification_logo_tilt_white.svg"><metadata
id="metadata42"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs40" /><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1090"
id="namedview38"
showgrid="false"
inkscape:zoom="0.4627451"
inkscape:cx="-849.27966"
inkscape:cy="255"
inkscape:window-x="-12"
inkscape:window-y="58"
inkscape:window-maximized="1"
inkscape:current-layer="notifications"
inkscape:object-paths="true" /><g
id="g3"
transform="matrix(0.87658593,0,0,0.87658593,31.470588,31.470588)"><g
id="notifications"
transform="rotate(-20,255,255)"><path
d="m 233.56017,502.19654 c 28.05,0 51,-22.95 51,-51 h -102 c 0,28.05 22.95,51 51,51 z m 165.75,-153 v -140.25 c 0,-79.05 -53.55,-142.8 -127.5,-160.65 v -17.85 c 0,-20.4 -17.85,-38.2499996 -38.25,-38.2499996 -20.4,0 -38.25,17.8499996 -38.25,38.2499996 v 17.85 c -73.95,17.85 -127.499999,81.6 -127.499999,160.65 v 140.25 l -51,51 v 25.5 H 450.31017 v -25.5 z"
id="path6"
inkscape:connector-curvature="0"
style="opacity:1;fill:#ffffff;fill-opacity:0;stroke:#000000;stroke-width:19.39342117;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /></g></g><g
id="g8" /><g
id="g10" /><g
id="g12" /><g
id="g14" /><g
id="g16" /><g
id="g18" /><g
id="g20" /><g
id="g22" /><g
id="g24" /><g
id="g26" /><g
id="g28" /><g
id="g30" /><g
id="g32" /><g
id="g34" /><g
id="g36" /></svg>

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 546 B

View file

@ -1,2 +1,2 @@
New themes In-App live status page for the app services
Bug fixes and enhancements Bug fixes and enhancements

View file

@ -1,6 +1,2 @@
Add Solana wallet In-App live status page for the app services
Support ALL Bitcoin address types (Legacy, Segwit (both variants), Taproot)
Enhance Sending/Receiving flow for Bitcoin
Improve fee calculations in Bitcoin
New themes
Bug fixes and enhancements Bug fixes and enhancements

View file

@ -216,7 +216,7 @@ class CryptoCurrency extends EnumerableItem<int> with Serializable<int> implemen
static const usdcEPoly = CryptoCurrency(title: 'USDC.E', tag: 'POLY', fullName: 'USD Coin (PoS)', raw: 88, name: 'usdcepoly', iconPath: 'assets/images/usdc_icon.png', decimals: 6); static const usdcEPoly = CryptoCurrency(title: 'USDC.E', tag: 'POLY', fullName: 'USD Coin (PoS)', raw: 88, name: 'usdcepoly', iconPath: 'assets/images/usdc_icon.png', decimals: 6);
static const kaspa = CryptoCurrency(title: 'KAS', fullName: 'Kaspa', raw: 89, name: 'kas', iconPath: 'assets/images/kaspa_icon.png', decimals: 8); static const kaspa = CryptoCurrency(title: 'KAS', fullName: 'Kaspa', raw: 89, name: 'kas', iconPath: 'assets/images/kaspa_icon.png', decimals: 8);
static const digibyte = CryptoCurrency(title: 'DGB', fullName: 'DigiByte', raw: 90, name: 'dgb', iconPath: 'assets/images/digibyte.png', decimals: 8); static const digibyte = CryptoCurrency(title: 'DGB', fullName: 'DigiByte', raw: 90, name: 'dgb', iconPath: 'assets/images/digibyte.png', decimals: 8);
static const usdtSol = CryptoCurrency(title: 'USDT', tag: 'SOL', fullName: 'USDT Tether', raw: 90, name: 'usdtsol', iconPath: 'assets/images/usdt_icon.png', decimals: 6); static const usdtSol = CryptoCurrency(title: 'USDT', tag: 'SOL', fullName: 'USDT Tether', raw: 91, name: 'usdtsol', iconPath: 'assets/images/usdt_icon.png', decimals: 6);
static final Map<int, CryptoCurrency> _rawCurrencyMap = static final Map<int, CryptoCurrency> _rawCurrencyMap =

View file

@ -1,7 +1,4 @@
import 'package:cw_core/transaction_priority.dart'; import 'package:cw_core/transaction_priority.dart';
import 'package:cw_core/wallet_type.dart';
//import 'package:cake_wallet/generated/i18n.dart';
import 'package:cw_core/enumerable_item.dart';
class MoneroTransactionPriority extends TransactionPriority { class MoneroTransactionPriority extends TransactionPriority {
const MoneroTransactionPriority({required String title, required int raw}) const MoneroTransactionPriority({required String title, required int raw})
@ -12,21 +9,20 @@ class MoneroTransactionPriority extends TransactionPriority {
MoneroTransactionPriority.automatic, MoneroTransactionPriority.automatic,
MoneroTransactionPriority.medium, MoneroTransactionPriority.medium,
MoneroTransactionPriority.fast, MoneroTransactionPriority.fast,
MoneroTransactionPriority.fastest MoneroTransactionPriority.fastest,
]; ];
static const slow = MoneroTransactionPriority(title: 'Slow', raw: 0); static const automatic = MoneroTransactionPriority(title: 'Automatic', raw: 0);
static const automatic = MoneroTransactionPriority(title: 'Automatic', raw: 1); static const slow = MoneroTransactionPriority(title: 'Slow', raw: 1);
static const medium = MoneroTransactionPriority(title: 'Medium', raw: 2); static const medium = MoneroTransactionPriority(title: 'Medium', raw: 2);
static const fast = MoneroTransactionPriority(title: 'Fast', raw: 3); static const fast = MoneroTransactionPriority(title: 'Fast', raw: 3);
static const fastest = MoneroTransactionPriority(title: 'Fastest', raw: 4); static const fastest = MoneroTransactionPriority(title: 'Fastest', raw: 4);
static const standard = slow;
static MoneroTransactionPriority deserialize({required int raw}) { static MoneroTransactionPriority deserialize({required int raw}) {
switch (raw) { switch (raw) {
case 0: case 0:
return slow;
case 1:
return automatic; return automatic;
case 1:
return slow;
case 2: case 2:
return medium; return medium;
case 3: case 3:

View file

@ -191,13 +191,8 @@ abstract class MoneroWalletBase extends WalletBase<MoneroBalance,
// try to use the date instead: // try to use the date instead:
try { try {
_setHeightFromDate(); _setHeightFromDate();
} catch (e, s) { } catch (_) {
// we still couldn't get a valid sync height :/ // we still couldn't get a valid sync height :/
onError?.call(FlutterErrorDetails(
exception: e,
stack: s,
library: this.runtimeType.toString(),
));
} }
} }
} }

View file

@ -171,16 +171,6 @@ abstract class SolanaWalletBase
throw Exception("Solana Node connection failed"); throw Exception("Solana Node connection failed");
} }
try {
await Future.wait([
_updateBalance(),
_updateNativeSOLTransactions(),
_updateSPLTokenTransactions(),
]);
} catch (e) {
log(e.toString());
}
_setTransactionUpdateTimer(); _setTransactionUpdateTimer();
syncStatus = ConnectedSyncStatus(); syncStatus = ConnectedSyncStatus();

View file

@ -385,6 +385,7 @@ Future<void> setup({
yatStore: getIt.get<YatStore>(), yatStore: getIt.get<YatStore>(),
ordersStore: getIt.get<OrdersStore>(), ordersStore: getIt.get<OrdersStore>(),
anonpayTransactionsStore: getIt.get<AnonpayTransactionsStore>(), anonpayTransactionsStore: getIt.get<AnonpayTransactionsStore>(),
sharedPreferences: getIt.get<SharedPreferences>(),
keyService: getIt.get<KeyService>())); keyService: getIt.get<KeyService>()));
getIt.registerFactory<AuthService>( getIt.registerFactory<AuthService>(

View file

@ -201,6 +201,9 @@ Future<void> defaultSettingsMigration(
await changeSolanaCurrentNodeToDefault( await changeSolanaCurrentNodeToDefault(
sharedPreferences: sharedPreferences, nodes: nodes); sharedPreferences: sharedPreferences, nodes: nodes);
break; break;
case 28:
await _updateMoneroPriority(sharedPreferences);
break;
default: default:
break; break;
} }
@ -215,6 +218,18 @@ Future<void> defaultSettingsMigration(
await sharedPreferences.setInt(PreferencesKey.currentDefaultSettingsMigrationVersion, version); await sharedPreferences.setInt(PreferencesKey.currentDefaultSettingsMigrationVersion, version);
} }
Future<void> _updateMoneroPriority(SharedPreferences sharedPreferences) async {
final currentPriority =
await sharedPreferences.getInt(PreferencesKey.moneroTransactionPriority) ??
monero!.getDefaultTransactionPriority().serialize();
// was set to automatic but automatic should be 0
if (currentPriority == 1) {
sharedPreferences.setInt(PreferencesKey.moneroTransactionPriority,
monero!.getDefaultTransactionPriority().serialize()); // 0
}
}
Future<void> _validateWalletInfoBoxData(Box<WalletInfo> walletInfoSource) async { Future<void> _validateWalletInfoBoxData(Box<WalletInfo> walletInfoSource) async {
try { try {
final root = await getAppDir(); final root = await getAppDir();

View file

@ -72,4 +72,5 @@ class PreferencesKey {
static const lastSeenAppVersion = 'last_seen_app_version'; static const lastSeenAppVersion = 'last_seen_app_version';
static const shouldShowMarketPlaceInDashboard = 'should_show_marketplace_in_dashboard'; static const shouldShowMarketPlaceInDashboard = 'should_show_marketplace_in_dashboard';
static const isNewInstall = 'is_new_install'; static const isNewInstall = 'is_new_install';
static const serviceStatusShaKey = 'service_status_sha_key';
} }

View file

@ -0,0 +1,41 @@
class ServiceStatus {
final String title;
final String description;
final String? image;
final String? status;
final DateTime date;
ServiceStatus(
{required this.title,
required this.description,
required this.date,
this.image,
this.status});
factory ServiceStatus.fromJson(Map<String, dynamic> json) => ServiceStatus(
title: json['title'] as String? ?? '',
description: json['description'] as String? ?? '',
date: DateTime.tryParse(json['date'] as String? ?? '') ?? DateTime.now(),
image: json['image'] as String?,
status: json['status'] as String?,
);
}
class ServicesResponse {
final List<ServiceStatus> servicesStatus;
final bool hasUpdates;
final String currentSha;
ServicesResponse(this.servicesStatus, this.hasUpdates, this.currentSha);
factory ServicesResponse.fromJson(
Map<String, dynamic> json, bool hasUpdates, String currentSha) {
return ServicesResponse(
(json['notices'] as List? ?? [])
.map((e) => ServiceStatus.fromJson(e as Map<String, dynamic>))
.toList(),
hasUpdates,
currentSha,
);
}
}

View file

@ -165,7 +165,7 @@ Future<void> initializeAppConfigs() async {
transactionDescriptions: transactionDescriptions, transactionDescriptions: transactionDescriptions,
secureStorage: secureStorage, secureStorage: secureStorage,
anonpayInvoiceInfo: anonpayInvoiceInfo, anonpayInvoiceInfo: anonpayInvoiceInfo,
initialMigrationVersion: 27); initialMigrationVersion: 28);
} }
Future<void> initialSetup( Future<void> initialSetup(

View file

@ -111,7 +111,7 @@ class CWSolana extends Solana {
@override @override
List<int>? getValidationLength(CryptoCurrency type) { List<int>? getValidationLength(CryptoCurrency type) {
if (type is SPLToken) { if (type is SPLToken) {
return [44]; return [32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44];
} }
return null; return null;

View file

@ -7,6 +7,7 @@ import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_sideba
import 'package:cake_wallet/src/screens/dashboard/pages/market_place_page.dart'; import 'package:cake_wallet/src/screens/dashboard/pages/market_place_page.dart';
import 'package:cake_wallet/src/screens/wallet_connect/widgets/modals/bottom_sheet_listener.dart'; import 'package:cake_wallet/src/screens/wallet_connect/widgets/modals/bottom_sheet_listener.dart';
import 'package:cake_wallet/src/widgets/gradient_background.dart'; import 'package:cake_wallet/src/widgets/gradient_background.dart';
import 'package:cake_wallet/src/widgets/services_updates_widget.dart';
import 'package:cake_wallet/src/widgets/vulnerable_seeds_popup.dart'; import 'package:cake_wallet/src/widgets/vulnerable_seeds_popup.dart';
import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart'; import 'package:cake_wallet/themes/extensions/sync_indicator_theme.dart';
import 'package:cake_wallet/utils/device_info.dart'; import 'package:cake_wallet/utils/device_info.dart';
@ -101,6 +102,9 @@ class _DashboardPageView extends BasePage {
@override @override
Widget get endDrawer => MenuWidget(dashboardViewModel); Widget get endDrawer => MenuWidget(dashboardViewModel);
@override
Widget leading(BuildContext context) => ServicesUpdatesWidget(dashboardViewModel.getServicesStatus());
@override @override
Widget middle(BuildContext context) { Widget middle(BuildContext context) {
return SyncIndicator( return SyncIndicator(

View file

@ -7,13 +7,15 @@ class SideMenuItem extends StatelessWidget {
required this.onTap, required this.onTap,
this.imagePath, this.imagePath,
this.icon, this.icon,
this.widget,
this.isSelected = false, this.isSelected = false,
}) : assert((icon != null && imagePath == null) || (icon == null && imagePath != null)); }) : assert(widget != null || icon != null || imagePath != null);
final void Function() onTap; final void Function() onTap;
final String? imagePath; final String? imagePath;
final IconData? icon; final IconData? icon;
final bool isSelected; final bool isSelected;
final Widget? widget;
Color _setColor(BuildContext context) { Color _setColor(BuildContext context) {
if (isSelected) { if (isSelected) {
@ -28,18 +30,7 @@ class SideMenuItem extends StatelessWidget {
return InkWell( return InkWell(
child: Padding( child: Padding(
padding: EdgeInsets.all(20), padding: EdgeInsets.all(20),
child: icon != null child: widget ?? _getIcon(context),
? Icon(
icon,
color: _setColor(context),
)
: Image.asset(
imagePath ?? '',
fit: BoxFit.cover,
height: 30,
width: 30,
color: _setColor(context),
),
), ),
onTap: () => onTap.call(), onTap: () => onTap.call(),
highlightColor: Colors.transparent, highlightColor: Colors.transparent,
@ -48,4 +39,19 @@ class SideMenuItem extends StatelessWidget {
splashColor: Colors.transparent, splashColor: Colors.transparent,
); );
} }
Widget _getIcon(BuildContext context) {
return icon != null
? Icon(
icon,
color: _setColor(context),
)
: Image.asset(
imagePath ?? '',
fit: BoxFit.cover,
height: 30,
width: 30,
color: _setColor(context),
);
}
} }

View file

@ -9,6 +9,7 @@ import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_sideba
import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart'; import 'package:cake_wallet/src/screens/dashboard/desktop_widgets/desktop_wallet_selection_dropdown.dart';
import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator.dart'; import 'package:cake_wallet/src/screens/dashboard/widgets/sync_indicator.dart';
import 'package:cake_wallet/src/screens/wallet_connect/widgets/modals/bottom_sheet_listener.dart'; import 'package:cake_wallet/src/screens/wallet_connect/widgets/modals/bottom_sheet_listener.dart';
import 'package:cake_wallet/src/widgets/services_updates_widget.dart';
import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart'; import 'package:cake_wallet/view_model/dashboard/dashboard_view_model.dart';
import 'package:cake_wallet/view_model/dashboard/desktop_sidebar_view_model.dart'; import 'package:cake_wallet/view_model/dashboard/desktop_sidebar_view_model.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
@ -105,12 +106,18 @@ class DesktopSidebarWrapper extends BasePage {
? selectedIconPath ? selectedIconPath
: unselectedIconPath, : unselectedIconPath,
), ),
SideMenuItem(
widget: ServicesUpdatesWidget(dashboardViewModel.getServicesStatus()),
isSelected: desktopSidebarViewModel.currentPage == SidebarItem.status,
onTap: () {},
),
], ],
bottomItems: [ bottomItems: [
SideMenuItem( SideMenuItem(
imagePath: 'assets/images/support_icon.png', imagePath: 'assets/images/support_icon.png',
isSelected: desktopSidebarViewModel.currentPage == SidebarItem.support, isSelected: desktopSidebarViewModel.currentPage == SidebarItem.support,
onTap: () => desktopSidebarViewModel.onPageChange(SidebarItem.support)), onTap: () => desktopSidebarViewModel.onPageChange(SidebarItem.support),
),
SideMenuItem( SideMenuItem(
imagePath: 'assets/images/settings_outline.png', imagePath: 'assets/images/settings_outline.png',
isSelected: desktopSidebarViewModel.currentPage == SidebarItem.settings, isSelected: desktopSidebarViewModel.currentPage == SidebarItem.settings,

View file

@ -179,7 +179,7 @@ class BaseAlertDialog extends StatelessWidget {
Column( Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: <Widget>[ children: <Widget>[
if (headerText != null) headerTitle(context), if (headerText?.isNotEmpty ?? false) headerTitle(context),
Padding( Padding(
padding: EdgeInsets.fromLTRB(24, 20, 24, 0), padding: EdgeInsets.fromLTRB(24, 20, 24, 0),
child: title(context), child: title(context),

View file

@ -0,0 +1,71 @@
import 'package:auto_size_text/auto_size_text.dart';
import 'package:cake_wallet/entities/service_status.dart';
import 'package:flutter/material.dart';
import 'package:intl/intl.dart';
class ServiceStatusTile extends StatelessWidget {
final ServiceStatus status;
const ServiceStatusTile(this.status, {super.key});
@override
Widget build(BuildContext context) {
return ListTile(
contentPadding: const EdgeInsets.all(8),
title: Padding(
padding: const EdgeInsets.symmetric(vertical: 8),
child: Row(
crossAxisAlignment: CrossAxisAlignment.end,
children: [
Expanded(
child: AutoSizeText(
"${status.title}${status.status != null ? " - ${status.status}" : ""}",
style: TextStyle(
fontSize: 16,
fontFamily: 'Lato',
fontWeight: FontWeight.w800,
height: 1,
),
maxLines: 1,
textAlign: TextAlign.start,
),
),
Text(
_getTimeString(status.date),
style: TextStyle(fontSize: 12),
),
],
),
),
leading: RotatedBox(
child: Icon(
Icons.info,
color: status.status == "resolved" ? Colors.green : Colors.red,
),
quarterTurns: 2,
),
subtitle: Row(
children: [
Expanded(child: Text(status.description)),
if (status.image != null)
SizedBox(
height: 50,
width: 50,
child: Image.network(status.image!),
),
],
),
);
}
String _getTimeString(DateTime date) {
int difference = DateTime.now().difference(date).inHours;
if (difference == 0) {
return "few minutes ago";
}
if (difference < 24) {
return DateFormat('h:mm a').format(date);
}
return DateFormat('d-MM-yyyy').format(date);
}
}

View file

@ -0,0 +1,122 @@
import 'package:cake_wallet/di.dart';
import 'package:cake_wallet/entities/preferences_key.dart';
import 'package:cake_wallet/entities/service_status.dart';
import 'package:cake_wallet/src/widgets/primary_button.dart';
import 'package:cake_wallet/src/widgets/service_status_tile.dart';
import 'package:cake_wallet/themes/extensions/dashboard_page_theme.dart';
import 'package:cake_wallet/themes/extensions/wallet_list_theme.dart';
import 'package:flutter/material.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:url_launcher/url_launcher.dart';
class ServicesUpdatesWidget extends StatelessWidget {
final Future<ServicesResponse> servicesResponse;
const ServicesUpdatesWidget(this.servicesResponse, {super.key});
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.all(8.0),
child: FutureBuilder<ServicesResponse>(
future: servicesResponse,
builder: (context, state) {
return InkWell(
onTap: state.hasData
? () {
// save currentSha when the user see the status
getIt
.get<SharedPreferences>()
.setString(PreferencesKey.serviceStatusShaKey, state.data!.currentSha);
showModalBottomSheet(
context: context,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(50),
topRight: Radius.circular(50),
),
),
constraints: BoxConstraints(
maxHeight: MediaQuery.of(context).size.height / 2,
minHeight: MediaQuery.of(context).size.height / 4,
),
builder: (context) {
Widget body;
if (state.data!.servicesStatus.isEmpty) {
body = Center(
child: Text("Everything is up and running as expected"),
);
} else {
body = SingleChildScrollView(
child: Column(
children: state.data!.servicesStatus
.map((status) => ServiceStatusTile(status))
.toList()),
);
}
return Padding(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 20),
child: Stack(
children: [
body,
Align(
alignment: Alignment.bottomCenter,
child: Padding(
padding: EdgeInsets.symmetric(
horizontal: MediaQuery.of(context).size.width / 8),
child: PrimaryImageButton(
onPressed: () {
try {
launchUrl(Uri.parse("https://status.cakewallet.com/"));
} catch (_) {}
},
image: Image.asset(
"assets/images/status_website_image.png",
color: Theme.of(context).brightness == Brightness.light
? Colors.white
: null,
),
text: "Status Website",
color: Theme.of(context)
.extension<WalletListTheme>()!
.createNewWalletButtonBackgroundColor,
textColor: Theme.of(context)
.extension<WalletListTheme>()!
.restoreWalletButtonTextColor,
),
),
)
],
),
);
},
);
}
: null,
child: Stack(
children: [
SvgPicture.asset(
"assets/images/notification_icon.svg",
color: Theme.of(context).extension<DashboardPageTheme>()!.pageTitleTextColor,
width: 30,
),
if (state.hasData && state.data!.hasUpdates)
Container(
height: 7,
width: 7,
margin: EdgeInsetsDirectional.only(start: 15),
decoration: BoxDecoration(
color: Colors.red,
shape: BoxShape.circle,
),
),
],
),
);
},
),
);
}
}

View file

@ -4,8 +4,10 @@ import 'package:cake_wallet/buy/buy_provider.dart';
import 'package:cake_wallet/core/key_service.dart'; import 'package:cake_wallet/core/key_service.dart';
import 'package:cake_wallet/entities/auto_generate_subaddress_status.dart'; import 'package:cake_wallet/entities/auto_generate_subaddress_status.dart';
import 'package:cake_wallet/entities/balance_display_mode.dart'; import 'package:cake_wallet/entities/balance_display_mode.dart';
import 'package:cake_wallet/entities/preferences_key.dart';
import 'package:cake_wallet/entities/provider_types.dart'; import 'package:cake_wallet/entities/provider_types.dart';
import 'package:cake_wallet/entities/exchange_api_mode.dart'; import 'package:cake_wallet/entities/exchange_api_mode.dart';
import 'package:cake_wallet/entities/service_status.dart';
import 'package:cake_wallet/exchange/exchange_provider_description.dart'; import 'package:cake_wallet/exchange/exchange_provider_description.dart';
import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/generated/i18n.dart';
import 'package:cake_wallet/monero/monero.dart'; import 'package:cake_wallet/monero/monero.dart';
@ -42,7 +44,8 @@ import 'package:cw_core/wallet_type.dart';
import 'package:eth_sig_util/util/utils.dart'; import 'package:eth_sig_util/util/utils.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:mobx/mobx.dart'; import 'package:mobx/mobx.dart';
import 'package:cake_wallet/entities/provider_types.dart'; import 'package:http/http.dart' as http;
import 'package:shared_preferences/shared_preferences.dart';
part 'dashboard_view_model.g.dart'; part 'dashboard_view_model.g.dart';
@ -59,6 +62,7 @@ abstract class DashboardViewModelBase with Store {
required this.yatStore, required this.yatStore,
required this.ordersStore, required this.ordersStore,
required this.anonpayTransactionsStore, required this.anonpayTransactionsStore,
required this.sharedPreferences,
required this.keyService}) required this.keyService})
: hasSellAction = false, : hasSellAction = false,
hasBuyAction = false, hasBuyAction = false,
@ -280,6 +284,7 @@ abstract class DashboardViewModelBase with Store {
bool get hasRescan => wallet.type == WalletType.monero || wallet.type == WalletType.haven; bool get hasRescan => wallet.type == WalletType.monero || wallet.type == WalletType.haven;
final KeyService keyService; final KeyService keyService;
final SharedPreferences sharedPreferences;
BalanceViewModel balanceViewModel; BalanceViewModel balanceViewModel;
@ -339,15 +344,13 @@ abstract class DashboardViewModelBase with Store {
bool hasExchangeAction; bool hasExchangeAction;
@computed @computed
bool get isEnabledBuyAction => bool get isEnabledBuyAction => !settingsStore.disableBuy && availableBuyProviders.isNotEmpty;
!settingsStore.disableBuy && availableBuyProviders.isNotEmpty;
@observable @observable
bool hasBuyAction; bool hasBuyAction;
@computed @computed
bool get isEnabledSellAction => bool get isEnabledSellAction => !settingsStore.disableSell && availableSellProviders.isNotEmpty;
!settingsStore.disableSell && availableSellProviders.isNotEmpty;
@observable @observable
bool hasSellAction; bool hasSellAction;
@ -472,7 +475,8 @@ abstract class DashboardViewModelBase with Store {
Future<List<String>> checkAffectedWallets() async { Future<List<String>> checkAffectedWallets() async {
// await load file // await load file
final vulnerableSeedsString = await rootBundle.loadString('assets/text/cakewallet_weak_bitcoin_seeds_hashed_sorted_version1.txt'); final vulnerableSeedsString = await rootBundle
.loadString('assets/text/cakewallet_weak_bitcoin_seeds_hashed_sorted_version1.txt');
final vulnerableSeeds = vulnerableSeedsString.split("\n"); final vulnerableSeeds = vulnerableSeedsString.split("\n");
final walletInfoSource = await CakeHive.openBox<WalletInfo>(WalletInfo.boxName); final walletInfoSource = await CakeHive.openBox<WalletInfo>(WalletInfo.boxName);
@ -497,4 +501,29 @@ abstract class DashboardViewModelBase with Store {
return affectedWallets; return affectedWallets;
} }
Future<ServicesResponse> getServicesStatus() async {
try {
final res = await http.get(Uri.parse("https://service-api.cakewallet.com/v1/active-notices"));
if (res.statusCode < 200 || res.statusCode >= 300) {
throw res.body;
}
final oldSha = sharedPreferences.getString(PreferencesKey.serviceStatusShaKey);
final hash = await Cryptography.instance.sha256().hash(utf8.encode(res.body));
final currentSha = bytesToHex(hash.bytes);
final hasUpdates = oldSha != currentSha;
return ServicesResponse.fromJson(
json.decode(res.body) as Map<String, dynamic>,
hasUpdates,
currentSha,
);
} catch (_) {
return ServicesResponse([], false, '');
}
}
} }

View file

@ -5,6 +5,7 @@ part 'desktop_sidebar_view_model.g.dart';
enum SidebarItem { enum SidebarItem {
dashboard, dashboard,
transactions, transactions,
status,
support, support,
settings, settings,
} }

View file

@ -427,9 +427,10 @@ abstract class SendViewModelBase extends WalletChangeListenerViewModel with Stor
) { ) {
if (walletType == WalletType.ethereum || if (walletType == WalletType.ethereum ||
walletType == WalletType.polygon || walletType == WalletType.polygon ||
walletType == WalletType.solana ||
walletType == WalletType.haven) { walletType == WalletType.haven) {
if (error.contains('gas required exceeds allowance') || if (error.contains('gas required exceeds allowance') ||
error.contains('insufficient funds for')) { error.contains('insufficient funds')) {
return S.current.do_not_have_enough_gas_asset(currency.toString()); return S.current.do_not_have_enough_gas_asset(currency.toString());
} }

View file

@ -15,15 +15,15 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
APP_ANDROID_TYPE=$1 APP_ANDROID_TYPE=$1
MONERO_COM_NAME="Monero.com" MONERO_COM_NAME="Monero.com"
MONERO_COM_VERSION="1.11.0" MONERO_COM_VERSION="1.11.1"
MONERO_COM_BUILD_NUMBER=77 MONERO_COM_BUILD_NUMBER=78
MONERO_COM_BUNDLE_ID="com.monero.app" MONERO_COM_BUNDLE_ID="com.monero.app"
MONERO_COM_PACKAGE="com.monero.app" MONERO_COM_PACKAGE="com.monero.app"
MONERO_COM_SCHEME="monero.com" MONERO_COM_SCHEME="monero.com"
CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="4.14.0" CAKEWALLET_VERSION="4.14.1"
CAKEWALLET_BUILD_NUMBER=196 CAKEWALLET_BUILD_NUMBER=197
CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet" CAKEWALLET_BUNDLE_ID="com.cakewallet.cake_wallet"
CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet" CAKEWALLET_PACKAGE="com.cakewallet.cake_wallet"
CAKEWALLET_SCHEME="cakewallet" CAKEWALLET_SCHEME="cakewallet"

View file

@ -1,13 +1,12 @@
#!/bin/sh #!/bin/sh
. ./config.sh . ./config.sh
MONERO_BRANCH=release-v0.18.2.2-android MONERO_BRANCH=release-v0.18.3.2-android
MONERO_SRC_DIR=${WORKDIR}/monero MONERO_SRC_DIR=${WORKDIR}/monero
git clone https://github.com/cake-tech/monero.git ${MONERO_SRC_DIR} --branch ${MONERO_BRANCH} git clone https://github.com/cake-tech/monero.git ${MONERO_SRC_DIR} --branch ${MONERO_BRANCH}
cd $MONERO_SRC_DIR cd $MONERO_SRC_DIR
git submodule init git submodule update --init --force
git submodule update
for arch in "aarch" "aarch64" "i686" "x86_64" for arch in "aarch" "aarch64" "i686" "x86_64"
do do
@ -59,7 +58,7 @@ cd $MONERO_SRC_DIR
rm -rf ./build/release rm -rf ./build/release
mkdir -p ./build/release mkdir -p ./build/release
cd ./build/release cd ./build/release
CC=${CLANG} CXX=${CXXLANG} cmake -D USE_DEVICE_TREZOR=OFF -D BUILD_GUI_DEPS=1 -D BUILD_TESTS=OFF -D ARCH=${ARCH} -D STATIC=ON -D BUILD_64=${BUILD_64} -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D INSTALL_VENDORED_LIBUNBOUND=ON -D BUILD_TAG=${TAG} -D CMAKE_SYSTEM_NAME="Android" -D CMAKE_ANDROID_STANDALONE_TOOLCHAIN="${ANDROID_STANDALONE_TOOLCHAIN_PATH}" -D CMAKE_ANDROID_ARCH_ABI=${ARCH_ABI} $FLAGS ../.. CC=${CLANG} CXX=${CXXLANG} cmake -D USE_DEVICE_TREZOR=OFF -D BUILD_GUI_DEPS=1 -D BUILD_TESTS=OFF -D ARCH=${ARCH} -D STATIC=ON -D BUILD_64=${BUILD_64} -D CMAKE_BUILD_TYPE=release -D ANDROID=true -D INSTALL_VENDORED_LIBUNBOUND=ON -D BUILD_TAG=${TAG} -D CMAKE_SYSTEM_NAME="Android" -D CMAKE_ANDROID_STANDALONE_TOOLCHAIN="${ANDROID_STANDALONE_TOOLCHAIN_PATH}" -D CMAKE_ANDROID_ARCH_ABI=${ARCH_ABI} -D MANUAL_SUBMODULES=1 $FLAGS ../..
make wallet_api -j$THREADS make wallet_api -j$THREADS
find . -path ./lib -prune -o -name '*.a' -exec cp '{}' lib \; find . -path ./lib -prune -o -name '*.a' -exec cp '{}' lib \;

View file

@ -13,13 +13,13 @@ TYPES=($MONERO_COM $CAKEWALLET $HAVEN)
APP_IOS_TYPE=$1 APP_IOS_TYPE=$1
MONERO_COM_NAME="Monero.com" MONERO_COM_NAME="Monero.com"
MONERO_COM_VERSION="1.11.0" MONERO_COM_VERSION="1.11.1"
MONERO_COM_BUILD_NUMBER=75 MONERO_COM_BUILD_NUMBER=76
MONERO_COM_BUNDLE_ID="com.cakewallet.monero" MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="4.14.0" CAKEWALLET_VERSION="4.14.1"
CAKEWALLET_BUILD_NUMBER=215 CAKEWALLET_BUILD_NUMBER=216
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
HAVEN_NAME="Haven" HAVEN_NAME="Haven"

View file

@ -4,7 +4,7 @@
MONERO_URL="https://github.com/cake-tech/monero.git" MONERO_URL="https://github.com/cake-tech/monero.git"
MONERO_DIR_PATH="${EXTERNAL_IOS_SOURCE_DIR}/monero" MONERO_DIR_PATH="${EXTERNAL_IOS_SOURCE_DIR}/monero"
MONERO_VERSION=release-v0.18.2.2 MONERO_VERSION=release-v0.18.3.2
BUILD_TYPE=release BUILD_TYPE=release
PREFIX=${EXTERNAL_IOS_DIR} PREFIX=${EXTERNAL_IOS_DIR}
DEST_LIB_DIR=${EXTERNAL_IOS_LIB_DIR}/monero DEST_LIB_DIR=${EXTERNAL_IOS_LIB_DIR}/monero
@ -52,6 +52,7 @@ cmake -D IOS=ON \
-DUNBOUND_INCLUDE_DIR=${EXTERNAL_IOS_INCLUDE_DIR} \ -DUNBOUND_INCLUDE_DIR=${EXTERNAL_IOS_INCLUDE_DIR} \
-DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
-DUSE_DEVICE_TREZOR=OFF \ -DUSE_DEVICE_TREZOR=OFF \
-DMANUAL_SUBMODULES=1 \
../.. ../..
make wallet_api -j4 make wallet_api -j4
find . -path ./lib -prune -o -name '*.a' -exec cp '{}' lib \; find . -path ./lib -prune -o -name '*.a' -exec cp '{}' lib \;

View file

@ -8,9 +8,10 @@ SODIUM_URL="https://github.com/jedisct1/libsodium.git"
echo "============================ SODIUM ============================" echo "============================ SODIUM ============================"
echo "Cloning SODIUM from - $SODIUM_URL" echo "Cloning SODIUM from - $SODIUM_URL"
git clone $SODIUM_URL $SODIUM_PATH --branch stable git clone $SODIUM_URL $SODIUM_PATH
cd $SODIUM_PATH cd $SODIUM_PATH
./dist-build/ios.sh git checkout 443617d7507498f7477703f0b51cb596d4539262
./dist-build/apple-xcframework.sh
mv ${SODIUM_PATH}/libsodium-ios/include/* $EXTERNAL_IOS_INCLUDE_DIR mv ${SODIUM_PATH}/libsodium-apple/ios/include/* $EXTERNAL_IOS_INCLUDE_DIR
mv ${SODIUM_PATH}/libsodium-ios/lib/* $EXTERNAL_IOS_LIB_DIR mv ${SODIUM_PATH}/libsodium-apple/ios/lib/* $EXTERNAL_IOS_LIB_DIR

View file

@ -16,13 +16,13 @@ if [ -n "$1" ]; then
fi fi
MONERO_COM_NAME="Monero.com" MONERO_COM_NAME="Monero.com"
MONERO_COM_VERSION="1.1.0" MONERO_COM_VERSION="1.1.1"
MONERO_COM_BUILD_NUMBER=7 MONERO_COM_BUILD_NUMBER=9
MONERO_COM_BUNDLE_ID="com.cakewallet.monero" MONERO_COM_BUNDLE_ID="com.cakewallet.monero"
CAKEWALLET_NAME="Cake Wallet" CAKEWALLET_NAME="Cake Wallet"
CAKEWALLET_VERSION="1.7.0" CAKEWALLET_VERSION="1.7.1"
CAKEWALLET_BUILD_NUMBER=55 CAKEWALLET_BUILD_NUMBER=56
CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet" CAKEWALLET_BUNDLE_ID="com.fotolockr.cakewallet"
if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then if ! [[ " ${TYPES[*]} " =~ " ${APP_MACOS_TYPE} " ]]; then

View file

@ -4,7 +4,7 @@
MONERO_URL="https://github.com/cake-tech/monero.git" MONERO_URL="https://github.com/cake-tech/monero.git"
MONERO_DIR_PATH="${EXTERNAL_MACOS_SOURCE_DIR}/monero" MONERO_DIR_PATH="${EXTERNAL_MACOS_SOURCE_DIR}/monero"
MONERO_VERSION=release-v0.18.2.2 MONERO_VERSION=release-v0.18.3.2
BUILD_TYPE=release BUILD_TYPE=release
PREFIX=${EXTERNAL_MACOS_DIR} PREFIX=${EXTERNAL_MACOS_DIR}
DEST_LIB_DIR=${EXTERNAL_MACOS_LIB_DIR}/monero DEST_LIB_DIR=${EXTERNAL_MACOS_LIB_DIR}/monero
@ -46,6 +46,7 @@ cmake -DARCH=${ARCH} \
-DUNBOUND_INCLUDE_DIR=${EXTERNAL_MACOS_INCLUDE_DIR} \ -DUNBOUND_INCLUDE_DIR=${EXTERNAL_MACOS_INCLUDE_DIR} \
-DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_PREFIX} \
-DUSE_DEVICE_TREZOR=OFF \ -DUSE_DEVICE_TREZOR=OFF \
-DMANUAL_SUBMODULES=1 \
../.. ../..
make wallet_api -j4 make wallet_api -j4
find . -path ./lib -prune -o -name '*.a' -exec cp '{}' lib \; find . -path ./lib -prune -o -name '*.a' -exec cp '{}' lib \;