diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 89c9540..8db4365 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionName="0.3"> diff --git a/lib/purchase.dart b/lib/purchase.dart index 723865a..7e737fd 100644 --- a/lib/purchase.dart +++ b/lib/purchase.dart @@ -106,7 +106,7 @@ class PurchaseScreenState extends BaseState { if (await platform.invokeMethod('isOnline')) { var headers = { - 'DM-Authorization': 'dmapptoken 9fec83cdca38c357e6b65dbb17514cdd36bf2a08', + 'DM-Authorization': 'dmapptoken $appToken', 'Authorization': 'dmtoken ${token}' }; @@ -121,7 +121,8 @@ class PurchaseScreenState extends BaseState { this.loyality = '${user['discount']}%'; } else { List amountToBonus = bonuses['amount_to_bonus']; - this.loyality = '${(amountToBonus[0] / double.parse(amountToBonus[1])).toStringAsFixed(0)}%'; + double loyalityVal = (double.parse(amountToBonus[1]) / amountToBonus[0]) * 100; + this.loyality = '${loyalityVal.toStringAsFixed(0)}%'; } }); }).catchError((error) { @@ -183,7 +184,7 @@ class PurchaseScreenState extends BaseState { }; var headers = { - 'DM-Authorization': 'dmapptoken 9fec83cdca38c357e6b65dbb17514cdd36bf2a08', + 'DM-Authorization': 'dmapptoken $appToken', 'Authorization': 'dmtoken ${token}' }; diff --git a/lib/splash.dart b/lib/splash.dart index 96bec76..4d61455 100644 --- a/lib/splash.dart +++ b/lib/splash.dart @@ -76,7 +76,7 @@ class SplashScreen extends StatelessWidget { } else { Map statusResponseMap = JSON.decode(statusResponse.body); - bool active = statusResponseMap['active']; + bool active = statusResponseMap['active'] == null ? false : statusResponseMap['active']; if (active) { startScanner(context);