bug-fix transaction cancelled bug

Author: FredDominant

CHANGELOG.md

@@ -1,2 +1,6 @@
 ## [1.0.0] - September 9, 2021.
 * Initial release
+
+
+## [1.0.1] - September 14, 2021.
+* Fix bug where response is not returned to initiating screen when user cancels transaction.

README.md

@@ -41,7 +41,7 @@ Flutterwave version 3 API keys
 
 In your `pubspec.yaml` file add:
 
-1. `flutterwave_standard: 1.0.0`
+1. `flutterwave_standard: 1.0.1`
 2. run `flutter pub get`
 
 <a id="usage"></a>

example/android/app/build.gradle

@@ -39,7 +39,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.flutterwave_beta"
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

example/lib/main.dart

@@ -219,7 +219,7 @@ class _MyHomePageState extends State<MyHomePage> {
         context: context,
         style: style,
         publicKey: this.publicKeyController.text.trim().isEmpty
-            ? this.pbk
+            ? this.getPublicKey()
             : this.publicKeyController.text.trim(),
         currency: this.selectedCurrency,
         txRef: Uuid().v1(),
@@ -238,6 +238,11 @@ class _MyHomePageState extends State<MyHomePage> {
     }
   }
 
+  String getPublicKey() {
+    if (isTestMode) return "FLWPUBK_TEST-X";
+    return "FLWPUBK-X";
+  }
+
   void _openBottomSheet() {
     showModalBottomSheet(
         context: this.context,
@@ -247,7 +252,7 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   Widget _getCurrency() {
-    final currencies = ["NGN", "RWF", "UGX", "ZAR", "USD"];
+    final currencies = ["NGN", "RWF", "UGX", "ZAR", "USD", "GHS"];
     return Container(
       height: 250,
       margin: EdgeInsets.fromLTRB(0, 10, 0, 0),

example/pubspec.lock

@@ -99,7 +99,7 @@ packages:
       name: http
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.13.0"
+    version: "0.13.3"
   http_parser:
     dependency: transitive
     description:
@@ -141,7 +141,7 @@ packages:
       name: pedantic
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -216,7 +216,7 @@ packages:
       name: webview_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.0.2"
+    version: "2.0.13"
 sdks:
   dart: ">=2.12.0 <3.0.0"
-  flutter: ">=1.22.0"
+  flutter: ">=2.0.0"

example/pubspec.yaml

@@ -11,6 +11,7 @@ dependencies:
     sdk: flutter
   flutterwave_standard:
     path: "../"
+#  flutterwave_standard: ^1.0.0
   cupertino_icons: ^0.1.3
   uuid: 3.0.4
 

lib/core/navigation_controller.dart

@@ -47,12 +47,13 @@ class NavigationController {
   /// Opens browser with URL returned from startTransaction()
   Future<Map<String, dynamic>> openBrowser(
       final String url,
-      final String redirectUrl
+      final String redirectUrl,
+      [final bool isTestMode = false]
       ) async {
     var response = await Navigator.push(
       _buildContext,
       MaterialPageRoute(
-          builder: (context) => FlutterwaveWebview(url, redirectUrl)),
+          builder: (context) => FlutterwaveWebview(url, redirectUrl, isTestMode)),
     );
     if (response == null) {
       Map<String, dynamic> errorResponse = {

lib/view/payment_widget.dart

@@ -33,10 +33,10 @@ class _PaymentState extends State<PaymentWidget> {
 
   @override
   Widget build(BuildContext context) {
-    controller =
-        NavigationController(context, Client(), widget.style);
+    controller = NavigationController(context, Client(), widget.style);
     return MaterialApp(
       navigatorKey: _navigatorKey,
+      debugShowCheckedModeBanner: widget.request.isTestMode,
       home: Scaffold(
         backgroundColor: widget.style.getMainBackgroundColor(),
         appBar: FlutterwaveViewUtils.appBar(
@@ -93,11 +93,12 @@ class _PaymentState extends State<PaymentWidget> {
   }
 
   void _handlePaymentComplete(ChargeResponse response) {
-    Navigator.pop(context, response);
+    Navigator.pop(context, response); // return response to user
   }
 
   void _showError(final String errorMessage) {
     FlutterwaveViewUtils.showToast(context, errorMessage);
+    Navigator.pop(context); // return response to user
   }
 
   void _showConfirmDialog() {

lib/view/webview.dart

@@ -9,8 +9,9 @@ import '../utils.dart';
 class FlutterwaveWebview extends StatefulWidget {
   final String _url;
   final String _redirectUrl;
+  final bool _isTestMode;
 
-  FlutterwaveWebview(this._url, this._redirectUrl);
+  FlutterwaveWebview(this._url, this._redirectUrl, this._isTestMode);
 
   @override
   _FlutterwaveWebviewState createState() => _FlutterwaveWebviewState();
@@ -26,6 +27,7 @@ class _FlutterwaveWebviewState extends State<FlutterwaveWebview> {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
+      debugShowCheckedModeBanner: widget._isTestMode,
       home: Scaffold(
         body: SafeArea(
           child: Container(

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutterwave_standard
 description: Flutterwave's official library that wraps the standard implementation.
-version: 1.0.0
+version: 1.0.1
 homepage: https://github.com/Flutterwave/flutter_standard
 environment:
   sdk: ">=2.12.0 <3.0.0"