Skip to content

Commit cb6c26f

Browse files
codesmacgodescodesmacgodes
committed
Merge branch 'main' into trying_gha
2 parents 77fb54f + 814c26f commit cb6c26f

File tree

9 files changed

+97
-57
lines changed

9 files changed

+97
-57
lines changed

‎ios/AppStore_com.avengemedia.natrium.mobileprovision‎

-7.69 KB
Binary file not shown.

‎ios/Flutter/AppFrameworkInfo.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@
2121
<key>CFBundleVersion</key>
2222
<string>1.0</string>
2323
<key>MinimumOSVersion</key>
24-
<string>11.0</string>
24+
<string>12.0</string>
2525
</dict>
2626
</plist>

‎ios/Podfile‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Uncomment this line to define a global platform for your project
2-
# platform :ios, '11.0'
2+
platform :ios, '12.0'
33

44
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
55
ENV['COCOAPODS_DISABLE_STATS'] = 'true'
@@ -36,6 +36,11 @@ end
3636

3737
post_install do |installer|
3838
installer.pods_project.targets.each do |target|
39+
target.build_configurations.each do |config|
40+
# Set the deployment target
41+
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
42+
config.build_settings['CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES'] = 'YES'
43+
end
3944
flutter_additional_ios_build_settings(target)
4045
end
41-
end
46+
end

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
/* Begin PBXBuildFile section */
1010
1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
11+
316E178F07EC2BC86B944736 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A32196AD03E84FB2BF8DB09 /* Pods_Runner.framework */; };
1112
39167EB922218469008D1855 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 39167EAD22218468008D1855 /* [email protected] */; };
1213
39167EBB22218469008D1855 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 39167EAF22218468008D1855 /* [email protected] */; };
1314
39167EBD22218469008D1855 /* [email protected] in Resources */ = {isa = PBXBuildFile; fileRef = 39167EB122218469008D1855 /* [email protected] */; };
@@ -35,7 +36,6 @@
3536
97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
3637
97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; };
3738
97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; };
38-
CBAA1349404142D77C1C792C /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DF78FC2E6B52C611A2470FD3 /* Pods_Runner.framework */; };
3939
/* End PBXBuildFile section */
4040

4141
/* Begin PBXCopyFilesBuildPhase section */
@@ -70,7 +70,7 @@
7070
39A26A7026D5621D00977C6C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
7171
39A26A7126D5621E00977C6C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
7272
3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
73-
552E09CE27D49778F805B244 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
73+
5A32196AD03E84FB2BF8DB09 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
7474
766334D522C3E7DC008DDB1D /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
7575
766334D622C3E7DC008DDB1D /* empty.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = empty.swift; sourceTree = "<group>"; };
7676
766B58A8221AFEB4009C8264 /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
@@ -80,6 +80,7 @@
8080
76E821F121F6556B00B97509 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
8181
76E821F421FB9FDD00B97509 /* Runner.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = Runner.xcodeproj; sourceTree = SOURCE_ROOT; };
8282
76E821F721FB9FE700B97509 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = SOURCE_ROOT; };
83+
7861206952BB60B167B696C0 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
8384
7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
8485
7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
8586
7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
@@ -91,31 +92,30 @@
9192
97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
9293
97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
9394
97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
94-
B82F33375CA1C21771A193A8 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
95-
DA5E51DC822BDDE21B01981B /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
96-
DF78FC2E6B52C611A2470FD3 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
95+
A410C793C7B93DCBB45D9EB4 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
96+
D95055A9C1234ED514595993 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
9797
/* End PBXFileReference section */
9898

9999
/* Begin PBXFrameworksBuildPhase section */
100100
97C146EB1CF9000F007C117D /* Frameworks */ = {
101101
isa = PBXFrameworksBuildPhase;
102102
buildActionMask = 2147483647;
103103
files = (
104-
CBAA1349404142D77C1C792C /* Pods_Runner.framework in Frameworks */,
104+
316E178F07EC2BC86B944736 /* Pods_Runner.framework in Frameworks */,
105105
);
106106
runOnlyForDeploymentPostprocessing = 0;
107107
};
108108
/* End PBXFrameworksBuildPhase section */
109109

