Skip to content

Commit

Permalink
Merge pull request #83 from qubic/hotfix/1.1.3
Browse files Browse the repository at this point in the history
Hotfix/1.1.3
  • Loading branch information
sallymoc authored Aug 29, 2024
2 parents 7d0cd29 + 7f2e5e4 commit 2c7c43d
Show file tree
Hide file tree
Showing 10 changed files with 38 additions and 34 deletions.
7 changes: 0 additions & 7 deletions assets/qubic_js/qubic-helper-html-3_0_5.html

This file was deleted.

7 changes: 7 additions & 0 deletions assets/qubic_js/qubic-helper-html-3_0_6.html

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ PODS:
- DKPhotoGallery/Resource (0.0.19):
- SDWebImage
- SwiftyGif
- downloadsfolder (0.0.1):
- Flutter
- file_picker (0.0.1):
- DKImagePickerController/PhotoGallery
- Flutter
Expand Down Expand Up @@ -106,6 +108,8 @@ PODS:
- path_provider_foundation (0.0.1):
- Flutter
- FlutterMacOS
- permission_handler_apple (9.3.0):
- Flutter
- PromisesObjC (2.4.0)
- SDWebImage (5.19.4):
- SDWebImage/Core (= 5.19.4)
Expand All @@ -121,6 +125,7 @@ PODS:

