Skip to content

Commit 72dad49

Browse files
committed
Increment to version 4.0.9
1 parent 46ef91d commit 72dad49

File tree

5 files changed

+31
-7
lines changed

5 files changed

+31
-7
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file.
33

44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
55

6+
## [4.0.9] - 2023-06-16
7+
8+
### Changed
9+
- Make QR code scanner take 85% of the screen
10+
- Long press a QR code to show it full screen
11+
12+
### Fixed
13+
- Remove PIN character limit for Trezor One
14+
- Hide Denomination & Exchange dialog for watch-only multisig
15+
- Fix 2FA threshold with empty string
16+
- Fixes on denomination behaviors
17+
- Fix receive address ellipsize middle
18+
619
## [4.0.8] - 2023-06-09
720

821
### Changed

green/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ android {
4242
defaultConfig {
4343
minSdk = 23
4444
targetSdk = 33
45-
versionCode = 408
46-
versionName = "4.0.8"
45+
versionCode = 409
46+
versionName = "4.0.9"
4747
setProperty("archivesBaseName", "BlockstreamGreen-v$versionName")
4848

4949
testApplicationId = "com.blockstream.green.test"

green/src/main/java/com/blockstream/green/gdk/GdkSession.kt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import kotlinx.serialization.json.put
5252
import kotlinx.serialization.json.putJsonArray
5353
import mu.KLogging
5454
import java.io.File
55+
import java.lang.Long.max
5556
import java.net.URL
5657
import kotlin.math.absoluteValue
5758
import kotlin.properties.Delegates
@@ -1596,11 +1597,20 @@ class GdkSession constructor(
15961597
}
15971598

15981599
}else{
1599-
gdkBridge.getFeeEstimates(gdkSession(network))
1600+
gdkBridge.getFeeEstimates(gdkSession(network)).let {
1601+
// Temp fix
1602+
if(network.isSinglesig && network.isLiquid) {
1603+
FeeEstimation(it.fees.map { fee ->
1604+
max(100L, fee)
1605+
})
1606+
}else{
1607+
it
1608+
}
1609+
}
16001610
}
16011611
} catch (e: Exception) {
16021612
e.printStackTrace()
1603-
FeeEstimation(fees = listOf(network.defaultFee))
1613+
FeeEstimation(fees = mutableListOf(network.defaultFee))
16041614
}
16051615

16061616
fun getTransactions(account: Account, params: TransactionParams = TransactionParams(subaccount = 0)) = (if (account.network.isLightning) {

green/src/main/res/layout/rename_account_bottom_sheet.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
android:hint="@string/id_account_name"
5050
android:layout_marginStart="24dp"
5151
android:layout_marginEnd="24dp"
52+
app:endIconMode="clear_text"
5253
app:layout_constraintEnd_toEndOf="parent"
5354
app:layout_constraintStart_toStartOf="parent"
5455
app:layout_constraintTop_toBottomOf="@id/title">

tag_release.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ check_command sed
5858
# --- Execution
5959
printf "\nUpdating versionCode & VersionName...\n\n"
6060

61-
currentVersionCode=`awk '/ versionCode / {print $2}' $GRADLE_BUILD_FILE`
61+
currentVersionCode=`awk '/ versionCode = / {print $3}' $GRADLE_BUILD_FILE`
6262
newVersionCode=$(($currentVersionCode + 1))
6363

64-
sed -i '' -e "s/versionCode .*/versionCode ${newVersionCode}/" $GRADLE_BUILD_FILE`
65-
sed -i '' -e "s/versionName .*/versionName \"${VERSION_NAME}\"/" $GRADLE_BUILD_FILE`
64+
sed -i '' -e "s/versionCode = .*/versionCode = ${newVersionCode}/" $GRADLE_BUILD_FILE`
65+
sed -i '' -e "s/versionName = .*/versionName = \"${VERSION_NAME}\"/" $GRADLE_BUILD_FILE`
6666

6767
printf "* versionCode: \t${newVersionCode}\n"
6868
printf "* versionName: \t${VERSION_NAME}\n"

0 commit comments

Comments
 (0)