110110
/* Begin PBXGroup section */
111-
4D5DBC2F2D9B3780C0E34E70 /* Pods */ = {
111+
3A53BCD3EB59ED7D1287C855 /* Pods */ = {
112112
isa = PBXGroup;
113113
children = (
114-
DA5E51DC822BDDE21B01981B /* Pods-Runner.debug.xcconfig */,
115-
552E09CE27D49778F805B244 /* Pods-Runner.release.xcconfig */,
116-
B82F33375CA1C21771A193A8 /* Pods-Runner.profile.xcconfig */,
114+
D95055A9C1234ED514595993 /* Pods-Runner.debug.xcconfig */,
115+
7861206952BB60B167B696C0 /* Pods-Runner.release.xcconfig */,
116+
A410C793C7B93DCBB45D9EB4 /* Pods-Runner.profile.xcconfig */,
117117
);
118-
name = Pods;
118+
path = Pods;
119119
sourceTree = "<group>";
120120
};
121121
766B589C221AFEB4009C8264 /* resources */ = {
@@ -167,8 +167,8 @@
167167
9740EEB11CF90186004384FC /* Flutter */,
168168
97C146F01CF9000F007C117D /* Runner */,
169169
97C146EF1CF9000F007C117D /* Products */,
170-
4D5DBC2F2D9B3780C0E34E70 /* Pods */,
171-
F4A9A7110F1ED0F8FA0C1CB8 /* Frameworks */,
170+
3A53BCD3EB59ED7D1287C855 /* Pods */,
171+
D0238D598160A00ED9653B2C /* Frameworks */,
172172
);
173173
sourceTree = "<group>";
174174
};
@@ -211,10 +211,10 @@
211211
name = "Supporting Files";
212212
sourceTree = "<group>";
213213
};
214-
F4A9A7110F1ED0F8FA0C1CB8 /* Frameworks */ = {
214+
D0238D598160A00ED9653B2C /* Frameworks */ = {
215215
isa = PBXGroup;
216216
children = (
217-
DF78FC2E6B52C611A2470FD3 /* Pods_Runner.framework */,
217+
5A32196AD03E84FB2BF8DB09 /* Pods_Runner.framework */,
218218
);
219219
name = Frameworks;
220220
sourceTree = "<group>";
@@ -226,14 +226,14 @@
226226
isa = PBXNativeTarget;
227227
buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
228228
buildPhases = (
229-
3B6A8D2086FBD2AD9C7DCF6F /* [CP] Check Pods Manifest.lock */,
229+
74CA16427B28BAD186CAEA66 /* [CP] Check Pods Manifest.lock */,
230230
9740EEB61CF901F6004384FC /* Run Script */,
231231
97C146EA1CF9000F007C117D /* Sources */,
232232
97C146EB1CF9000F007C117D /* Frameworks */,
233233
97C146EC1CF9000F007C117D /* Resources */,
234234
9705A1C41CF9048500538489 /* Embed Frameworks */,
235235
3B06AD1E1E4923F5004D2608 /* Thin Binary */,
236-
B6D61E1E4EDD4BE1246C8259 /* [CP] Embed Pods Frameworks */,
236+
A7709CCAA6348E35D1D8BC95 /* [CP] Embed Pods Frameworks */,
237237
);
238238
buildRules = (
239239
);
@@ -340,7 +340,7 @@
340340
shellPath = /bin/sh;
341341
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
342342
};
343-
3B6A8D2086FBD2AD9C7DCF6F /* [CP] Check Pods Manifest.lock */ = {
343+
74CA16427B28BAD186CAEA66 /* [CP] Check Pods Manifest.lock */ = {
344344
isa = PBXShellScriptBuildPhase;
345345
buildActionMask = 2147483647;
346346
files = (
@@ -377,7 +377,7 @@
377377
shellPath = /bin/sh;
378378
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
379379
};
380-
B6D61E1E4EDD4BE1246C8259 /* [CP] Embed Pods Frameworks */ = {
380+
A7709CCAA6348E35D1D8BC95 /* [CP] Embed Pods Frameworks */ = {
381381
isa = PBXShellScriptBuildPhase;
382382
buildActionMask = 2147483647;
383383
files = (
@@ -534,7 +534,7 @@
534534
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
535535
GCC_WARN_UNUSED_FUNCTION = YES;
536536
GCC_WARN_UNUSED_VARIABLE = YES;
537-
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
537+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
538538
MTL_ENABLE_DEBUG_INFO = NO;
539539
SDKROOT = iphoneos;
540540
SWIFT_OBJC_INTERFACE_HEADER_NAME = "Runner-Swift.h";
@@ -548,6 +548,7 @@
548548
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
549549
buildSettings = {
550550
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
551+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
551552
CLANG_ENABLE_MODULES = YES;
552553
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
553554
CODE_SIGN_IDENTITY = "Apple Development";
@@ -560,7 +561,7 @@
560561
"$(PROJECT_DIR)/Flutter",
561562
);
562563
INFOPLIST_FILE = Runner/Info.plist;
563-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
564+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
564565
LD_RUNPATH_SEARCH_PATHS = (
565566
"$(inherited)",
566567
"@executable_path/Frameworks",
@@ -627,7 +628,7 @@
627628
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
628629
GCC_WARN_UNUSED_FUNCTION = YES;
629630
GCC_WARN_UNUSED_VARIABLE = YES;
630-
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
631+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
631632
MTL_ENABLE_DEBUG_INFO = YES;
632633
ONLY_ACTIVE_ARCH = YES;
633634
SDKROOT = iphoneos;
@@ -678,7 +679,7 @@
678679
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
679680
GCC_WARN_UNUSED_FUNCTION = YES;
680681
GCC_WARN_UNUSED_VARIABLE = YES;
681-
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
682+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
682683
MTL_ENABLE_DEBUG_INFO = NO;
683684
SDKROOT = iphoneos;
684685
SWIFT_COMPILATION_MODE = wholemodule;
@@ -693,6 +694,7 @@
693694
baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */;
694695
buildSettings = {
695696
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
697+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
696698
CLANG_ENABLE_MODULES = YES;
697699
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
698700
CODE_SIGN_IDENTITY = "Apple Development";
@@ -705,7 +707,7 @@
705707
"$(PROJECT_DIR)/Flutter",
706708
);
707709
INFOPLIST_FILE = Runner/Info.plist;
708-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
710+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
709711
LD_RUNPATH_SEARCH_PATHS = (
710712
"$(inherited)",
711713
"@executable_path/Frameworks",
@@ -730,6 +732,7 @@
730732
baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */;
731733
buildSettings = {
732734
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
735+
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
733736
CLANG_ENABLE_MODULES = YES;
734737
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
735738
CODE_SIGN_IDENTITY = "Apple Development";
@@ -742,7 +745,7 @@
742745
"$(PROJECT_DIR)/Flutter",
743746
);
744747
INFOPLIST_FILE = Runner/Info.plist;
745-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
748+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
746749
LD_RUNPATH_SEARCH_PATHS = (
747750
"$(inherited)",
748751
"@executable_path/Frameworks",

‎lib/appstate_container.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ class StateContainerState extends State<StateContainer> {
9999
AvailableCurrency curCurrency = AvailableCurrency(AvailableCurrencyEnum.USD);
100100
LanguageSetting curLanguage = LanguageSetting(AvailableLanguage.DEFAULT);
101101
AvailableBlockExplorer curBlockExplorer =
102-
AvailableBlockExplorer(AvailableBlockExplorerEnum.NANOCRAWLER);
102+
AvailableBlockExplorer(AvailableBlockExplorerEnum.SPYNANO);
103103
BaseTheme curTheme = NatriumTheme();
104104
// Currently selected account
105105
Account selectedAccount =

‎lib/localization.dart‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,22 +1226,12 @@ class AppLocalization {
12261226

12271227
/// -- NON-TRANSLATABLE ITEMS
12281228
String getBlockExplorerUrl(String hash, AvailableBlockExplorer explorer) {
1229-
if (explorer.explorer == AvailableBlockExplorerEnum.NANOLOOKER) {
1230-
return 'https://nanolooker.com/block/$hash';
1231-
} else if (explorer.explorer == AvailableBlockExplorerEnum.NANOCAFE) {
1232-
return 'https://nanocafe.cc/$hash';
1233-
}
1234-
return 'https://nanocrawler.cc/explorer/block/$hash';
1229+
return explorer.getBlockUrl(hash);
12351230
}
12361231

12371232
String getAccountExplorerUrl(
12381233
String account, AvailableBlockExplorer explorer) {
1239-
if (explorer.explorer == AvailableBlockExplorerEnum.NANOLOOKER) {
1240-
return 'https://nanolooker.com/account/$account';
1241-
} else if (explorer.explorer == AvailableBlockExplorerEnum.NANOCAFE) {
1242-
return 'https://nanocafe.cc/$account';
1243-
}
1244-
return 'https://nanocrawler.cc/explorer/account/$account';
1234+
return explorer.getAccountUrl(account);
12451235
}
12461236

12471237
String get eulaUrl {

‎lib/model/available_block_explorer.dart‎

Lines changed: 52 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@ import 'package:flutter/material.dart';
22
import 'dart:ui';
33
import 'package:natrium_wallet_flutter/model/setting_item.dart';
44

5-
enum AvailableBlockExplorerEnum { NANOCRAWLER, NANOLOOKER, NANOCAFE }
5+
enum AvailableBlockExplorerEnum {
6+
SPYNANO,
7+
NANOEXPLORER,
8+
BLOCKLATTICE,
9+
NANOCOMMUNITYY,
10+
NANOBROWSE
11+
}
612

713
/// Represent the available authentication methods our app supports
814
class AvailableBlockExplorer extends SettingSelectionItem {
@@ -12,14 +18,52 @@ class AvailableBlockExplorer extends SettingSelectionItem {
1218

1319
String getDisplayName(BuildContext context) {
1420
switch (explorer) {
15-
case AvailableBlockExplorerEnum.NANOCRAWLER:
16-
return "nanocrawler.cc";
17-
case AvailableBlockExplorerEnum.NANOLOOKER:
18-
return "nanolooker.com";
19-
case AvailableBlockExplorerEnum.NANOCAFE:
20-
return "nanocafe.cc";
21+
case AvailableBlockExplorerEnum.SPYNANO:
22+
return "spynano.org";
23+
case AvailableBlockExplorerEnum.NANOEXPLORER:
24+
return "nanexplorer.com";
25+
case AvailableBlockExplorerEnum.BLOCKLATTICE:
26+
return "blocklattice.io";
27+
case AvailableBlockExplorerEnum.NANOCOMMUNITYY:
28+
return "nano.community";
29+
case AvailableBlockExplorerEnum.NANOBROWSE:
30+
return "nanobrowse.com";
31+
default:
32+
return "spynano.org";
33+
}
34+
}
35+
36+
String getBlockUrl(String hash) {
37+
switch (explorer) {
38+
case AvailableBlockExplorerEnum.SPYNANO:
39+
return "https://spynano.org/hash/$hash";
40+
case AvailableBlockExplorerEnum.NANOEXPLORER:
41+
return "https://nanexplorer.com/nano/block/$hash";
42+
case AvailableBlockExplorerEnum.BLOCKLATTICE:
43+
return "https://blocklattice.io/block/$hash";
44+
case AvailableBlockExplorerEnum.NANOCOMMUNITYY:
45+
return "https://nano.community/$hash";
46+
case AvailableBlockExplorerEnum.NANOBROWSE:
47+
return "https://nanobrowse.com/block/$hash";
48+
default:
49+
return "https://spynano.org/hash/$hash";
50+
}
51+
}
52+
53+
String getAccountUrl(String account) {
54+
switch (explorer) {
55+
case AvailableBlockExplorerEnum.SPYNANO:
56+
return "https://spynano.org/account/$account";
57+
case AvailableBlockExplorerEnum.NANOEXPLORER:
58+
return "https://nanexplorer.com/nano/account/$account";
59+
case AvailableBlockExplorerEnum.BLOCKLATTICE:
60+
return "https://blocklattice.io/account/$account";
61+
case AvailableBlockExplorerEnum.NANOCOMMUNITYY:
62+
return "https://nano.community/$account";
63+
case AvailableBlockExplorerEnum.NANOBROWSE:
64+
return "https://nanobrowse.com/account/$account";
2165
default:
22-
return "nanocrawler.cc";
66+
return "https://spynano.org/account/$account";
2367
}
2468
}
2569

‎lib/util/sharedprefsutil.dart‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,7 @@ class SharedPrefsUtil {
7979
} else {
8080
expiryVal = expiry;
8181
}
82-
Map<String, dynamic> msg = {
83-
'data':value,
84-
'expiry':expiryVal
85-
};
82+
Map<String, dynamic> msg = {'data': value, 'expiry': expiryVal};
8683
String serialized = json.encode(msg);
8784
await set(key, serialized);
8885
}
@@ -226,8 +223,9 @@ class SharedPrefsUtil {
226223
}
227224

228225
Future<AvailableBlockExplorer> getBlockExplorer() async {
229-
return AvailableBlockExplorer(AvailableBlockExplorerEnum.values[await get(cur_explorer,
230-
defaultValue: AvailableBlockExplorerEnum.NANOCRAWLER.index)]);
226+
return AvailableBlockExplorer(AvailableBlockExplorerEnum.values[await get(
227+
cur_explorer,
228+
defaultValue: AvailableBlockExplorerEnum.SPYNANO.index)]);
231229
}
232230

233231
Future<ThemeSetting> getTheme() async {
@@ -380,7 +378,7 @@ class SharedPrefsUtil {
380378

381379
Future<bool> shouldShowAlert(AlertResponseItem alert) async {
382380
int exists = await getWithExpiry("alert_${alert.id}");
383-
return exists == null ? true: false;
381+
return exists == null ? true : false;
384382
}
385383

386384
// For logging out

‎pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: Natrium - Fast, Robust & Secure NANO Wallet.
66
# followed by an optional build number separated by a +.
77
# Both the version and the builder number may be overridden in flutter
88
# build by specifying --build-name and --build-number, respectively.
9-
version: 2.5.1+85
9+
version: 2.5.2+86
1010

1111
environment:
1212
sdk: ">=2.11.99 <3.0.0"

0 commit comments

Comments
 (0)