Fix transaction list

This commit is contained in:
minibits-cash
2025-04-22 01:14:36 +02:00
parent 8ff6e4ee51
commit e09db474ae
6 changed files with 18 additions and 7 deletions
+1 -1
View File
@@ -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"
}
@@ -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;
+1 -1
View File
@@ -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",
+1
View File
@@ -529,6 +529,7 @@
"status": {
"blocked": "Blocked",
"completedFee": "Completed %{fee}",
"completed": "Completed",
"draft": "Draft",
"error": "Error",
"expired": "Expired",
+2 -1
View File
@@ -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 && <Loading shiftedUp={true} />}
</View>
@@ -411,6 +411,7 @@ const $headerCollapsed: TextStyle = {
const $contentContainer: TextStyle = {
//minHeight: spacing.screenHeight * 0.5,
//padding: spacing.extraSmall,
}
const $actionCard: ViewStyle = {
@@ -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')