diff --git a/assets/images/cakewallet_app_logo.png b/assets/images/cakewallet_app_logo.png new file mode 100644 index 000000000..64682cd1d Binary files /dev/null and b/assets/images/cakewallet_app_logo.png differ diff --git a/assets/images/cakewallet_icon_1024.png b/assets/images/cakewallet_icon_1024.png new file mode 100644 index 000000000..64682cd1d Binary files /dev/null and b/assets/images/cakewallet_icon_1024.png differ diff --git a/assets/images/cakewallet_icon_120.png b/assets/images/cakewallet_icon_120.png index 5605b29b4..1a2c1b99c 100644 Binary files a/assets/images/cakewallet_icon_120.png and b/assets/images/cakewallet_icon_120.png differ diff --git a/assets/images/cakewallet_icon_180.png b/assets/images/cakewallet_icon_180.png index cae8aa2ee..ff69a866a 100644 Binary files a/assets/images/cakewallet_icon_180.png and b/assets/images/cakewallet_icon_180.png differ diff --git a/assets/images/monero.com_icon_1024.png b/assets/images/monero.com_icon_1024.png new file mode 100644 index 000000000..ecc703781 Binary files /dev/null and b/assets/images/monero.com_icon_1024.png differ diff --git a/lib/main.dart b/lib/main.dart index 285a2c123..1647edf51 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -36,6 +36,7 @@ import 'package:cake_wallet/src/screens/root/root.dart'; import 'package:uni_links/uni_links.dart'; import 'package:cw_core/unspent_coins_info.dart'; import 'package:cake_wallet/monero/monero.dart'; +import 'package:cake_wallet/wallet_type_utils.dart'; final navigatorKey = GlobalKey(); final rootKey = GlobalKey(); @@ -84,6 +85,10 @@ Future main() async { Hive.registerAdapter(OrderAdapter()); } + if (!isMoneroOnly && !Hive.isAdapterRegistered(UnspentCoinsInfo.typeId)) { + Hive.registerAdapter(UnspentCoinsInfoAdapter()); + } + final secureStorage = FlutterSecureStorage(); final transactionDescriptionsBoxKey = await getEncryptionKey( secureStorage: secureStorage, forKey: TransactionDescription.boxKey); diff --git a/lib/router.dart b/lib/router.dart index 680c1a83c..11a7e5ae3 100644 --- a/lib/router.dart +++ b/lib/router.dart @@ -95,8 +95,8 @@ Route createRoute(RouteSettings settings) { builder: (_) => getIt.get( param1: (BuildContext context, WalletType type) => Navigator.of(context) - .pushNamed(Routes.preSeed, arguments: type), - param2: true)); + .pushNamed(Routes.newWallet, arguments: type), + param2: false)); case Routes.newWallet: final type = settings.arguments as WalletType; diff --git a/scripts/ios/app_icon.sh b/scripts/ios/app_icon.sh index 70d7cd0bc..e3eb36b3c 100755 --- a/scripts/ios/app_icon.sh +++ b/scripts/ios/app_icon.sh @@ -2,19 +2,23 @@ ICON_120_PATH="" ICON_180_PATH="" +ICON_1024_PATH="" DEST_DIR_PATH=`pwd`/../../ios/Runner/Assets.xcassets/AppIcon.appiconset case $APP_IOS_TYPE in "monero.com") ICON_120_PATH=`pwd`/../../assets/images/monero.com_icon_120.png - ICON_180_PATH=`pwd`/../../assets/images/monero.com_icon_180.png;; + ICON_180_PATH=`pwd`/../../assets/images/monero.com_icon_180.png + ICON_1024_PATH=`pwd`/../../assets/images/monero.com_icon_1024.png;; "cakewallet") ICON_120_PATH=`pwd`/../../assets/images/cakewallet_icon_120.png - ICON_180_PATH=`pwd`/../../assets/images/cakewallet_icon_180.png;; + ICON_180_PATH=`pwd`/../../assets/images/cakewallet_icon_180.png + ICON_1024_PATH=`pwd`/../../assets/images/cakewallet_icon_1024.png;; esac rm $DEST_DIR_PATH/app_icon_120.png rm $DEST_DIR_PATH/app_icon_180.png +rm $DEST_DIR_PATH/app_icon_1024.png ln -s $ICON_120_PATH $DEST_DIR_PATH/app_icon_120.png ln -s $ICON_180_PATH $DEST_DIR_PATH/app_icon_180.png - +ln -s $ICON_1024_PATH $DEST_DIR_PATH/app_icon_1024.png \ No newline at end of file