From d024972345e6fa06a8cbaeb8cc654cbc6debf7e2 Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Mon, 22 Feb 2021 20:10:23 +0200 Subject: [PATCH 1/6] CAKE-282 | made QR code border a little bold in the exchange_trade_page.dart and qr_widget.dart --- lib/src/screens/exchange_trade/exchange_trade_page.dart | 1 + lib/src/screens/receive/widgets/qr_widget.dart | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/src/screens/exchange_trade/exchange_trade_page.dart b/lib/src/screens/exchange_trade/exchange_trade_page.dart index 5dd558d23..9dad2d4d9 100644 --- a/lib/src/screens/exchange_trade/exchange_trade_page.dart +++ b/lib/src/screens/exchange_trade/exchange_trade_page.dart @@ -148,6 +148,7 @@ class ExchangeTradeState extends State { padding: EdgeInsets.all(5), decoration: BoxDecoration( border: Border.all( + width: 3, color: Theme.of(context) .accentTextTheme .subtitle diff --git a/lib/src/screens/receive/widgets/qr_widget.dart b/lib/src/screens/receive/widgets/qr_widget.dart index b479378ed..4de923bad 100644 --- a/lib/src/screens/receive/widgets/qr_widget.dart +++ b/lib/src/screens/receive/widgets/qr_widget.dart @@ -48,6 +48,7 @@ class QRWidget extends StatelessWidget { padding: EdgeInsets.all(5), decoration: BoxDecoration( border: Border.all( + width: 3, color: Theme.of(context).accentTextTheme. display3.backgroundColor ) From 3135823afa1febc308898df06f30c15adc691d40 Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Mon, 22 Feb 2021 20:46:05 +0200 Subject: [PATCH 2/6] CAKE-283 | changed FAQ on the app (now it shown in browser) --- lib/view_model/settings/settings_view_model.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/view_model/settings/settings_view_model.dart b/lib/view_model/settings/settings_view_model.dart index 0211b2276..e1938b005 100644 --- a/lib/view_model/settings/settings_view_model.dart +++ b/lib/view_model/settings/settings_view_model.dart @@ -26,6 +26,7 @@ import 'package:cake_wallet/view_model/settings/regular_list_item.dart'; import 'package:cake_wallet/view_model/settings/settings_list_item.dart'; import 'package:cake_wallet/view_model/settings/switcher_list_item.dart'; import 'package:cake_wallet/src/screens/auth/auth_page.dart'; +import 'package:url_launcher/url_launcher.dart'; part 'settings_view_model.g.dart'; @@ -173,8 +174,10 @@ abstract class SettingsViewModelBase with Store { ), RegularListItem( title: S.current.faq, - handler: (BuildContext context) => - Navigator.pushNamed(context, Routes.faq), + handler: (BuildContext context) async { + final url = 'https://cakewallet.com/guide/'; + if (await canLaunch(url)) await launch(url); + }, ) ], [VersionListItem(title: currentVersion)] From 270b5f4c782dd2a46f610b760ac8e5354f321681 Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Tue, 23 Feb 2021 20:38:36 +0200 Subject: [PATCH 3/6] CAKE-281 | added addr1 address format validation for cardano --- lib/core/address_validator.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/core/address_validator.dart b/lib/core/address_validator.dart index 0591029f3..ee8fe4b9a 100644 --- a/lib/core/address_validator.dart +++ b/lib/core/address_validator.dart @@ -15,7 +15,8 @@ class AddressValidator extends TextValidator { case CryptoCurrency.xmr: return '[0-9a-zA-Z]'; case CryptoCurrency.ada: - return '[0-9a-zA-Z]'; + return '^[0-9a-zA-Z]{59}\$|^[0-9a-zA-Z]{92}\$|^[0-9a-zA-Z]{104}\$' + '|^[0-9a-zA-Z]{105}\$|^addr1[0-9a-zA-Z]{98}\$'; case CryptoCurrency.bch: return '[0-9a-zA-Z]'; case CryptoCurrency.bnb: @@ -54,7 +55,7 @@ class AddressValidator extends TextValidator { case CryptoCurrency.xmr: return [95, 106]; case CryptoCurrency.ada: - return [59, 92, 104, 105]; + return null; case CryptoCurrency.bch: return [42]; case CryptoCurrency.bnb: From 574fdfa874c775ad030cc0d84590499a6639777d Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Wed, 24 Feb 2021 10:26:02 +0200 Subject: [PATCH 4/6] CAKE-283 | moved url to static const --- lib/view_model/settings/settings_view_model.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/view_model/settings/settings_view_model.dart b/lib/view_model/settings/settings_view_model.dart index e1938b005..2a5e9c174 100644 --- a/lib/view_model/settings/settings_view_model.dart +++ b/lib/view_model/settings/settings_view_model.dart @@ -175,7 +175,6 @@ abstract class SettingsViewModelBase with Store { RegularListItem( title: S.current.faq, handler: (BuildContext context) async { - final url = 'https://cakewallet.com/guide/'; if (await canLaunch(url)) await launch(url); }, ) @@ -184,6 +183,8 @@ abstract class SettingsViewModelBase with Store { ]; } + static const url = 'https://cakewallet.com/guide/'; + @observable String currentVersion; From 2e9e231a7487f98d90d95901ba6f53575c1cb3dc Mon Sep 17 00:00:00 2001 From: Nadiia <55130281+hope-with-me@users.noreply.github.com> Date: Wed, 24 Feb 2021 17:32:35 +0200 Subject: [PATCH 5/6] Update PRIVACY.md --- PRIVACY.md | 163 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 101 insertions(+), 62 deletions(-) diff --git a/PRIVACY.md b/PRIVACY.md index 485f01864..5f20032b6 100644 --- a/PRIVACY.md +++ b/PRIVACY.md @@ -1,74 +1,113 @@ Privacy Policy -Last modified: January 28, 2021 -Introduction -Cake Technologies Inc. ("Company" or "We") respect your privacy and are committed to protecting it through our compliance with this policy. -This policy describes the types of information we may collect from you or that you may provide when you use the App (our "App") and our practices for collecting, using, maintaining, protecting, and disclosing that information. -This policy applies to information we collect: -On this App. -In email, text, and other electronic messages between you and this App. -It does not apply to information collected by: -Us offline or through any other means, including on any other App operated by Company or any third party (including our affiliates and subsidiaries)]; or -Any third party (including our affiliates and subsidiaries), including through any application or content (including advertising) that may link to or be accessible from or on the App. -Please read this policy carefully to understand our policies and practices regarding your information and how we will treat it. If you do not agree with our policies and practices, you have the choice to not use the App. By accessing or using this App, you agree to this privacy policy. This policy may change from time to time. Your continued use of this App after we make changes is deemed to be acceptance of those changes, so please check the policy periodically for updates. -Definitions -"App" means the software program provided by the Company, downloaded by You on any electronic device, named Cake Wallet. -"Device" means any device that can access the App, such as a cell phone or tablet device. -"Node" means a full Monero or Bitcoin Node, which transmits data to your App for processing and synchronization, and to which your Device transmits transactions which you would like to submit to the Monero or Bitcoin networks. -"Cake Wallet Nodes" refers to the set of cryptocurrency nodes operated and maintained by Cake Technologies. -"Service" refers to the App. -"Third-party Service" refers to any service integrated into the Cake Wallet Application. This includes ChangeNow and XMR.to. -"Usage Data" refers to data collected automatically about your usage of an Application. -"You" means the individual, group, corporation, or any other entity accessing or using the Service. +Last modified: February 23, 2021 + +Introduction +============ + + Cake Technologies Inc. ("Company" or "We") respect your privacy and are committed to protecting it through our compliance with this policy. + + This policy describes the types of information we may collect from you or that you may provide when you use the App (our "App") and our practices for collecting, using, maintaining, protecting, and disclosing that information. + + This policy applies to information we collect: + - On this App. + - In email, text, and other electronic messages between you and this App. + It does not apply to information collected by: + - Us offline or through any other means, including on any other App operated by Company or any third party (including our affiliates and subsidiaries)]; or + - Any third party (including our affiliates and subsidiaries), including through any application or content (including advertising) that may link to or be accessible from or on the App. + Please read this policy carefully to understand our policies and practices regarding your information and how we will treat it. If you do not agree with our policies and practices, you have the choice to not use the App. By accessing or using this App, you agree to this privacy policy. This policy may change from time to time. Your continued use of this App after we make changes is deemed to be acceptance of those changes, so please check the policy periodically for updates. + +Definitions +----------- + + - "App" means the software program provided by the Company, downloaded by You on any electronic device, named Cake Wallet. + - "Device" means any device that can access the App, such as a cell phone or tablet device. + - "Node" means a full Monero or Bitcoin Node, which transmits data to your App for processing and synchronization, and to which your Device transmits transactions which you would like to submit to the Monero or Bitcoin networks. + - "Cake Wallet Nodes" refers to the set of cryptocurrency nodes operated and maintained by Cake Technologies. + - "Service" refers to the App. + - "Third-party Service" refers to any service integrated into the Cake Wallet Application. This includes ChangeNow. + - "Usage Data" refers to data collected automatically about your usage of an Application. + - "You" means the individual, group, corporation, or any other entity accessing or using the Service. Information We Collect About You and How We Collect It -We collect several types of information from and about users of our App, including information: -By which you may be personally identified, such as name, e-mail address, or and a/any other identifier by which you may be contacted online or offline ("personal information" or "Personal Data”), ONLY when you provide it to us; -Device IP address, the block height to which your wallet is synchronized, and any transactions which you use our Node to submit to the Monero or Bitcoin networks. -We collect this information: -Directly from you when you provide it to us. -Automatically as you use the App, if you use one of the Cake Wallet Nodes. Information collected automatically may include IP address and block height. -Usage Data (including the date and time at which you use an application, the duration of using it, and other ‘metadata’) is NOT collected by Cake Technologies through the usage of the App. Cake Technologies has no reason to care about any aspect of your continued usage of our App. We believe that this data is your own property and that we have no right to collect it. -Personal information is received by Cake Technologies ONLY in the event that you choose to provide it to us. This is provided either by synchronizing your wallet using the Nodes maintained by Cake Technologies, or by voluntarily contacting Cake Technologies regarding support, questions or suggestions. You also have the right to choose not to provide data to Cake Technologies, by choosing a different Node. The option to do so is provided by default with a list of Nodes, but Cake Wallet also provides the ability to add another Node not listed, or use your own Node. -Data relating to your funds, and their security and privacy, remains on your device at ALL times. Your private keys, seeds, backup files, and wallet passcode are your own responsibility. This data is not received, collected, or stored by Cake Technologies at any time, for any reason. -Personal Data collected through the Cake Wallet Nodes is limited to your device's IP address, the block height to which your wallet is synchronized, and any transactions which you use our Node to submit to the Monero or Bitcoin networks. -Personal Data received by Cake Technologies in this manner is not stored for any length of time, and thus Cake Technologies is both unwilling to and incapable of sharing this data, or using it for any purpose beyond ensuring your appropriate connection to our Nodes. -If you decide to use a Node offered by any third party, some of which we offer by default in the Cake Wallet Application, said third party will receive this Personal Data instead of Cake Technologies. We take no responsibility for the actions of any third-party Node offered within the Application. +------------------------------------------------------ + + We collect several types of information from and about users of our App, including information: + - By which you may be personally identified, such as name, e-mail address, or and a/any other identifier by which you may be contacted online or offline ("personal information" or "Personal Data”), ONLY when you provide it to us; + - Device IP address, the block height to which your wallet is synchronized, and any transactions which you use our Node to submit to the Monero or Bitcoin networks. + We collect this information: + - Directly from you when you provide it to us. + - Automatically as you use the App, if you use one of the Cake Wallet Nodes. Information collected automatically may include IP address and block height. + + Usage Data (including the date and time at which you use an application, the duration of using it, and other ‘metadata’) is NOT collected by Cake Technologies through the usage of the App. Cake Technologies has no reason to care about any aspect of your continued usage of our App. We believe that this data is your own property and that we have no right to collect it. + + Personal information is received by Cake Technologies ONLY in the event that you choose to provide it to us. This is provided either by synchronizing your wallet using the Nodes maintained by Cake Technologies, or by voluntarily contacting Cake Technologies regarding support, questions or suggestions. You also have the right to choose not to provide data to Cake Technologies, by choosing a different Node. The option to do so is provided by default with a list of Nodes, but Cake Wallet also provides the ability to add another Node not listed, or use your own Node. + + Data relating to your funds, and their security and privacy, remains on your device at ALL times. Your private keys, seeds, backup files, and wallet passcode are your own responsibility. This data is not received, collected, or stored by Cake Technologies at any time, for any reason. + + Personal Data collected through the Cake Wallet Nodes is limited to your device's IP address, the block height to which your wallet is synchronized, and any transactions which you use our Node to submit to the Monero or Bitcoin networks. Personal Data received by Cake Technologies in this manner is not stored for any length of time, and thus Cake Technologies is both unwilling to and incapable of sharing this data, or using it for any purpose beyond ensuring your appropriate connection to our Nodes. + + If you decide to use a Node offered by any third party, some of which we offer by default in the Cake Wallet Application, said third party will receive this Personal Data instead of Cake Technologies. We take no responsibility for the actions of any third-party Node offered within the Application. If you decide to synchronize your Wallet using your own Node, neither Cake Technologies nor any third party will have access to this Personal Data. + + In any of these situations, Cake Technologies takes no responsibility for interception of this data by any outside individual, group, corporation, or institution. You should understand this and take any and all appropriate actions to secure your own data. -If you decide to synchronize your Wallet using your own Node, neither Cake Technologies nor any third party will have access to this Personal Data. -In any of these situations, Cake Technologies takes no responsibility for interception of this data by any outside individual, group, corporation, or institution. You should understand this and take any and all appropriate actions to secure your own data. How We Use Your Information -We use information that we collect about you or that you provide to us, including any personal information: -To present our App and its contents to you. -To allow you to sync using the closest geographical Node: In the event that you choose to synchronize your wallet using the Node maintained by Cake Technologies, we determine your location using your IP address to redirect your Wallet to the fastest possible Node. -To contact you: In the event that you contact Cake Technologies first, we will use the Personal Data with which you provide us, to contact you by email, Telegram, Reddit, or any other means. -To manage your requests: To attend and manage your requests to us. -For any other purpose with your consent. +--------------------------- + + We use information that we collect about you or that you provide to us, including any personal information: + - To present our App and its contents to you. + - To allow you to sync using the closest geographical Node: In the event that you choose to synchronize your wallet using the Node maintained by Cake Technologies, we determine your location using your IP address to redirect your Wallet to the fastest possible Node. + - To contact you: In the event that you contact Cake Technologies first, we will use the Personal Data with which you provide us, to contact you by email, Telegram, Reddit, or any other means. + - To manage your requests: To attend and manage your requests to us. + - For any other purpose with your consent. + Transfer of Your Personal Data -Personal Data received by the Cake Wallet Nodes, or voluntarily submitted to Cake Technologies through e-mail, Telegram, Reddit, or any other method, may be transferred to computers located outside of your governmental jurisdiction, where the data protection laws may differ from yours. -Your consent to this Privacy Policy, and your submission of such information, represents your agreement to this transfer. -Cake Technologies will take all necessary steps to ensure that your data is treated securely and in accordance with this Privacy Policy. No transfer of your Personal Data will take place to an organization or a country, unless there are adequate controls in place to protect the security of your data. +------------------------------ + + Personal Data received by the Cake Wallet Nodes, or voluntarily submitted to Cake Technologies through e-mail, Telegram, Reddit, or any other method, may be transferred to computers located outside of your governmental jurisdiction, where the data protection laws may differ from yours. Your consent to this Privacy Policy, and your submission of such information, represents your agreement to this transfer. + + Cake Technologies will take all necessary steps to ensure that your data is treated securely and in accordance with this Privacy Policy. No transfer of your Personal Data will take place to an organization or a country, unless there are adequate controls in place to protect the security of your data. + Disclosure of Your Information -We may disclose aggregated information about our users, and information that does not identify any individual, without restriction. For example, we may, from time to time, disclose the number of users who have downloaded our Application. -We may disclose personal information that we collect or you provide as described in this privacy policy: -To our subsidiaries and affiliates. -To contractors, service providers, and other third parties we use to support our business and who are bound by contractual obligations to keep personal information confidential and use it only for the purposes for which we disclose it to them. -To a buyer or other successor in the event of a merger, divestiture, restructuring, reorganization, dissolution, or other sale or transfer of some or all of Cake Technology's assets, whether as a going concern or as part of bankruptcy, liquidation, or similar proceeding, in which personal information held by Cake Technology about our App users is among the assets transferred. However, we will provide notice before this Personal Data is transferred and becomes subject to a different Privacy Policy. -To fulfill the purpose for which you provide it. -For any other purpose disclosed by us when you provide the information. -With your consent. -We may also disclose your personal information: -To comply with any court order, law, or legal process, including to respond to any government or regulatory request. -To enforce or apply our terms of use and other agreements, including for billing and collection purposes. -If we believe disclosure is necessary or appropriate to protect the rights, property, or safety of Cake Technologies, our customers, or others. -Cake Technologies is incapable of providing any authority or government agency with data received by the Cake Wallet Nodes, because we do not store this data. -Under certain circumstances, Cake Technologies may be required by authorities to disclose Personal Data which you voluntarily provide us, including your e-mail address, Telegram username, or Reddit username. WE STRONGLY RECOMMEND THAT YOU DO NOT TRANSMIT ANY PERSONALLY IDENTIFIABLE INFORMATION TO US VIA THESE OR ANY OTHER METHODS. +------------------------------ + + We may disclose aggregated information about our users, and information that does not identify any individual, without restriction. For example, we may, from time to time, disclose the number of users who have downloaded our Application. + + We may disclose personal information that we collect or you provide as described in this privacy policy: + - To our subsidiaries and affiliates. + - To contractors, service providers, and other third parties we use to support our business and who are bound by contractual obligations to keep personal information confidential and use it only for the purposes for which we disclose it to them. + - To a buyer or other successor in the event of a merger, divestiture, restructuring, reorganization, dissolution, or other sale or transfer of some or all of Cake Technology's assets, whether as a going concern or as part of bankruptcy, liquidation, or similar proceeding, in which personal information held by Cake Technology about our App users is among the assets transferred. However, we will provide notice before this Personal Data is transferred and becomes subject to a different Privacy Policy. + - To fulfill the purpose for which you provide it. + - For any other purpose disclosed by us when you provide the information. + - With your consent. + + We may also disclose your personal information: + - To comply with any court order, law, or legal process, including to respond to any government or regulatory request. + - To enforce or apply our terms of use and other agreements, including for billing and collection purposes. + - If we believe disclosure is necessary or appropriate to protect the rights, property, or safety of Cake Technologies, our customers, or others. + + Cake Technologies is incapable of providing any authority or government agency with data received by the Cake Wallet Nodes, because we do not store this data. + + Under certain circumstances, Cake Technologies may be required by authorities to disclose Personal Data which you voluntarily provide us, including your e-mail address, Telegram username, or Reddit username. WE STRONGLY RECOMMEND THAT YOU DO NOT TRANSMIT ANY PERSONALLY IDENTIFIABLE INFORMATION TO US VIA THESE OR ANY OTHER METHODS. + Data Security -You are responsible for your personal data, including all data related to the safety of your funds. You should take all appropriate action to protect this data. Cake Technologies cannot recover any data related to your funds in the event that you lose or give away this data. Cake Technologies strongly recommends that you take action to secure your funds, by writing down your seeds or keys, storing encrypted backups, and never sharing this information. -Cake Technologies undertakes any and all reasonable steps possible to secure any data that you voluntarily transmit to us. However, we cannot guarantee that any outside system used to transmit this data is entirely secure and, as such, we recommend that you exercise caution when voluntarily transmitting data to us. +------------- + + You are responsible for your personal data, including all data related to the safety of your funds. You should take all appropriate action to protect this data. Cake Technologies cannot recover any data related to your funds in the event that you lose or give away this data. Cake Technologies strongly recommends that you take action to secure your funds, by writing down your seeds or keys, storing encrypted backups, and never sharing this information. + + Cake Technologies undertakes any and all reasonable steps possible to secure any data that you voluntarily transmit to us. However, we cannot guarantee that any outside system used to transmit this data is entirely secure and, as such, we recommend that you exercise caution when voluntarily transmitting data to us. + Links to Other Websites -The App may contain links to other websites that are not operated by us. If you click on a third-party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit. We have no control over and assume no responsibility for the content, privacy policies or practices of any third-party sites or services. +----------------------- + + The App may contain links to other websites that are not operated by us. If you click on a third-party link, you will be directed to that third party's site. We strongly advise you to review the Privacy Policy of every site you visit. We have no control over and assume no responsibility for the content, privacy policies or practices of any third-party sites or services. + Changes to Our Privacy Policy -It is our policy to post any changes we make to our privacy policy on this page. If we make material changes to how we treat our users' personal information, we will notify you through a notice on the App. The date the privacy policy was last revised is identified at the top of this document. You are responsible for periodically visiting our App and this privacy policy to check for any changes to our Privacy Policy. -Contact Us +----------------------------- + + It is our policy to post any changes we make to our privacy policy on this page. If we make material changes to how we treat our users' personal information, we will notify you through a notice on the App. The date the privacy policy was last revised is identified at the top of this document. You are responsible for periodically visiting our App and this privacy policy to check for any changes to our Privacy Policy. + +Contact Us +---------- + If you have any questions about this Privacy Policy, you are encouraged to contact us by email at info@cakewallet.com. From bc407b9f0fefd2ac21f2350471d5df006d201205 Mon Sep 17 00:00:00 2001 From: OleksandrSobol Date: Wed, 24 Feb 2021 19:45:30 +0200 Subject: [PATCH 6/6] CAKE-280 | updated alert text for xlm and xrp trades --- lib/generated/i18n.dart | 46 +++++++++++++++++++ .../exchange_trade/exchange_trade_page.dart | 6 ++- .../exchange/exchange_trade_view_model.dart | 7 +++ res/values/strings_de.arb | 5 +- res/values/strings_en.arb | 5 +- res/values/strings_es.arb | 5 +- res/values/strings_hi.arb | 5 +- res/values/strings_ja.arb | 5 +- res/values/strings_ko.arb | 5 +- res/values/strings_nl.arb | 5 +- res/values/strings_pl.arb | 5 +- res/values/strings_pt.arb | 5 +- res/values/strings_ru.arb | 5 +- res/values/strings_uk.arb | 5 +- res/values/strings_zh.arb | 5 +- 15 files changed, 105 insertions(+), 14 deletions(-) diff --git a/lib/generated/i18n.dart b/lib/generated/i18n.dart index 006647ba6..494fa9914 100644 --- a/lib/generated/i18n.dart +++ b/lib/generated/i18n.dart @@ -395,6 +395,8 @@ class S implements WidgetsLocalizations { String get confirmed => 'Confirmed'; String get unconfirmed => 'Unconfirmed'; String get displayable => 'Displayable'; + String get xlm_extra_info => 'Please don’t forget to specify the Memo ID while sending the XLM transaction for the exchange'; + String get xrp_extra_info => 'Please don’t forget to specify the Destination Tag while sending the XRP transaction for the exchange'; } class $de extends S { @@ -1151,6 +1153,10 @@ class $de extends S { String get unconfirmed => 'Unbestätigt'; @override String get displayable => 'Anzeigebar'; + @override + String get xlm_extra_info => 'Bitte vergessen Sie nicht, die Memo-ID anzugeben, während Sie die XLM-Transaktion für den Austausch senden'; + @override + String get xrp_extra_info => 'Bitte vergessen Sie nicht, das Ziel-Tag anzugeben, während Sie die XRP-Transaktion für den Austausch senden'; } class $hi extends S { @@ -1907,6 +1913,10 @@ class $hi extends S { String get unconfirmed => 'अपुष्ट'; @override String get displayable => 'प्रदर्शन योग्य'; + @override + String get xlm_extra_info => 'एक्सचेंज के लिए XLM ट्रांजेक्शन भेजते समय मेमो आईडी निर्दिष्ट करना न भूलें'; + @override + String get xrp_extra_info => 'एक्सचेंज के लिए एक्सआरपी लेनदेन भेजते समय कृपया गंतव्य टैग निर्दिष्ट करना न भूलें'; } class $ru extends S { @@ -2663,6 +2673,10 @@ class $ru extends S { String get unconfirmed => 'Неподтвержденный'; @override String get displayable => 'Отображаемый'; + @override + String get xlm_extra_info => 'Не забудьте указать Memo ID (памятка) при отправке транзакции XLM для обмена'; + @override + String get xrp_extra_info => 'Не забудьте указать целевой тег при отправке транзакции XRP для обмена'; } class $ko extends S { @@ -3419,6 +3433,10 @@ class $ko extends S { String get unconfirmed => '미확인'; @override String get displayable => '표시 가능'; + @override + String get xlm_extra_info => '교환을 위해 XLM 거래를 보낼 때 메모 ID를 지정하는 것을 잊지 마십시오'; + @override + String get xrp_extra_info => '교환을 위해 XRP 트랜잭션을 보내는 동안 대상 태그를 지정하는 것을 잊지 마십시오'; } class $pt extends S { @@ -4175,6 +4193,10 @@ class $pt extends S { String get unconfirmed => 'Não confirmado'; @override String get displayable => 'Exibível'; + @override + String get xlm_extra_info => 'Não se esqueça de especificar o Memo ID ao enviar a transação XLM para a troca'; + @override + String get xrp_extra_info => 'Não se esqueça de especificar a etiqueta de destino ao enviar a transação XRP para a troca'; } class $uk extends S { @@ -4931,6 +4953,10 @@ class $uk extends S { String get unconfirmed => 'Непідтверджений'; @override String get displayable => 'Відображуваний'; + @override + String get xlm_extra_info => "Будь ласка, не забудьте вказати ідентифікатор пам'ятки під час надсилання транзакції XLM для обміну"; + @override + String get xrp_extra_info => 'Будь ласка, не забудьте вказати тег призначення під час надсилання XRP-транзакції для обміну'; } class $ja extends S { @@ -5687,6 +5713,10 @@ class $ja extends S { String get unconfirmed => '未確認'; @override String get displayable => '表示可能'; + @override + String get xlm_extra_info => '交換用のXLMトランザクションを送信するときに、メモIDを指定することを忘れないでください'; + @override + String get xrp_extra_info => '取引所のXRPトランザクションを送信するときに、宛先タグを指定することを忘れないでください'; } class $en extends S { @@ -6447,6 +6477,10 @@ class $pl extends S { String get unconfirmed => 'niepotwierdzony'; @override String get displayable => 'Wyświetlane'; + @override + String get xlm_extra_info => 'Nie zapomnij podać identyfikatora notatki podczas wysyłania transakcji XLM do wymiany'; + @override + String get xrp_extra_info => 'Nie zapomnij podać tagu docelowego podczas wysyłania transakcji XRP do wymiany'; } class $es extends S { @@ -7203,6 +7237,10 @@ class $es extends S { String get unconfirmed => 'inconfirmado'; @override String get displayable => 'Visualizable'; + @override + String get xlm_extra_info => 'No olvide especificar el ID de nota al enviar la transacción XLM para el intercambio'; + @override + String get xrp_extra_info => 'No olvide especificar la etiqueta de destino al enviar la transacción XRP para el intercambio'; } class $nl extends S { @@ -7959,6 +7997,10 @@ class $nl extends S { String get unconfirmed => 'niet bevestigd'; @override String get displayable => 'Weer te geven'; + @override + String get xlm_extra_info => 'Vergeet niet om de Memo-ID op te geven tijdens het verzenden van de XLM-transactie voor de uitwisseling'; + @override + String get xrp_extra_info => 'Vergeet niet om de Destination Tag op te geven tijdens het verzenden van de XRP-transactie voor de uitwisseling'; } class $zh extends S { @@ -8715,6 +8757,10 @@ class $zh extends S { String get unconfirmed => '未经证实'; @override String get displayable => '可显示'; + @override + String get xlm_extra_info => '發送用於交換的XLM交易時，請不要忘記指定備忘錄ID'; + @override + String get xrp_extra_info => '發送用於交換的XRP交易時，請不要忘記指定目標標記'; } class GeneratedLocalizationsDelegate extends LocalizationsDelegate { diff --git a/lib/src/screens/exchange_trade/exchange_trade_page.dart b/lib/src/screens/exchange_trade/exchange_trade_page.dart index 5dd558d23..1c92bfef9 100644 --- a/lib/src/screens/exchange_trade/exchange_trade_page.dart +++ b/lib/src/screens/exchange_trade/exchange_trade_page.dart @@ -28,9 +28,11 @@ void showInformation( final information = exchangeTradeViewModel.isSendable ? S.current.exchange_result_confirm( - trade.amount ?? fetchingLabel, trade.from.toString(), walletName) + trade.amount ?? fetchingLabel, trade.from.toString(), walletName) + + exchangeTradeViewModel.extraInfo : S.current.exchange_result_description( - trade.amount ?? fetchingLabel, trade.from.toString()); + trade.amount ?? fetchingLabel, trade.from.toString()) + + exchangeTradeViewModel.extraInfo; showPopUp( context: context, diff --git a/lib/view_model/exchange/exchange_trade_view_model.dart b/lib/view_model/exchange/exchange_trade_view_model.dart index 1c938d054..a739b207f 100644 --- a/lib/view_model/exchange/exchange_trade_view_model.dart +++ b/lib/view_model/exchange/exchange_trade_view_model.dart @@ -59,6 +59,13 @@ abstract class ExchangeTradeViewModelBase with Store { @observable bool isSendable; + @computed + String get extraInfo => trade.from == CryptoCurrency.xlm + ? '\n\n' + S.current.xlm_extra_info + : trade.from == CryptoCurrency.xrp + ? '\n\n' + S.current.xrp_extra_info + : ''; + @observable ObservableList items; diff --git a/res/values/strings_de.arb b/res/values/strings_de.arb index 0efd03060..d4ccff11e 100644 --- a/res/values/strings_de.arb +++ b/res/values/strings_de.arb @@ -456,5 +456,8 @@ "enter_backup_password" : "Geben Sie hier das Sicherungskennwort ein", "select_backup_file" : "Wählen Sie die Sicherungsdatei", "import" : "Importieren", - "please_select_backup_file" : "Bitte wählen Sie die Sicherungsdatei und geben Sie das Sicherungskennwort ein." + "please_select_backup_file" : "Bitte wählen Sie die Sicherungsdatei und geben Sie das Sicherungskennwort ein.", + + "xlm_extra_info" : "Bitte vergessen Sie nicht, die Memo-ID anzugeben, während Sie die XLM-Transaktion für den Austausch senden", + "xrp_extra_info" : "Bitte vergessen Sie nicht, das Ziel-Tag anzugeben, während Sie die XRP-Transaktion für den Austausch senden" } \ No newline at end of file diff --git a/res/values/strings_en.arb b/res/values/strings_en.arb index 0f047346f..7e6794515 100644 --- a/res/values/strings_en.arb +++ b/res/values/strings_en.arb @@ -456,5 +456,8 @@ "enter_backup_password" : "Enter backup password here", "select_backup_file" : "Select backup file", "import" : "Import", - "please_select_backup_file" : "Please select backup file and enter backup password." + "please_select_backup_file" : "Please select backup file and enter backup password.", + + "xlm_extra_info" : "Please don’t forget to specify the Memo ID while sending the XLM transaction for the exchange", + "xrp_extra_info" : "Please don’t forget to specify the Destination Tag while sending the XRP transaction for the exchange" } \ No newline at end of file diff --git a/res/values/strings_es.arb b/res/values/strings_es.arb index 046a4ddcf..640407463 100644 --- a/res/values/strings_es.arb +++ b/res/values/strings_es.arb @@ -456,5 +456,8 @@ "enter_backup_password" : "Ingrese la contraseña de respaldo aquí", "select_backup_file" : "Seleccionar archivo de respaldo", "import" : "Importar", - "please_select_backup_file" : "Seleccione el archivo de respaldo e ingrese la contraseña de respaldo." + "please_select_backup_file" : "Seleccione el archivo de respaldo e ingrese la contraseña de respaldo.", + + "xlm_extra_info" : "No olvide especificar el ID de nota al enviar la transacción XLM para el intercambio", + "xrp_extra_info" : "No olvide especificar la etiqueta de destino al enviar la transacción XRP para el intercambio" } \ No newline at end of file diff --git a/res/values/strings_hi.arb b/res/values/strings_hi.arb index 7d9565e6d..16b7b1a7e 100644 --- a/res/values/strings_hi.arb +++ b/res/values/strings_hi.arb @@ -456,5 +456,8 @@ "enter_backup_password" : "यहां बैकअप पासवर्ड डालें", "select_backup_file" : "बैकअप फ़ाइल का चयन करें", "import" : "आयात", - "please_select_backup_file" : "कृपया बैकअप फ़ाइल चुनें और बैकअप पासवर्ड डालें।" + "please_select_backup_file" : "कृपया बैकअप फ़ाइल चुनें और बैकअप पासवर्ड डालें।", + + "xlm_extra_info" : "एक्सचेंज के लिए XLM ट्रांजेक्शन भेजते समय मेमो आईडी निर्दिष्ट करना न भूलें", + "xrp_extra_info" : "एक्सचेंज के लिए एक्सआरपी लेनदेन भेजते समय कृपया गंतव्य टैग निर्दिष्ट करना न भूलें" } \ No newline at end of file diff --git a/res/values/strings_ja.arb b/res/values/strings_ja.arb index d9254c609..5df5991eb 100644 --- a/res/values/strings_ja.arb +++ b/res/values/strings_ja.arb @@ -456,5 +456,8 @@ "enter_backup_password" : "ここにバックアップパスワードを入力してください", "select_backup_file" : "バックアップファイルを選択", "import" : "インポート", - "please_select_backup_file" : "バックアップファイルを選択し、バックアップパスワードを入力してください。" + "please_select_backup_file" : "バックアップファイルを選択し、バックアップパスワードを入力してください。", + + "xlm_extra_info" : "交換用のXLMトランザクションを送信するときに、メモIDを指定することを忘れないでください", + "xrp_extra_info" : "取引所のXRPトランザクションを送信するときに、宛先タグを指定することを忘れないでください" } \ No newline at end of file diff --git a/res/values/strings_ko.arb b/res/values/strings_ko.arb index ea57c2ff6..497222e43 100644 --- a/res/values/strings_ko.arb +++ b/res/values/strings_ko.arb @@ -456,5 +456,8 @@ "enter_backup_password" : "여기에 백업 비밀번호를 입력하세요.", "select_backup_file" : "백업 파일 선택", "import" : "수입", - "please_select_backup_file" : "백업 파일을 선택하고 백업 암호를 입력하십시오." + "please_select_backup_file" : "백업 파일을 선택하고 백업 암호를 입력하십시오.", + + "xlm_extra_info" : "교환을 위해 XLM 거래를 보낼 때 메모 ID를 지정하는 것을 잊지 마십시오", + "xrp_extra_info" : "교환을 위해 XRP 트랜잭션을 보내는 동안 대상 태그를 지정하는 것을 잊지 마십시오" } \ No newline at end of file diff --git a/res/values/strings_nl.arb b/res/values/strings_nl.arb index 275bfc8a1..24c4830e8 100644 --- a/res/values/strings_nl.arb +++ b/res/values/strings_nl.arb @@ -456,5 +456,8 @@ "enter_backup_password" : "Voer hier een back-upwachtwoord in", "select_backup_file" : "Selecteer een back-upbestand", "import" : "Importeren", - "please_select_backup_file" : "Selecteer een back-upbestand en voer een back-upwachtwoord in." + "please_select_backup_file" : "Selecteer een back-upbestand en voer een back-upwachtwoord in.", + + "xlm_extra_info" : "Vergeet niet om de Memo-ID op te geven tijdens het verzenden van de XLM-transactie voor de uitwisseling", + "xrp_extra_info" : "Vergeet niet om de Destination Tag op te geven tijdens het verzenden van de XRP-transactie voor de uitwisseling" } \ No newline at end of file diff --git a/res/values/strings_pl.arb b/res/values/strings_pl.arb index 552a8b36f..a7ded238f 100644 --- a/res/values/strings_pl.arb +++ b/res/values/strings_pl.arb @@ -456,5 +456,8 @@ "enter_backup_password" : "Wprowadź tutaj hasło zapasowe", "select_backup_file" : "Wybierz plik kopii zapasowej", "import" : "Import", - "please_select_backup_file" : "Wybierz plik kopii zapasowej i wprowadź hasło zapasowe." + "please_select_backup_file" : "Wybierz plik kopii zapasowej i wprowadź hasło zapasowe.", + + "xlm_extra_info" : "Nie zapomnij podać identyfikatora notatki podczas wysyłania transakcji XLM do wymiany", + "xrp_extra_info" : "Nie zapomnij podać tagu docelowego podczas wysyłania transakcji XRP do wymiany" } \ No newline at end of file diff --git a/res/values/strings_pt.arb b/res/values/strings_pt.arb index 2b75d9f01..38be63cba 100644 --- a/res/values/strings_pt.arb +++ b/res/values/strings_pt.arb @@ -456,5 +456,8 @@ "enter_backup_password" : "Digite a senha de backup aqui", "select_backup_file" : "Selecione o arquivo de backup", "import" : "Importar", - "please_select_backup_file" : "Selecione o arquivo de backup e insira a senha de backup." + "please_select_backup_file" : "Selecione o arquivo de backup e insira a senha de backup.", + + "xlm_extra_info" : "Não se esqueça de especificar o Memo ID ao enviar a transação XLM para a troca", + "xrp_extra_info" : "Não se esqueça de especificar a etiqueta de destino ao enviar a transação XRP para a troca" } diff --git a/res/values/strings_ru.arb b/res/values/strings_ru.arb index a972f5382..d30c1b7d1 100644 --- a/res/values/strings_ru.arb +++ b/res/values/strings_ru.arb @@ -456,5 +456,8 @@ "enter_backup_password" : "Введите пароль резервной копии", "select_backup_file" : "Выберите файл резервной копии", "import" : "Импортировать", - "please_select_backup_file" : "Выберите файл резервной копии и введите пароль резервной копии." + "please_select_backup_file" : "Выберите файл резервной копии и введите пароль резервной копии.", + + "xlm_extra_info" : "Не забудьте указать Memo ID (памятка) при отправке транзакции XLM для обмена", + "xrp_extra_info" : "Не забудьте указать целевой тег при отправке транзакции XRP для обмена" } \ No newline at end of file diff --git a/res/values/strings_uk.arb b/res/values/strings_uk.arb index 9ee5860c2..3a9c7daa8 100644 --- a/res/values/strings_uk.arb +++ b/res/values/strings_uk.arb @@ -456,5 +456,8 @@ "enter_backup_password" : "Введіть пароль резервної копії", "select_backup_file" : "Виберіть файл резервної копії", "import" : "Імпортувати", - "please_select_backup_file" : "Виберіть файл резервної копії та введіть пароль резервної копії." + "please_select_backup_file" : "Виберіть файл резервної копії та введіть пароль резервної копії.", + + "xlm_extra_info" : "Будь ласка, не забудьте вказати ідентифікатор пам'ятки під час надсилання транзакції XLM для обміну", + "xrp_extra_info" : "Будь ласка, не забудьте вказати тег призначення під час надсилання XRP-транзакції для обміну" } \ No newline at end of file diff --git a/res/values/strings_zh.arb b/res/values/strings_zh.arb index 4b8197711..7a8f4fe8d 100644 --- a/res/values/strings_zh.arb +++ b/res/values/strings_zh.arb @@ -456,5 +456,8 @@ "enter_backup_password" : "在此處輸入備用密碼", "select_backup_file" : "選擇備份文件", "import" : "進口", - "please_select_backup_file" : "請選擇備份文件，然後輸入備份密碼。" + "please_select_backup_file" : "請選擇備份文件，然後輸入備份密碼。", + + "xlm_extra_info" : "發送用於交換的XLM交易時，請不要忘記指定備忘錄ID", + "xrp_extra_info" : "發送用於交換的XRP交易時，請不要忘記指定目標標記" } \ No newline at end of file