diff --git a/android/app/src/main/res/drawable/launch_background.xml b/android/app/src/main/res/drawable/launch_background.xml index 596a7db5bd..027009df09 100644 --- a/android/app/src/main/res/drawable/launch_background.xml +++ b/android/app/src/main/res/drawable/launch_background.xml @@ -1,7 +1,9 @@ - + - - + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index f30783b210..2de56f7773 100644 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,7 @@ - - - + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index dfab2e2f45..66ba7c7185 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/launcher_icon_foreground.png b/android/app/src/main/res/mipmap-hdpi/launcher_icon_foreground.png new file mode 100644 index 0000000000..2cb62a2d34 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/launcher_icon_foreground.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 2e892aa481..1ba747340a 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/launcher_icon_foreground.png b/android/app/src/main/res/mipmap-mdpi/launcher_icon_foreground.png new file mode 100644 index 0000000000..58acfc54a8 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/launcher_icon_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index 408327f72d..00baaaf395 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/launcher_icon_foreground.png b/android/app/src/main/res/mipmap-xhdpi/launcher_icon_foreground.png new file mode 100644 index 0000000000..2cd8ec747a Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/launcher_icon_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 8821d0e149..38ab3355f8 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/launcher_icon_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon_foreground.png new file mode 100644 index 0000000000..48a445a2d0 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/launcher_icon_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 03417db507..9ccb009c89 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon_foreground.png new file mode 100644 index 0000000000..03522cd18d Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/launcher_icon_foreground.png differ diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000000..458f64b828 --- /dev/null +++ b/android/app/src/main/res/values/colors.xml @@ -0,0 +1,5 @@ + + + #FFFFFF + #FFFFFF + \ No newline at end of file diff --git a/assets/app_icon/logo_icon.png b/assets/app_icon/logo_icon.png deleted file mode 100644 index 445e2ca862..0000000000 Binary files a/assets/app_icon/logo_icon.png and /dev/null differ diff --git a/assets/app_icon/logo_icon.webp b/assets/app_icon/logo_icon.webp new file mode 100644 index 0000000000..86232aa46b Binary files /dev/null and b/assets/app_icon/logo_icon.webp differ diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 9ffcf9b8f9..9cbad57888 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,4 +1,6 @@ PODS: + - device_info_plus (0.0.1): + - Flutter - DKImagePickerController/Core (4.3.9): - DKImagePickerController/ImageDataManager - DKImagePickerController/Resource @@ -178,6 +180,7 @@ PODS: - FlutterMacOS DEPENDENCIES: + - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`) - file_picker (from `.symlinks/plugins/file_picker/ios`) - firebase_analytics (from `.symlinks/plugins/firebase_analytics/ios`) - firebase_core (from `.symlinks/plugins/firebase_core/ios`) @@ -214,6 +217,8 @@ SPEC REPOS: - SwiftyGif EXTERNAL SOURCES: + device_info_plus: + :path: ".symlinks/plugins/device_info_plus/ios" file_picker: :path: ".symlinks/plugins/file_picker/ios" firebase_analytics: @@ -248,6 +253,7 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/video_player_avfoundation/darwin" SPEC CHECKSUMS: + device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 file_picker: a0560bc09d61de87f12d246fc47d2119e6ef37be diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json index e9c9b88ef7..53611299a8 100644 --- a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,9 +1,117 @@ { "images" : [ + { + "filename" : "Icon-App-20x20@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "Icon-App-20x20@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "20x20" + }, + { + "filename" : "Icon-App-29x29@1x.png", + "idiom" : "iphone", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "Icon-App-29x29@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "Icon-App-29x29@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "29x29" + }, + { + "filename" : "Icon-App-40x40@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "Icon-App-40x40@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "40x40" + }, + { + "filename" : "Icon-App-60x60@2x.png", + "idiom" : "iphone", + "scale" : "2x", + "size" : "60x60" + }, + { + "filename" : "Icon-App-60x60@3x.png", + "idiom" : "iphone", + "scale" : "3x", + "size" : "60x60" + }, + { + "filename" : "Icon-App-20x20@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "20x20" + }, + { + "filename" : "Icon-App-20x20@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "20x20" + }, + { + "filename" : "Icon-App-29x29@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "29x29" + }, + { + "filename" : "Icon-App-29x29@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "29x29" + }, + { + "filename" : "Icon-App-40x40@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "40x40" + }, + { + "filename" : "Icon-App-40x40@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "40x40" + }, + { + "filename" : "Icon-App-76x76@1x.png", + "idiom" : "ipad", + "scale" : "1x", + "size" : "76x76" + }, + { + "filename" : "Icon-App-76x76@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "76x76" + }, + { + "filename" : "Icon-App-83.5x83.5@2x.png", + "idiom" : "ipad", + "scale" : "2x", + "size" : "83.5x83.5" + }, { "filename" : "Icon-App-1024x1024@1x.png", - "idiom" : "universal", - "platform" : "ios", + "idiom" : "ios-marketing", + "scale" : "1x", "size" : "1024x1024" } ], diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 7b1f3db446..e2da2fc8c3 100644 Binary files a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png new file mode 100644 index 0000000000..a8bb66bb1f Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png new file mode 100644 index 0000000000..c5aec86f5d Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png new file mode 100644 index 0000000000..264da18d4f Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png new file mode 100644 index 0000000000..1e0cbaeb82 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png new file mode 100644 index 0000000000..bb4d4879e2 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png new file mode 100644 index 0000000000..a4eb7468f4 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png new file mode 100644 index 0000000000..c5aec86f5d Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png new file mode 100644 index 0000000000..2a0507afd2 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png new file mode 100644 index 0000000000..5404b1d53b Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png new file mode 100644 index 0000000000..5404b1d53b Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png new file mode 100644 index 0000000000..0a3707491c Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png new file mode 100644 index 0000000000..4448ea5901 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png new file mode 100644 index 0000000000..d4295456e1 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png new file mode 100644 index 0000000000..0de3cfb512 Binary files /dev/null and b/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppLogo.imageset/AppLogo.png b/ios/Runner/Assets.xcassets/AppLogo.imageset/AppLogo.png index a6614de14c..2264c3422a 100644 Binary files a/ios/Runner/Assets.xcassets/AppLogo.imageset/AppLogo.png and b/ios/Runner/Assets.xcassets/AppLogo.imageset/AppLogo.png differ diff --git a/ios/Runner/Assets.xcassets/AppLogo.imageset/AppLogo@2x.png b/ios/Runner/Assets.xcassets/AppLogo.imageset/AppLogo@2x.png index 7fec80eb9c..2264c3422a 100644 Binary files a/ios/Runner/Assets.xcassets/AppLogo.imageset/AppLogo@2x.png and b/ios/Runner/Assets.xcassets/AppLogo.imageset/AppLogo@2x.png differ diff --git a/ios/Runner/Assets.xcassets/AppLogo.imageset/Contents.json b/ios/Runner/Assets.xcassets/AppLogo.imageset/Contents.json index 77f1ae1dc6..6b32ebfea8 100644 --- a/ios/Runner/Assets.xcassets/AppLogo.imageset/Contents.json +++ b/ios/Runner/Assets.xcassets/AppLogo.imageset/Contents.json @@ -1,22 +1,22 @@ { - "images" : [ + "images": [ { - "filename" : "AppLogo.png", - "idiom" : "universal", - "scale" : "1x" + "filename": "AppLogo.png", + "idiom": "universal", + "scale": "1x" }, { - "filename" : "AppLogo@2x.png", - "idiom" : "universal", - "scale" : "2x" + "filename": "AppLogo@2x.png", + "idiom": "universal", + "scale": "2x" }, { - "idiom" : "universal", - "scale" : "3x" + "idiom": "universal", + "scale": "3x" } ], - "info" : { - "author" : "xcode", - "version" : 1 + "info": { + "author": "xcode", + "version": 1 } -} +} \ No newline at end of file diff --git a/ios/Runner/Base.lproj/LaunchScreen.storyboard b/ios/Runner/Base.lproj/LaunchScreen.storyboard index 8f6ee0b5fe..3c255af714 100644 --- a/ios/Runner/Base.lproj/LaunchScreen.storyboard +++ b/ios/Runner/Base.lproj/LaunchScreen.storyboard @@ -1,9 +1,9 @@ - + - + diff --git a/lib/bloc/fiat/ramp/ramp_fiat_provider.dart b/lib/bloc/fiat/ramp/ramp_fiat_provider.dart index 00d3fa8cbf..59db0a0b95 100644 --- a/lib/bloc/fiat/ramp/ramp_fiat_provider.dart +++ b/lib/bloc/fiat/ramp/ramp_fiat_provider.dart @@ -12,7 +12,7 @@ import 'package:web_dex/bloc/fiat/ramp/models/host_assets_config.dart'; import 'package:web_dex/bloc/fiat/ramp/models/onramp_purchase_quotation/onramp_purchase_quotation.dart'; import 'package:web_dex/bloc/fiat/ramp/ramp_api_utils.dart'; -const komodoLogoUrl = 'https://app.komodoplatform.com/icons/logo_icon.png'; +const komodoLogoUrl = 'https://app.komodoplatform.com/icons/logo_icon.webp'; class RampFiatProvider extends BaseFiatProvider { RampFiatProvider(); @@ -42,59 +42,48 @@ class RampFiatProvider extends BaseFiatProvider { String source, CryptoCurrency target, { String? sourceAmount, - }) => - apiRequest( - 'POST', - apiEndpoint, - queryParams: { - 'endpoint': '/onramp/quote/all', - }, - body: { - 'fiatCurrency': source, - 'cryptoAssetSymbol': getFullCoinCode(target), - // fiatValue has to be a number, and not a string. Force it to be a - // double here to ensure that it is in the expected format. - 'fiatValue': sourceAmount != null - ? Decimal.tryParse(sourceAmount)?.toDouble() - : null, - }, - ); + }) => apiRequest( + 'POST', + apiEndpoint, + queryParams: {'endpoint': '/onramp/quote/all'}, + body: { + 'fiatCurrency': source, + 'cryptoAssetSymbol': getFullCoinCode(target), + // fiatValue has to be a number, and not a string. Force it to be a + // double here to ensure that it is in the expected format. + 'fiatValue': sourceAmount != null + ? Decimal.tryParse(sourceAmount)?.toDouble() + : null, + }, + ); Future _getPricesWithPaymentMethod( String source, CryptoCurrency target, String sourceAmount, FiatPaymentMethod paymentMethod, - ) => - apiRequest( - 'POST', - apiEndpoint, - queryParams: { - 'endpoint': '/onramp/quote/all', - }, - body: { - 'fiatCurrency': source, - 'cryptoAssetSymbol': getFullCoinCode(target), - 'fiatValue': Decimal.tryParse(sourceAmount)?.toDouble(), - }, - ); + ) => apiRequest( + 'POST', + apiEndpoint, + queryParams: {'endpoint': '/onramp/quote/all'}, + body: { + 'fiatCurrency': source, + 'cryptoAssetSymbol': getFullCoinCode(target), + 'fiatValue': Decimal.tryParse(sourceAmount)?.toDouble(), + }, + ); - Future _getFiats() => apiRequest( - 'GET', - apiEndpoint, - queryParams: { - 'endpoint': '/currencies', - }, - ); + Future _getFiats() => + apiRequest('GET', apiEndpoint, queryParams: {'endpoint': '/currencies'}); Future _getCoins({String? currencyCode}) => apiRequest( - 'GET', - apiEndpoint, - queryParams: { - 'endpoint': '/assets', - if (currencyCode != null) 'currencyCode': currencyCode, - }, - ); + 'GET', + apiEndpoint, + queryParams: { + 'endpoint': '/assets', + if (currencyCode != null) 'currencyCode': currencyCode, + }, + ); @override Future> getFiatList() async { @@ -176,21 +165,28 @@ class RampFiatProvider extends BaseFiatProvider { final List paymentMethodsList = []; - final paymentMethodsFuture = - _getPaymentMethods(source, target, sourceAmount: sourceAmount); + final paymentMethodsFuture = _getPaymentMethods( + source, + target, + sourceAmount: sourceAmount, + ); final coinsFuture = _getCoins(currencyCode: source); final results = await Future.wait([paymentMethodsFuture, coinsFuture]); - final quoteResult = - RampQuoteResult.fromJson(results[0] as Map); - final coins = - HostAssetsConfig.fromJson(results[1] as Map); + final quoteResult = RampQuoteResult.fromJson( + results[0] as Map, + ); + final coins = HostAssetsConfig.fromJson( + results[1] as Map, + ); final asset = quoteResult.asset; final sourceAmountValue = Decimal.parse(sourceAmount); - quoteResult.paymentMethods - .forEach((String key, RampQuoteResultForPaymentMethod value) { + quoteResult.paymentMethods.forEach(( + String key, + RampQuoteResultForPaymentMethod value, + ) { _log.fine('Processing payment method key $key: $value'); final feeAmount = value.baseRampFee / sourceAmountValue; @@ -200,24 +196,24 @@ class RampFiatProvider extends BaseFiatProvider { 'transaction_fees': [ { 'fees': [ - { - 'amount': feeAmount.toDouble(), - }, + {'amount': feeAmount.toDouble()}, ], - } + }, ], 'transaction_limits': [ { 'fiat_code': source, - 'min': (asset.hasValidMinPurchaseAmount() - ? asset.minPurchaseAmount - : coins.minPurchaseAmount) - .toString(), - 'max': (asset.hasValidMaxPurchaseAmount() - ? asset.maxPurchaseAmount - : coins.maxPurchaseAmount) - .toString(), - } + 'min': + (asset.hasValidMinPurchaseAmount() + ? asset.minPurchaseAmount + : coins.minPurchaseAmount) + .toString(), + 'max': + (asset.hasValidMaxPurchaseAmount() + ? asset.maxPurchaseAmount + : coins.maxPurchaseAmount) + .toString(), + }, ], 'price_info': { 'coin_amount': getFormattedCryptoAmount( @@ -245,8 +241,9 @@ class RampFiatProvider extends BaseFiatProvider { if (fee >= Decimal.one) { throw ArgumentError.value(fee, 'fee', 'Fee ratio must be < 1'); } - return (price / (Decimal.one - fee)) - .toDecimal(scaleOnInfinitePrecision: scaleOnInfinitePrecision); + return (price / (Decimal.one - fee)).toDecimal( + scaleOnInfinitePrecision: scaleOnInfinitePrecision, + ); } String getFormattedCryptoAmount(String cryptoAmount, int decimals) { @@ -286,8 +283,10 @@ class RampFiatProvider extends BaseFiatProvider { final priceInfo = { 'fiat_code': source, 'coin_code': target.configSymbol, - 'spot_price_including_fee': - _getFeeAdjustedPrice(paymentMethod, price).toString(), + 'spot_price_including_fee': _getFeeAdjustedPrice( + paymentMethod, + price, + ).toString(), 'coin_amount': getFormattedCryptoAmount( response[paymentMethod.id]['cryptoAmount'] as String, asset['decimals'] as int, @@ -329,9 +328,11 @@ class RampFiatProvider extends BaseFiatProvider { // "swapAsset": fullAssetCode, // This limits the crypto asset list at the redirect page }; - final queryString = payload.entries.map((entry) { - return '${Uri.encodeComponent(entry.key)}=${Uri.encodeComponent(entry.value)}'; - }).join('&'); + final queryString = payload.entries + .map((entry) { + return '${Uri.encodeComponent(entry.key)}=${Uri.encodeComponent(entry.value)}'; + }) + .join('&'); final checkoutUrl = '$orderDomain?$queryString'; return FiatBuyOrderInfo.fromCheckoutUrl(checkoutUrl); diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt index 7e8e52fddf..c66919892f 100644 --- a/linux/CMakeLists.txt +++ b/linux/CMakeLists.txt @@ -112,6 +112,9 @@ set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" COMPONENT Runtime) +install(FILES "KomodoWallet.png" DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) diff --git a/linux/KomodoWallet.desktop b/linux/KomodoWallet.desktop index 7bf01979b6..36b001ceed 100644 --- a/linux/KomodoWallet.desktop +++ b/linux/KomodoWallet.desktop @@ -3,7 +3,7 @@ Version=1.0 Type=Application Name=Komodo Wallet Exec=./KomodoWallet -Icon=./KomodoWallet.svg +Icon=./KomodoWallet.png Categories=Office;Finance; Terminal=false -StartupNotify=true \ No newline at end of file +StartupNotify=true diff --git a/linux/KomodoWallet.png b/linux/KomodoWallet.png new file mode 100644 index 0000000000..23b7d83a5d Binary files /dev/null and b/linux/KomodoWallet.png differ diff --git a/linux/KomodoWallet.svg b/linux/KomodoWallet.svg deleted file mode 100644 index 947ab6afe3..0000000000 --- a/linux/KomodoWallet.svg +++ /dev/null @@ -1 +0,0 @@ -komodo-sign_gradient \ No newline at end of file diff --git a/linux/my_application.cc b/linux/my_application.cc index 618ce3ad3d..be94af558c 100644 --- a/linux/my_application.cc +++ b/linux/my_application.cc @@ -41,7 +41,7 @@ static void my_application_activate(GApplication* application) { // Set window icon GError* error = NULL; - gtk_window_set_icon_from_file(window, "KomodoWallet.svg", &error); + gtk_window_set_icon_from_file(window, "KomodoWallet.png", &error); if (error) { g_warning("Failed to set window icon: %s", error->message); g_error_free(error); diff --git a/macos/Podfile.lock b/macos/Podfile.lock index 37e54b7986..0e481369a3 100644 --- a/macos/Podfile.lock +++ b/macos/Podfile.lock @@ -209,34 +209,34 @@ EXTERNAL SOURCES: :path: Flutter/ephemeral/.symlinks/plugins/window_size/macos SPEC CHECKSUMS: - device_info_plus: 1b14eed9bf95428983aed283a8d51cce3d8c4215 - file_picker: e716a70a9fe5fd9e09ebc922d7541464289443af + device_info_plus: 4fb280989f669696856f8b129e4a5e3cd6c48f76 + file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a Firebase: d99ac19b909cd2c548339c2241ecd0d1599ab02e - firebase_analytics: c6a3f80cf2e8681b4e6b3402162acf116c4d3a57 - firebase_core: 2af692f4818474ed52eda1ba6aeb448a6a3352af + firebase_analytics: 3091f96bd17636f6da5092a4701ffacf67c6e455 + firebase_core: 7667f880631ae8ad10e3d6567ab7582fe0682326 FirebaseAnalytics: 6433dfd311ba78084fc93bdfc145e8cb75740eae FirebaseCore: efb3893e5b94f32b86e331e3bd6dadf18b66568e FirebaseCoreInternal: 9afa45b1159304c963da48addb78275ef701c6b4 FirebaseInstallations: 317270fec08a5d418fdbc8429282238cab3ac843 - flutter_inappwebview_macos: bdf207b8f4ebd58e86ae06cd96b147de99a67c9b - flutter_secure_storage_darwin: 12d2375c690785d97a4e586f15f11be5ae35d5b0 - flutter_window_close: a0f4f388e956ebafa866e3e171ce837c166eab9c + flutter_inappwebview_macos: c2d68649f9f8f1831bfcd98d73fd6256366d9d1d + flutter_secure_storage_darwin: ce237a8775b39723566dc72571190a3769d70468 + flutter_window_close: bd408414cbbf0d39f0d3076c4da0cdbf1c527168 FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1 GoogleAppMeasurement: 700dce7541804bec33db590a5c496b663fbe2539 GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1 - komodo_defi_framework: 73bb4b6190e827bfda4609700d59e64e0aa60fb7 - local_auth_darwin: fa4b06454df7df8e97c18d7ee55151c57e7af0de - mobile_scanner: 77265f3dc8d580810e91849d4a0811a90467ed5e + komodo_defi_framework: 2e2b89505f158840822ed30ffc7589ff8035e248 + local_auth_darwin: d2e8c53ef0c4f43c646462e3415432c4dab3ae19 + mobile_scanner: 9157936403f5a0644ca3779a38ff8404c5434a93 nanopb: fad817b59e0457d11a5dfbde799381cd727c1275 OrderedSet: e539b66b644ff081c73a262d24ad552a69be3a94 - package_info_plus: 12f1c5c2cfe8727ca46cbd0b26677728972d9a5b - path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 + package_info_plus: f0052d280d17aa382b932f399edf32507174e870 + path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 - share_plus: 1fa619de8392a4398bfaf176d441853922614e89 - shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78 - url_launcher_macos: c82c93949963e55b228a30115bd219499a6fe404 - video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 - window_size: 339dafa0b27a95a62a843042038fa6c3c48de195 + share_plus: 510bf0af1a42cd602274b4629920c9649c52f4cc + shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7 + url_launcher_macos: 0fba8ddabfc33ce0a9afe7c5fef5aab3d8d2d673 + video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b + window_size: 4bd15034e6e3d0720fd77928a7c42e5492cfece9 PODFILE CHECKSUM: a890bc27443c296eb8ca4510f54c35d2e0f66ed0 diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 7fec80eb9c..af9777819d 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index 193092d58b..ac3c91ada6 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index 34cc1220ad..c20605bcda 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index d6c9de43a1..e261c21277 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index dade7c16d5..2d111e212f 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index a6614de14c..d42984244f 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index 7622d56e96..928b301e85 100644 Binary files a/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/sdk b/sdk index 9881ff2e0d..c5e3ad41dd 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit 9881ff2e0da95295cd6629e1b709af779fcac856 +Subproject commit c5e3ad41dde0659e1c02e69c0b628a21ab0d6bfe diff --git a/web/icons/logo_icon.png b/web/icons/logo_icon.png deleted file mode 100644 index 445e2ca862..0000000000 Binary files a/web/icons/logo_icon.png and /dev/null differ diff --git a/web/icons/logo_icon.webp b/web/icons/logo_icon.webp new file mode 100644 index 0000000000..86232aa46b Binary files /dev/null and b/web/icons/logo_icon.webp differ diff --git a/web/index.html b/web/index.html index 85e85c64c0..b01251c185 100644 --- a/web/index.html +++ b/web/index.html @@ -39,7 +39,7 @@ crossorigin> - + @@ -136,7 +136,7 @@ transform: scale(.01) } } - Komodo Wallet is starting... Please wait.