DEPENDENCIES:
- Argon2Swift
- downloadsfolder (from `.symlinks/plugins/downloadsfolder/ios`)
- file_picker (from `.symlinks/plugins/file_picker/ios`)
- Flutter (from `Flutter`)
- flutter_inappwebview_ios (from `.symlinks/plugins/flutter_inappwebview_ios/ios`)
Expand All @@ -130,6 +135,7 @@ DEPENDENCIES:
- mobile_scanner (from `.symlinks/plugins/mobile_scanner/ios`)
- package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
- path_provider_foundation (from `.symlinks/plugins/path_provider_foundation/darwin`)
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
- share_plus (from `.symlinks/plugins/share_plus/ios`)
- shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`)
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
Expand All @@ -156,6 +162,8 @@ SPEC REPOS:
- SwiftyGif

EXTERNAL SOURCES:
downloadsfolder:
:path: ".symlinks/plugins/downloadsfolder/ios"
file_picker:
:path: ".symlinks/plugins/file_picker/ios"
Flutter:
Expand All @@ -174,6 +182,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/package_info_plus/ios"
path_provider_foundation:
:path: ".symlinks/plugins/path_provider_foundation/darwin"
permission_handler_apple:
:path: ".symlinks/plugins/permission_handler_apple/ios"
share_plus:
:path: ".symlinks/plugins/share_plus/ios"
shared_preferences_foundation:
Expand All @@ -185,6 +195,7 @@ SPEC CHECKSUMS:
Argon2Swift: 295b8bde7ba61434f227f5610b8813c42e866f74
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
downloadsfolder: 84af83492bd9ab8c94109ba56fd202d7469d3632
file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
flutter_inappwebview_ios: 97215cf7d4677db55df76782dbd2930c5e1c1ea0
Expand All @@ -206,6 +217,7 @@ SPEC CHECKSUMS:
OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
SDWebImage: 066c47b573f408f18caa467d71deace7c0f8280d
share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
Expand Down
2 changes: 1 addition & 1 deletion ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n";
};
64EAEC80D7A803C0B8642F0B /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
Expand Down
2 changes: 0 additions & 2 deletions lib/components/account_list_item.dart
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,6 @@ class _AccountListItemState extends State<AccountListItem> {
),
PopupMenuItem<CardItem>(
value: CardItem.viewInExplorer,
enabled:
widget.item.amount != null && widget.item.amount! > 0,
child: Text(l10n.accountButtonViewInExplorer),
),
PopupMenuItem<CardItem>(
Expand Down
18 changes: 7 additions & 11 deletions lib/components/cumulative_wallet_value_sliver.dart
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,13 @@ class _CumulativeWalletValueSliverState
}

Widget getTotalUSD() {
return Text("\$${numberFormat.format(appStore.totalAmountsInUSD.toInt())}",
style: TextStyles.sliverSmall);
// return AmountFormatted(
// amount: appStore.totalAmountsInUSD.toInt(),
// prefix: "\$",
// isInHeader: true,
// hideLabel: true,
// currencyName: 'USD',
// labelOffset: -2,
// textStyle: TextStyles.sliverSmall,
// );
// Create a NumberFormat object for USD currency with 2 decimal places
NumberFormat currencyFormat =
NumberFormat.currency(symbol: '\$', decimalDigits: 2);

// Format the double value as a USD amount
String formattedValue = currencyFormat.format(appStore.totalAmountsInUSD);
return Text(formattedValue, style: TextStyles.sliverSmall);
}

Widget getConversion() {
Expand Down
1 change: 0 additions & 1 deletion lib/components/id_list_item.dart
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ class IdListItem extends StatelessWidget {
),
PopupMenuItem<CardItem>(
value: CardItem.viewInExplorer,
enabled: item.amount != null && item.amount! > 0,
child: Text(l10n.accountButtonViewInExplorer),
),
PopupMenuItem<CardItem>(
Expand Down
19 changes: 9 additions & 10 deletions lib/config.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,18 @@ abstract class Config {
//Qubic Helper Utilities
static final qubicHelper = QubicHelperConfig(
win64: QubicHelperConfigEntry(
filename: "qubic-helper-win-x64-3_0_5.exe",
filename: "qubic-helper-win-x64-3_0_6.exe",
downloadPath:
"https://github.com/Qubic-Hub/qubic-helper-utils/releases/download/3.0.5/qubic-helper-win-x64-3_0_5.exe",
checksum:
"17c9931483d65d693f304b8da7a19522"), // was 4dcab1001193a7ed3abf3485cd99eff0 for 2_0_1
"https://github.com/qubic/ts-library-wrapper/releases/download/3.0.6/qubic-helper-win-x64-3_0_6.exe",
checksum: "55236d3b6d5d7c795807cbf89f77423d"),
linux64: QubicHelperConfigEntry(
filename: "qubic-helper-linux-x64-3_0_5",
filename: "qubic-helper-linux-x64-3_0_6",
downloadPath:
"https://github.com/Qubic-Hub/qubic-helper-utils/releases/download/3.0.5/qubic-helper-linux-x64-3_0_5",
checksum: "a1737ce965a51e33ded5fd2ddddc9fe9"),
"https://github.com/qubic/ts-library-wrapper/releases/download/3.0.6/qubic-helper-linux-x64-3_0_6",
checksum: "503a87fadc425692b7d0d0579f56683e"),
macOs64: QubicHelperConfigEntry(
filename: "qubic-helper-mac-x64-3_0_5",
filename: "qubic-helper-mac-x64-3_0_6",
downloadPath:
"https://github.com/Qubic-Hub/qubic-helper-utils/releases/download/3.0.5/qubic-helper-mac-x64-3_0_5",
checksum: "bc83e4f4350eab06a92a456ca30b5755"));
"https://github.com/qubic/ts-library-wrapper/releases/download/3.0.6/qubic-helper-mac-x64-3_0_6",
checksum: "45588af4b72234858dca3e1094f2aaeb"));
}
2 changes: 1 addition & 1 deletion lib/resources/qubic_js.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class QubicJs {
InAppWebView = HeadlessInAppWebView(
onWebViewCreated: (WVcontroller) async {
WVcontroller.loadFile(
assetFilePath: "assets/qubic_js/qubic-helper-html-3_0_5.html");
assetFilePath: "assets/qubic_js/qubic-helper-html-3_0_6.html");

controller = WVcontroller;
},
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: qubic_wallet
description: A Wallet for the Qubic Network created by Qubic-Hub.com
publish_to: "none"
version: 1.1.2+39
version: 1.1.3+41
environment:
sdk: ">=3.0.0 <4.0.0"

Expand Down

0 comments on commit 2c7c43d

Please sign in to comment.