Skip to content

Commit 6dd7fa5

Browse files
authored
Merge pull request #34 from WalletConnect/v2.1.12
V2.1.12
2 parents 7b076a8 + 055cb54 commit 6dd7fa5

34 files changed

Lines changed: 957 additions & 665 deletions

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ migrate_working_dir/
1919
# The .vscode folder contains launch configuration and tasks you configure in
2020
# VS Code which you may wish to be included in version control, so this line
2121
# is commented out by default.
22-
#.vscode/
22+
.vscode/
2323

2424
# Flutter/Dart/Pub related
2525
**/doc/api/

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 2.1.12
2+
3+
- Update `walletconnect_flutter_v2` to use latest 2.1.5 version
4+
- Rebuild connection URI after pairing expiration.
5+
16
## 2.1.11
27

38
- `WalletConnectModalService.disconnect` now disconnects all sessions, unless you tell it to only disconnect the current one

LICENSE

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,19 @@
175175

176176
END OF TERMS AND CONDITIONS
177177

178-
Copyright 2023 Luzzotica LLC
179-
Copyright 2023 WalletConnect, Inc.
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright 2023 Luzzotica LLC, WalletConnect Inc.
190+
180191

181192
Licensed under the Apache License, Version 2.0 (the "License");
182193
you may not use this file except in compliance with the License.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,6 @@ You can launch the currently connected wallet by calling `service.launchCurrentW
178178

179179
### Commands
180180

181-
`dart run build_runner build --delete-conflicting-outputs`
181+
`flutter pub run build_runner build --delete-conflicting-outputs`
182182

183183

dartdoc_options.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
dartdoc:
2+
include: ["walletconnect_modal_flutter", "walletconnect_flutter_v2"]

example/sign/ios/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,4 @@ SPEC CHECKSUMS:
3838

3939
PODFILE CHECKSUM: 70d9d25280d0dd177a5f637cdb0f0b0b12c6a189
4040

41-
COCOAPODS: 1.11.3
41+
COCOAPODS: 1.13.0

example/sign/ios/Runner.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@
214214
97C146E61CF9000F007C117D /* Project object */ = {
215215
isa = PBXProject;
216216
attributes = {
217-
LastUpgradeCheck = 1300;
217+
LastUpgradeCheck = 1430;
218218
ORGANIZATIONNAME = "";
219219
TargetAttributes = {
220220
331C8080294A63A400263BE5 = {
@@ -467,7 +467,7 @@
467467
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
468468
CLANG_ENABLE_MODULES = YES;
469469
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
470-
DEVELOPMENT_TEAM = 74874V9Z5H;
470+
DEVELOPMENT_TEAM = W5R8AG9K22;
471471
ENABLE_BITCODE = NO;
472472
INFOPLIST_FILE = Runner/Info.plist;
473473
LD_RUNPATH_SEARCH_PATHS = (
@@ -646,7 +646,7 @@
646646
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
647647
CLANG_ENABLE_MODULES = YES;
648648
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
649-
DEVELOPMENT_TEAM = 74874V9Z5H;
649+
DEVELOPMENT_TEAM = W5R8AG9K22;
650650
ENABLE_BITCODE = NO;
651651
INFOPLIST_FILE = Runner/Info.plist;
652652
LD_RUNPATH_SEARCH_PATHS = (
@@ -669,7 +669,7 @@
669669
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
670670
CLANG_ENABLE_MODULES = YES;
671671
CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
672-
DEVELOPMENT_TEAM = 74874V9Z5H;
672+
DEVELOPMENT_TEAM = W5R8AG9K22;
673673
ENABLE_BITCODE = NO;
674674
INFOPLIST_FILE = Runner/Info.plist;
675675
LD_RUNPATH_SEARCH_PATHS = (

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

example/sign/lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class _MyAppState extends State<MyApp> {
3636
DeviceOrientation.portraitDown,
3737
]);
3838

39-
LoggerUtil.setLogLevel(Level.verbose);
39+
LoggerUtil.setLogLevel(Level.error);
4040
}
4141

4242
// This widget is the root of your application.

example/sign/lib/widgets/method_dialog.dart

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,12 @@ class MethodDialogState extends State<MethodDialog> {
4848
if (snapshot.hasData) {
4949
final String t = jsonEncode(snapshot.data);
5050
return InkWell(
51-
onTap: () async {
52-
await Clipboard.setData(
53-
ClipboardData(
54-
text: t,
55-
),
56-
);
57-
showPlatformToast(
58-
child: const Text(
59-
StringConstants.copiedToClipboard,
51+
onTap: () {
52+
Clipboard.setData(ClipboardData(text: t)).then(
53+
(_) => showPlatformToast(
54+
child: const Text(StringConstants.copiedToClipboard),
55+
context: context,
6056
),
61-
context: context,
6257
);
6358
},
6459
child: Text(
@@ -69,15 +64,12 @@ class MethodDialogState extends State<MethodDialog> {
6964
return InkWell(
7065
onTap: () async {
7166
await Clipboard.setData(
72-
ClipboardData(
73-
text: snapshot.data.toString(),
74-
),
75-
);
76-
showPlatformToast(
77-
child: const Text(
78-
StringConstants.copiedToClipboard,
67+
ClipboardData(text: snapshot.data.toString()),
68+
).then(
69+
(_) => showPlatformToast(
70+
child: const Text(StringConstants.copiedToClipboard),
71+
context: context,
7972
),
80-
context: context,
8173
);
8274
},
8375
child: Text(

0 commit comments

Comments
 (0)