diff --git a/assets/images/2.0x/morph_icon.png b/assets/images/2.0x/morph_icon.png index a897a73b1..0cc2c3bac 100644 Binary files a/assets/images/2.0x/morph_icon.png and b/assets/images/2.0x/morph_icon.png differ diff --git a/assets/images/3.0x/morph_icon.png b/assets/images/3.0x/morph_icon.png index db98d49da..bdf991cf2 100644 Binary files a/assets/images/3.0x/morph_icon.png and b/assets/images/3.0x/morph_icon.png differ diff --git a/assets/images/morph_icon.png b/assets/images/morph_icon.png index e4b019b86..380e6e71d 100644 Binary files a/assets/images/morph_icon.png and b/assets/images/morph_icon.png differ diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart index 6694205b5..92dae7995 100644 --- a/lib/generated/i18n.dart +++ b/lib/generated/i18n.dart @@ -237,6 +237,7 @@ class S implements WidgetsLocalizations { String get trade_details_state => "State"; String get trade_details_title => "Trade Details"; String get trade_history_title => "Trade history"; + String get trade_id => "Trade ID:"; String get trade_not_created => "Trade not created."; String get trade_not_found => "Trade not found."; String get trade_state_btc_sent => "Btc sent"; @@ -313,7 +314,6 @@ class S implements WidgetsLocalizations { String time(String minutes, String seconds) => "${minutes}m ${seconds}s"; String trade_details_copied(String title) => "${title} copied to Clipboard"; String trade_for_not_created(String title) => "Trade for ${title} is not created."; - String trade_id(String id) => "Trade ID:\n${id}"; String trade_id_not_found(String tradeId, String title) => "Trade ${tradeId} of ${title} not found."; String trade_is_powered_by(String provider) => "This trade is powered by ${provider}"; String transaction_details_copied(String title) => "${title} copied to Clipboard"; @@ -357,6 +357,8 @@ class $de extends S { @override String get you_will_get => "Sie erhalten"; @override + String get trade_id => "Handel-ID:"; + @override String get restore_description_from_seed => "Stellen Sie Ihr Wallet aus den 25 Wörtern wieder her oder 13-Wort-Kombinationscode"; @override String get trade_state_underpaid => "Unterbezahlt"; @@ -879,8 +881,6 @@ class $de extends S { @override String change_current_node(String node) => "Möchten Sie den aktuellen Knoten wirklich auf ändern? ${node}?"; @override - String trade_id(String id) => "Handel-ID:\n${id}"; - @override String wallet_list_loading_wallet(String wallet_name) => "Wird geladen ${wallet_name} Wallet"; @override String version(String currentVersion) => "Ausführung ${currentVersion}"; @@ -967,6 +967,8 @@ class $hi extends S { @override String get you_will_get => "आपको मिल जायेगा"; @override + String get trade_id => "व्यापार ID:"; + @override String get restore_description_from_seed => "या तो 25 शब्द से अपने वॉलेट को पुनर्स्थापित करें या 13 शब्द संयोजन कोड"; @override String get trade_state_underpaid => "के तहत भुगतान किया"; @@ -1489,8 +1491,6 @@ class $hi extends S { @override String change_current_node(String node) => "क्या आप वर्तमान नोड को बदलना सुनिश्चित करते हैं ${node}?"; @override - String trade_id(String id) => "व्यापार ID:\n${id}"; - @override String wallet_list_loading_wallet(String wallet_name) => "लोड हो रहा है ${wallet_name} बटुआ"; @override String version(String currentVersion) => "संस्करण ${currentVersion}"; @@ -1577,6 +1577,8 @@ class $ru extends S { @override String get you_will_get => "Вы получите"; @override + String get trade_id => "ID сделки:"; + @override String get restore_description_from_seed => "Вы можете восстановить кошелёк используя 25-ти значную мнемоническую фразу"; @override String get trade_state_underpaid => "Недоплаченная"; @@ -2099,8 +2101,6 @@ class $ru extends S { @override String change_current_node(String node) => "Вы уверены, что хотите изменить текущую ноду на ${node}?"; @override - String trade_id(String id) => "ID сделки:\n${id}"; - @override String wallet_list_loading_wallet(String wallet_name) => "Загрузка ${wallet_name} кошелька"; @override String version(String currentVersion) => "Версия ${currentVersion}"; @@ -2187,6 +2187,8 @@ class $ko extends S { @override String get you_will_get => "당신은 얻을 것이다"; @override + String get trade_id => "무역 ID:"; + @override String get restore_description_from_seed => "25 단어 또는 13 단어 조합 코드에서 지갑을 복원하십시오."; @override String get trade_state_underpaid => "미지급"; @@ -2709,8 +2711,6 @@ class $ko extends S { @override String change_current_node(String node) => "현재 노드를 다음으로 변경 하시겠습니까 ${node}?"; @override - String trade_id(String id) => "무역 ID:\n${id}"; - @override String wallet_list_loading_wallet(String wallet_name) => "로딩 ${wallet_name} 지갑"; @override String version(String currentVersion) => "버전 ${currentVersion}"; @@ -2797,6 +2797,8 @@ class $pt extends S { @override String get you_will_get => "Você receberá"; @override + String get trade_id => "ID da troca:"; + @override String get restore_description_from_seed => "Restaure sua carteira a partir de semente com 25 palavras ou 13 palavras"; @override String get trade_state_underpaid => "Parcialmente paga"; @@ -3319,8 +3321,6 @@ class $pt extends S { @override String change_current_node(String node) => "Você realmente deseja alterar o nó atual para ${node}?"; @override - String trade_id(String id) => "ID da troca:\n${id}"; - @override String wallet_list_loading_wallet(String wallet_name) => "Abrindo a carteira ${wallet_name}"; @override String version(String currentVersion) => "Versão ${currentVersion}"; @@ -3407,6 +3407,8 @@ class $uk extends S { @override String get you_will_get => "Ви отримаєте"; @override + String get trade_id => "ID операції:"; + @override String get restore_description_from_seed => "Ви можете відновити гаманець використовуючи 25-ти слівну мнемонічну фразу"; @override String get trade_state_underpaid => "Недоплачена"; @@ -3929,8 +3931,6 @@ class $uk extends S { @override String change_current_node(String node) => "Ви впевнені, що хочете змінити поточний вузол на ${node}?"; @override - String trade_id(String id) => "ID операції:\n${id}"; - @override String wallet_list_loading_wallet(String wallet_name) => "Завантаження ${wallet_name} гаманця"; @override String version(String currentVersion) => "Версія ${currentVersion}"; @@ -4017,6 +4017,8 @@ class $ja extends S { @override String get you_will_get => "あなたが取得します"; @override + String get trade_id => "取引ID:"; + @override String get restore_description_from_seed => "25ワードからウォレットを復元しますまたは13ワードの組み合わせコード"; @override String get trade_state_underpaid => "支払不足"; @@ -4539,8 +4541,6 @@ class $ja extends S { @override String change_current_node(String node) => "現在のノードを変更してよろしいですか ${node}?"; @override - String trade_id(String id) => "取引ID:\n${id}"; - @override String wallet_list_loading_wallet(String wallet_name) => "読み込み中 ${wallet_name} 財布"; @override String version(String currentVersion) => "バージョン ${currentVersion}"; @@ -4631,6 +4631,8 @@ class $pl extends S { @override String get you_will_get => "Dostaniesz"; @override + String get trade_id => "Identyfikator handlu:"; + @override String get restore_description_from_seed => "Przywróć swój portfel z 25 słów lub 13-słowny kod kombinacji"; @override String get trade_state_underpaid => "Niedopłacone"; @@ -5153,8 +5155,6 @@ class $pl extends S { @override String change_current_node(String node) => "Czy na pewno chcesz przywrócić ustawienia domyślne? ${node}?"; @override - String trade_id(String id) => "Identyfikator handlu:\n${id}"; - @override String wallet_list_loading_wallet(String wallet_name) => "Ładuję ${wallet_name} portfel"; @override String version(String currentVersion) => "Wersja ${currentVersion}"; @@ -5241,6 +5241,8 @@ class $es extends S { @override String get you_will_get => "Conseguirás"; @override + String get trade_id => "Comercial ID:"; + @override String get restore_description_from_seed => "Restaure su billetera desde el código de combinación de 25 palabras i de 13 palabras"; @override String get trade_state_underpaid => "Poco pagado"; @@ -5763,8 +5765,6 @@ class $es extends S { @override String change_current_node(String node) => "¿Está seguro de cambiar el nodo actual a ${node}?"; @override - String trade_id(String id) => "Comercial ID:\n${id}"; - @override String wallet_list_loading_wallet(String wallet_name) => "Billetera ${wallet_name} de carga"; @override String version(String currentVersion) => "Versión ${currentVersion}"; @@ -5851,6 +5851,8 @@ class $nl extends S { @override String get you_will_get => "Je zult krijgen"; @override + String get trade_id => "Trade ID:"; + @override String get restore_description_from_seed => "Herstel uw portemonnee van het 25 woord of 13 woord combinatiecode"; @override String get trade_state_underpaid => "Slecht betaald"; @@ -6373,8 +6375,6 @@ class $nl extends S { @override String change_current_node(String node) => "Weet u zeker dat u het huidige knooppunt wilt wijzigen in ${node}?"; @override - String trade_id(String id) => "Trade ID:\n${id}"; - @override String wallet_list_loading_wallet(String wallet_name) => "Bezig met laden ${wallet_name} portemonnee"; @override String version(String currentVersion) => "Versie ${currentVersion}"; @@ -6461,6 +6461,8 @@ class $zh extends S { @override String get you_will_get => "你会得到"; @override + String get trade_id => "贸易编号:"; + @override String get restore_description_from_seed => "从25个字中恢复您的钱包或13个字的组合码"; @override String get trade_state_underpaid => "支付不足"; @@ -6983,8 +6985,6 @@ class $zh extends S { @override String change_current_node(String node) => "您确定将当前节点更改为 ${node}?"; @override - String trade_id(String id) => "贸易编号:\n${id}"; - @override String wallet_list_loading_wallet(String wallet_name) => "载入中 ${wallet_name} 钱包"; @override String version(String currentVersion) => "版 ${currentVersion}"; diff --git a/lib/main.dart b/lib/main.dart index 8956f14b5..3a311a545 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -22,6 +22,7 @@ import 'package:cake_wallet/src/stores/balance/balance_store.dart'; import 'package:cake_wallet/src/stores/sync/sync_store.dart'; import 'package:cake_wallet/src/stores/wallet/wallet_store.dart'; import 'package:cake_wallet/src/stores/send_template/send_template_store.dart'; +import 'package:cake_wallet/src/stores/exchange_template/exchange_template_store.dart'; import 'package:cake_wallet/src/screens/root/root.dart'; import 'package:cake_wallet/src/stores/authentication/authentication_store.dart'; import 'package:cake_wallet/src/stores/settings/settings_store.dart'; @@ -34,6 +35,7 @@ import 'package:cake_wallet/src/domain/common/fiat_currency.dart'; import 'package:cake_wallet/src/domain/common/transaction_priority.dart'; import 'package:cake_wallet/src/domain/common/wallet_type.dart'; import 'package:cake_wallet/src/domain/common/template.dart'; +import 'package:cake_wallet/src/domain/exchange/exchange_template.dart'; import 'package:cake_wallet/src/domain/services/wallet_service.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/src/domain/common/language.dart'; @@ -51,6 +53,7 @@ void main() async { Hive.registerAdapter(WalletInfoAdapter(), 4); Hive.registerAdapter(WalletTypeAdapter(), 5); Hive.registerAdapter(TemplateAdapter(), 6); + Hive.registerAdapter(ExchangeTemplateAdapter(), 7); final secureStorage = FlutterSecureStorage(); final transactionDescriptionsBoxKey = await getEncryptionKey( @@ -69,6 +72,7 @@ void main() async { await Hive.openBox(Trade.boxName, encryptionKey: tradesBoxKey); final walletInfoSource = await Hive.openBox(WalletInfo.boxName); final templates = await Hive.openBox