Skip to content

Commit 9faec1c

Browse files
committed
Merge branch 'main' of https://github.com/cake-tech/cake_wallet into Integrate-Seed-Verification-Flow-To-Integration-Tests
2 parents 3eea48d + 4942072 commit 9faec1c

File tree

4 files changed

+15
-8
lines changed

4 files changed

+15
-8
lines changed

android/app/src/main/AndroidManifestBase.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@
107107
<meta-data
108108
android:name="flutterEmbedding"
109109
android:value="2" />
110+
<meta-data
111+
android:name="io.flutter.embedding.android.EnableImpeller"
112+
android:value="false" />
110113
<provider
111114
android:name="com.pichillilorenzo.flutter_inappwebview_android.InAppWebViewFileProvider"
112115
android:authorities="${applicationId}.flutter_inappwebview_android.fileprovider"

lib/src/screens/nodes/node_create_or_edit_page.dart

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,9 @@ class NodeCreateOrEditPage extends BasePage {
182182

183183
await nodeCreateOrEditViewModel.save(
184184
editingNode: editingNode, saveAsCurrent: isSelected ?? false);
185-
Navigator.of(context).pop();
185+
if (context.mounted) {
186+
Navigator.of(context).pop();
187+
}
186188
},
187189
text: S.of(context).save,
188190
color: Theme.of(context).primaryColor,

lib/src/screens/send/send_page.dart

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -643,12 +643,14 @@ class SendPage extends BasePage {
643643
actionButtonKey: ValueKey('send_page_sent_dialog_ok_button_key'),
644644
actionButton: () {
645645
Navigator.of(bottomSheetContext).pop();
646-
if (context.mounted) {
647-
Navigator.of(context)
648-
.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
649-
}
650-
RequestReviewHandler.requestReview();
651-
newContactAddress = null;
646+
Future.delayed(Duration.zero, () {
647+
if (context.mounted) {
648+
Navigator.of(context)
649+
.pushNamedAndRemoveUntil(Routes.dashboard, (route) => false);
650+
}
651+
RequestReviewHandler.requestReview();
652+
newContactAddress = null;
653+
});
652654
},
653655
);
654656
},

lib/src/screens/wallet_connect/wc_pairing_detail_page.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class WCCDetailsWidget extends BasePage {
101101
child: CircleAvatar(
102102
backgroundImage: (pairing.peerMetadata!.icons.isNotEmpty
103103
? NetworkImage(pairing.peerMetadata!.icons[0])
104-
: const AssetImage('assets/images/default_icon.png'))
104+
: const AssetImage('assets/images/app_logo.png'))
105105
as ImageProvider<Object>,
106106
),
107107
),

0 commit comments

Comments
 (0)