From e09db474ae6adbe0c5143d2301ccb441ea92807e Mon Sep 17 00:00:00 2001 From: minibits-cash Date: Tue, 22 Apr 2025 01:14:36 +0200 Subject: [PATCH] Fix transaction list --- android/app/build.gradle | 2 +- ios/minibits_wallet.xcodeproj/project.pbxproj | 4 ++-- package.json | 2 +- src/i18n_messages/en.json | 1 + src/screens/TranHistoryScreen.tsx | 3 ++- src/screens/Transactions/TransactionListItem.tsx | 13 +++++++++++-- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index f15b0d7..068e669 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -95,7 +95,7 @@ android { applicationId "com.minibits_wallet" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 58038 + versionCode 58039 versionName "0.2.2" } diff --git a/ios/minibits_wallet.xcodeproj/project.pbxproj b/ios/minibits_wallet.xcodeproj/project.pbxproj index f1963e5..284622a 100644 --- a/ios/minibits_wallet.xcodeproj/project.pbxproj +++ b/ios/minibits_wallet.xcodeproj/project.pbxproj @@ -301,7 +301,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = minibits_wallet/minibits_wallet.entitlements; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 11; DEVELOPMENT_TEAM = GR2ZKMCLAM; ENABLE_BITCODE = NO; INFOPLIST_FILE = minibits_wallet/Info.plist; @@ -336,7 +336,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = minibits_wallet/minibits_wallet.entitlements; - CURRENT_PROJECT_VERSION = 10; + CURRENT_PROJECT_VERSION = 11; DEVELOPMENT_TEAM = GR2ZKMCLAM; INFOPLIST_FILE = minibits_wallet/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = Minibits; diff --git a/package.json b/package.json index e3a0708..bb89f2b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "minibits_wallet", - "version": "0.2.2-beta.8", + "version": "0.2.2-beta.9", "private": true, "scripts": { "android:clean": "cd android && ./gradlew clean", diff --git a/src/i18n_messages/en.json b/src/i18n_messages/en.json index 00088ed..2882f12 100644 --- a/src/i18n_messages/en.json +++ b/src/i18n_messages/en.json @@ -529,6 +529,7 @@ "status": { "blocked": "Blocked", "completedFee": "Completed %{fee}", + "completed": "Completed", "draft": "Draft", "error": "Error", "expired": "Expired", diff --git a/src/screens/TranHistoryScreen.tsx b/src/screens/TranHistoryScreen.tsx index 77a4da6..bdab4a0 100644 --- a/src/screens/TranHistoryScreen.tsx +++ b/src/screens/TranHistoryScreen.tsx @@ -345,7 +345,7 @@ export const TranHistoryScreen = observer(function TranHistoryScreen({ route }: style={$card} /> } - style={{maxHeight: spacing.screenHeight * 0.62}} + style={{maxHeight: spacing.screenHeight * 0.57}} /> {isLoading && } @@ -411,6 +411,7 @@ const $headerCollapsed: TextStyle = { const $contentContainer: TextStyle = { //minHeight: spacing.screenHeight * 0.5, //padding: spacing.extraSmall, + } const $actionCard: ViewStyle = { diff --git a/src/screens/Transactions/TransactionListItem.tsx b/src/screens/Transactions/TransactionListItem.tsx index 8bbbd04..bf5e9d0 100644 --- a/src/screens/Transactions/TransactionListItem.tsx +++ b/src/screens/Transactions/TransactionListItem.tsx @@ -103,9 +103,18 @@ export const TransactionListItem = observer(function (props: TransactionListProp switch (tx.status) { case TransactionStatus.COMPLETED: if(tx.fee && tx.fee > 0) { - return timeAgo + ' ยท Fee ' + tx.fee + if(isTimeAgoVisible) { + return timeAgo + 'Fee ' + tx.fee + } else { + return 'Fee ' + tx.fee + } + } else { - return distance + if(isTimeAgoVisible) { + return distance + } else { + return translate('transactionCommon.status.completed') + } } case TransactionStatus.DRAFT: return timeAgo + translate('transactionCommon.status.draft')