Исправление замечаний

lib/screens/currencies.dart

@@ -15,7 +15,7 @@ class CurrenciesScreen extends BaseScreen {
 
 class _CurrenciesState extends SettingsBaseState<CurrenciesScreen> {
 
-  List<int> currencies = const [643, 840, 980];
+  List<int> currencies = const [643, 840, 980, 978, 398];
 
   _CurrenciesState(SqliteHelper helper, String app) : super(helper, app);
 
@@ -26,8 +26,10 @@ class _CurrenciesState extends SettingsBaseState<CurrenciesScreen> {
     String ruble = StringsLocalization.nominativeRuble();
     String dollar = StringsLocalization.nominativeDollar();
     String hryvna = StringsLocalization.nominativeHryvna();
+    String euro = StringsLocalization.nominativeEuro();
+    String tenge = StringsLocalization.nominativeTenge();
 
-    return [ruble, dollar, hryvna];
+    return [ruble, dollar, hryvna, euro, tenge];
   }
 
   @override

lib/screens/faq.dart

@@ -1,3 +1,4 @@
+import 'package:checker/strings.dart';
 import 'package:flutter/material.dart';
 
 import 'package:checker/base/base_state.dart';
@@ -46,9 +47,10 @@ class FAQScreenState<T> extends BaseState<FAQScreen> {
 
   FAQScreenState(this.returnToScanner);
   final bool returnToScanner;
+  String app;
 
   @override String getTitle() {
-    return "FAQ";
+    return StringsLocalization.help();
   }
 
   @override String getHint() {
@@ -56,7 +58,18 @@ class FAQScreenState<T> extends BaseState<FAQScreen> {
   }
 
   @override Widget build(BuildContext context) {
-    return getScreenContent();
+    if (app == null) {
+      platform.invokeMethod('getFlavor').then((flavor) {
+        setState(() {
+          app = flavor;
+        });
+      });
+    }
+    return new Scaffold(appBar: getAppBar(),body: getScreenContent());
+  }
+
+  @override List<Widget> getMenuButtons() {
+    return null;
   }
 
   /// Метод возвращает ListView с блоками faq.

lib/screens/finish_registration.dart

@@ -66,8 +66,8 @@ class RegistrationScreenState extends BaseState<FinishRegistrationScreen> {
     } else {
       if (await platform.invokeMethod('isOnline')) {
         String token = await helper.getToken();
-        checkTokenStatus(token).then((response) {
-          print(response.body);
+        String locale = await helper.getLocale();
+        checkTokenStatus(token, locale).then((response) {
           Map parsedMap = JSON.decode(response.body);
 
           // Обновить экран, заменить сообщение о необходимости активации токена, на сообщние о том, что токен активен.

lib/screens/languages.dart

@@ -38,7 +38,6 @@ class LanguagesState extends SettingsBaseState<LanguagesScreen> {
   void getSelectedValue() {
     helper.getLocale().then((locale) {
       setState(() {
-        print(selectedItem);
         selectedItem = getOptions().indexOf(getLocaleTitle(locale));
       });
     });

lib/screens/purchase.dart

@@ -60,7 +60,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
   @override Widget getScreenContent() {
     return new Column(
         children: <Widget>[new Expanded(child: new ListView(children: <Widget>[
-          getValueWithDescription(StringsLocalization.userName(), user['first_name'] == null ? '' : user['first_name']),
+          getValueWithDescription(StringsLocalization.buyer(), user['first_name'] == null ? '' : user['first_name']),
           getValueWithDescription(StringsLocalization.card(), card),
           getValueWithDescription(StringsLocalization.reward(), loyalty),
           getHintLabel(),
@@ -123,10 +123,12 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
     if (await platform.invokeMethod('isOnline')) {
 
       String token = await helper.getToken();
+      String locale = await helper.getLocale();
 
       var headers = {
         'DM-Authorization': 'dmapptoken $appToken',
-        'Authorization': 'dmtoken ${token}'
+        'Authorization': 'dmtoken ${token}',
+        'Accept-Language': locale
       };
 
       httpClient.get(url, headers: headers).then((response) {
@@ -216,6 +218,7 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
         purchaseInProgress = true;
 
         String token = await helper.getToken();
+        String locale = await helper.getLocale();
         helper.getMerchantID().then((result) {
 
           String url = user['purchases_url'];
@@ -230,7 +233,8 @@ class PurchaseScreenState<T> extends BaseState<PurchaseScreen> {
 
             var headers = {
               'DM-Authorization': 'dmapptoken $appToken',
-              'Authorization': 'dmtoken ${token}'
+              'Authorization': 'dmtoken ${token}',
+              'Accept-Language': locale
             };
 
             httpClient.post(url, body: body, headers: headers).then((response) {

lib/screens/registration.dart

@@ -88,8 +88,8 @@ class RegistrationScreenState extends BaseState<RegistrationScreen> {
   _register() async {
     if (await platform.invokeMethod('isOnline')) {
       String posID = await helper.getPosID();
-
-      createToken(dinCode, posID).then((response) {
+      String locale = await helper.getLocale();
+      createToken(dinCode, posID, locale).then((response) {
         setState(() {
           error = null;
           loading = false;

lib/screens/splash.dart

@@ -37,7 +37,7 @@ class _SplashScreenState extends BaseState<SplashScreen> {
     return getScreenContent();
   }
 
-  @override void onStart() {
+  void onStart() {
     helper.getSettings().then((info) {
       if (info == null) {
         platform.invokeMethod('getCurrency').then((currency) {
@@ -113,6 +113,7 @@ class _SplashScreenState extends BaseState<SplashScreen> {
   /// Запуск следующего экрана приложения.
   showNextScreen() async {
     String token = await helper.getToken();
+    String locale = await helper.getLocale();
 
     // В случае, если в приложении отсутствует токен,
     // необходимо запустить регистрацию кассы.
@@ -120,7 +121,7 @@ class _SplashScreenState extends BaseState<SplashScreen> {
       pushRouteReplacement(context, new RegistrationScreen(helper, app));
     } else {
       if (await platform.invokeMethod('isOnline')) {
-        checkTokenStatus(token).then((statusResponse) {
+        checkTokenStatus(token, locale).then((statusResponse) {
           handleStatusResponse(statusResponse, helper);
         }).catchError((error) {
           handleError(error.toString());
@@ -134,7 +135,6 @@ class _SplashScreenState extends BaseState<SplashScreen> {
   /// Если токен не активен, попробовать создать его еще раз.
   handleStatusResponse(var statusResponse, SqliteHelper helper) async {
     int code = statusResponse.statusCode;
-    print('resp: ${code}');
 
     if (code == 404) {
       helper.clear().then((result) {
@@ -164,8 +164,9 @@ class _SplashScreenState extends BaseState<SplashScreen> {
   _createToken(SqliteHelper helper) async {
     String merchantID = await helper.getMerchantID();
     String posID = await helper.getPosID();
+    String locale = await helper.getLocale();
 
-    createToken(merchantID, posID).then((response) {
+    createToken(merchantID, posID, locale).then((response) {
       if (response.statusCode == 409) {
         pushRouteReplacement(context, new FinishRegistrationScreen(helper, app));
       } else if (response.statusCode == 201) {
@@ -177,10 +178,11 @@ class _SplashScreenState extends BaseState<SplashScreen> {
   }
 
   /// Очищаем бд, делаем запрос на удаление токена.
-  void clearToken(Response response, SqliteHelper helper) {
+  Future clearToken(Response response, SqliteHelper helper) async {
+    String locale = await helper.getLocale();
     helper.clear().then((_) {
       Map parsedMap = JSON.decode(response.body);
-      deleteToken(parsedMap['token']).then((_) {
+      deleteToken(parsedMap['token'], locale).then((_) {
         Navigator.of(context).pop();
         pushRouteReplacement(context, new RegistrationScreen(helper, app));
       }).catchError((error) {