Merge pull request #34 from Flutterwave/release/1.0.6

Bug fix: fix transaction stuck on redirect screen bug

Author: FredDominant

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.0.6] - October, 2022
+* Fixed bug where transaction gets stuck after redirecting on webview
+* Fixed iOS build bug by removing inAppBrowser library
+
 ## [1.0.5] - October, 2022
 * Fixed null when transaction is cancelled.
 * Removed modal pop up before launching web view.

example/ios/Podfile.lock

@@ -1,43 +1,35 @@
 PODS:
   - Flutter (1.0.0)
-  - flutter_inappwebview (0.0.1):
-    - Flutter
-    - flutter_inappwebview/Core (= 0.0.1)
-    - OrderedSet (~> 5.0)
-  - flutter_inappwebview/Core (0.0.1):
-    - Flutter
-    - OrderedSet (~> 5.0)
   - fluttertoast (0.0.2):
     - Flutter
     - Toast
-  - OrderedSet (5.0.0)
   - Toast (4.0.0)
+  - webview_flutter_wkwebview (0.0.1):
+    - Flutter
 
 DEPENDENCIES:
   - Flutter (from `Flutter`)
-  - flutter_inappwebview (from `.symlinks/plugins/flutter_inappwebview/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
+  - webview_flutter_wkwebview (from `.symlinks/plugins/webview_flutter_wkwebview/ios`)
 
 SPEC REPOS:
   trunk:
-    - OrderedSet
     - Toast
 
 EXTERNAL SOURCES:
   Flutter:
     :path: Flutter
-  flutter_inappwebview:
-    :path: ".symlinks/plugins/flutter_inappwebview/ios"
   fluttertoast:
     :path: ".symlinks/plugins/fluttertoast/ios"
+  webview_flutter_wkwebview:
+    :path: ".symlinks/plugins/webview_flutter_wkwebview/ios"
 
 SPEC CHECKSUMS:
   Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
-  flutter_inappwebview: bfd58618f49dc62f2676de690fc6dcda1d6c3721
   fluttertoast: 6122fa75143e992b1d3470f61000f591a798cc58
-  OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
+  webview_flutter_wkwebview: b7e70ef1ddded7e69c796c7390ee74180182971f
 
 PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.11.3

example/ios/Runner.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 46;
+	objectVersion = 50;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -156,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1020;
+				LastUpgradeCheck = 1300;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -239,19 +239,12 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/OrderedSet/OrderedSet.framework",
-				"${BUILT_PRODUCTS_DIR}/Toast/Toast.framework",
-				"${BUILT_PRODUCTS_DIR}/flutter_inappwebview/flutter_inappwebview.framework",
-				"${BUILT_PRODUCTS_DIR}/fluttertoast/fluttertoast.framework",
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OrderedSet.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Toast.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fluttertoast.framework",
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -369,7 +362,10 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@@ -501,7 +497,10 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@@ -528,7 +527,10 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",

example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1020"
+   LastUpgradeVersion = "1300"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

example/ios/Runner/Info.plist

@@ -41,5 +41,7 @@
 	</array>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<false/>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 </dict>
 </plist>

example/lib/main.dart

@@ -38,7 +38,6 @@ class _MyHomePageState extends State<MyHomePage> {
   String selectedCurrency = "";
 
   bool isTestMode = true;
-  final pbk = "FLWPUBK_TEST";
 
   @override
   Widget build(BuildContext context) {
@@ -132,7 +131,6 @@ class _MyHomePageState extends State<MyHomePage> {
                 width: double.infinity,
                 margin: EdgeInsets.fromLTRB(0, 20, 0, 10),
                 child: Row(
-                  // mainAxisAlignment: MainAxisAlignment.spaceBetween,
                   children: [
                     Text("Use Debug"),
                     Switch(
@@ -187,7 +185,6 @@ class _MyHomePageState extends State<MyHomePage> {
         txRef: Uuid().v1(),
         amount: this.amountController.text.toString().trim(),
         customer: customer,
-        // subAccounts: subAccounts,
         paymentOptions: "card, payattitude, barter, bank transfer, ussd",
         customization: Customization(title: "Test Payment"),
         isTestMode: this.isTestMode);
@@ -201,8 +198,8 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 
   String getPublicKey() {
-    if (isTestMode) return "FLWPUBK_TEST--X";
-    return "FLWPUBK--X";
+    if (isTestMode) return "FLWPUBK_TEST-6f008dca68dc8988715b929f2861da41-X";
+    return "FLWPUBK-45587fdb1c84335354ab0fa388b803d5-X";
   }
 
   void _openBottomSheet() {

example/pubspec.lock

@@ -69,13 +69,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_inappwebview:
-    dependency: transitive
-    description:
-      name: flutter_inappwebview
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "5.3.2"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -99,7 +92,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.0.5"
+    version: "1.0.6"
   http:
     dependency: transitive
     description:

lib/view/FlutterwaveWebView.dart

@@ -1,4 +1,5 @@
 
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:flutter/foundation.dart';
@@ -55,26 +56,58 @@ class _StandardWebViewAppState extends State<StandardWebView> {
               initialUrl: widget.url,
               javascriptMode:  JavascriptMode.unrestricted,
               gestureRecognizers: gestureRecognizers,
-              navigationDelegate: (request) {
-                final url = Uri.parse(request.url);
-                if (_hasCompletedProcessing(url)) {
-                  _finish(url);
-                  return NavigationDecision.prevent;
-                } else {
-                  _hasCompletedProcessing(url);
-                  return NavigationDecision.navigate;
-                }
-              }
+              onPageStarted: (webUrl) {
+                final url = Uri.parse(webUrl);
+                _processUrl(url);
+              },
             ),
           )
       );
   }
 
-  bool _hasCompletedProcessing(final Uri uri) {
+  _processUrl(Uri uri) {
+    if (_checkHasAppendedWithResponse(uri)) {
+      _finishWithAppendedResponse(uri);
+    } else {
+      _checkHasCompletedProcessing(uri);
+    }
+  }
+
+  _checkHasCompletedProcessing(final Uri uri) {
     final status = uri.queryParameters["status"];
     final txRef = uri.queryParameters["tx_ref"];
     final id = uri.queryParameters["transaction_id"];
-    return status != null && txRef != null;
+    if (status != null && txRef != null) {
+      _finish(uri);
+    }
+  }
+
+  bool _checkHasAppendedWithResponse(final Uri uri) {
+    final response = uri.queryParameters["response"];
+    if (response != null) {
+      final json = jsonDecode(response);
+      final status = json["status"];
+      final txRef = json["txRef"];
+      return status != null && txRef != null;
+    }
+    return false;
+  }
+
+  _finishWithAppendedResponse(Uri uri) {
+    final response = uri.queryParameters["response"];
+    final decoded = Uri.decodeFull(response!);
+    final json = jsonDecode(decoded);
+    final status = json["status"];
+    final txRef = json["txRef"];
+    final id = json["id"];
+
+    final ChargeResponse chargeResponse = ChargeResponse(
+        status: status,
+        transactionId: "$id",
+        txRef: txRef,
+        success: status?.contains("success") == true
+    );
+    Navigator.pop(context, chargeResponse);
   }
 
   _finish(final Uri uri) {

lib/view/standard_webview.dart

@@ -146,13 +146,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_inappwebview:
-    dependency: "direct main"
-    description:
-      name: flutter_inappwebview
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "5.3.2"
   flutter_test:
     dependency: "direct dev"
     description: flutter