From 8e62f2f81176282b8f8b1eba1461ca6b3e52d52e Mon Sep 17 00:00:00 2001
From: OleksandrSobol <dr.alexander.sobol@gmail.com>
Date: Thu, 3 Jun 2021 18:38:41 +0300
Subject: [PATCH] CAKE-341 | fixed scrollbar for currency_picker.dart; applied
receive currency list to exchange_template_page.dart
---
lib/src/screens/exchange/exchange_template_page.dart | 2 +-
lib/src/screens/exchange/widgets/currency_picker.dart | 2 ++
pubspec.lock | 6 +++---
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/lib/src/screens/exchange/exchange_template_page.dart b/lib/src/screens/exchange/exchange_template_page.dart
index 5437703ce..568e53cd5 100644
--- a/lib/src/screens/exchange/exchange_template_page.dart
+++ b/lib/src/screens/exchange/exchange_template_page.dart
@@ -176,7 +176,7 @@ class ExchangeTemplatePage extends BasePage {
initialIsAddressEditable:
exchangeViewModel.isReceiveAddressEnabled,
isAmountEstimated: true,
- currencies: CryptoCurrency.all,
+ currencies: exchangeViewModel.receiveCurrencies,
onCurrencySelected: (currency) =>
exchangeViewModel.changeReceiveCurrency(
currency: currency),
diff --git a/lib/src/screens/exchange/widgets/currency_picker.dart b/lib/src/screens/exchange/widgets/currency_picker.dart
index 5e22a17e8..59d53518e 100644
--- a/lib/src/screens/exchange/widgets/currency_picker.dart
+++ b/lib/src/screens/exchange/widgets/currency_picker.dart
@@ -45,6 +45,7 @@ class CurrencyPickerState extends State<CurrencyPicker> {
color: Palette.darkBlueCraiola,
);
final int crossAxisCount = 3;
+ final int maxNumberItemsInAlert = 12;
final int itemsCount;
final double backgroundHeight = 280;
final double thumbHeight = 72;
@@ -148,6 +149,7 @@ class CurrencyPickerState extends State<CurrencyPicker> {
);
})
),
+ if (itemsCount > maxNumberItemsInAlert)
CakeScrollbar(
backgroundHeight: backgroundHeight,
thumbHeight: thumbHeight,
diff --git a/pubspec.lock b/pubspec.lock
index 3ff596074..207f4b18a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -70,7 +70,7 @@ packages:
path: "."
ref: cake
resolved-ref: "02fef082f20af13de00b4e64efb93a2c1e5e1cf2"
- url: "git@github.com:cake-tech/bech32.git"
+ url: "https://github.com/cake-tech/bech32.git"
source: git
version: "0.2.0"
bip32:
@@ -92,8 +92,8 @@ packages:
description:
path: "."
ref: cake
- resolved-ref: b3ab2926c665f0e68b74a4a5f31059f7fcd817b7
- url: "git@github.com:cake-tech/bitcoin_flutter.git"
+ resolved-ref: cbabfd87b6ce3cae6051a3e86ddb56e7a934e188
+ url: "https://github.com/cake-tech/bitcoin_flutter.git"
source: git
version: "2.0.2"
boolean_selector: