Skip to content

Commit 9a180fa

Browse files
angelixangelix
committed
Release 5.1.0
1 parent d3f666c commit 9a180fa

File tree

62 files changed

+5950
-1982
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+5950
-1982
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
44
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
55

66

7-
## [Unreleased]
7+
## [5.1.0] - 2025-10-09
88

99
#### Added
1010
- Watch-only wallets: Export or share unsigned psbt to a file and import signed psbt (pset support coming soon)

‎androidApp/build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ android {
4343
defaultConfig {
4444
minSdk = libs.versions.androidMinSdk.get().toInt()
4545
targetSdk = libs.versions.androidTargetSdk.get().toInt()
46-
versionCode = 509
47-
versionName = "5.0.9"
46+
versionCode = 510
47+
versionName = "5.1.0"
4848

4949
base.archivesName = "BlockstreamGreen-v$versionName"
5050
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")

‎androidApp/src/main/java/com/blockstream/green/di/ViewModels.kt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ import com.blockstream.common.models.lightning.RecoverFundsViewModel
2828
import com.blockstream.common.models.login.Bip39PassphraseViewModel
2929
import com.blockstream.common.models.login.LoginViewModel
3030
import com.blockstream.common.models.onboarding.SetupNewWalletViewModel
31-
import com.blockstream.common.models.onboarding.hardware.UseHardwareDeviceViewModel
32-
import com.blockstream.common.models.onboarding.phone.AddWalletViewModel
3331
import com.blockstream.common.models.onboarding.phone.EnterRecoveryPhraseViewModel
3432
import com.blockstream.common.models.onboarding.phone.PinViewModel
3533
import com.blockstream.common.models.onboarding.watchonly.WatchOnlyMultisigViewModel
@@ -82,7 +80,6 @@ val viewModels = module {
8280
viewModelOf(::AboutViewModel)
8381
viewModelOf(::DemoViewModel)
8482
viewModelOf(::SetupNewWalletViewModel)
85-
viewModelOf(::AddWalletViewModel)
8683
viewModelOf(::AppSettingsViewModel)
8784
viewModelOf(::RecoveryIntroViewModel)
8885
viewModelOf(::WalletOverviewViewModel)
@@ -105,7 +102,6 @@ val viewModels = module {
105102
viewModelOf(::TwoFactorAuthenticationViewModel)
106103
viewModelOf(::WalletAssetsViewModel)
107104
viewModelOf(::ArchivedAccountsViewModel)
108-
viewModelOf(::UseHardwareDeviceViewModel)
109105
viewModelOf(::JadeGuideViewModel)
110106
viewModelOf(::AddressesViewModel)
111107
viewModelOf(::SignMessageViewModel)

‎common/src/commonMain/composeResources/drawable/device_keys.xml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:aapt="http://schemas.android.com/aapt"
3+
android:width="221dp"
4+
android:height="152dp"
5+
android:viewportWidth="221"
6+
android:viewportHeight="152">
7+
<group>
8+
<clip-path
9+
android:pathData="M0,0h221v152h-221z"/>
10+
<path
11+
android:pathData="M18.54,136.23L47.42,141.84C48.47,142.04 49.55,142.11 50.62,142.05L193.64,133.25C199.08,132.91 203.36,128.47 203.49,123.02L205.79,24.5C205.88,20.8 203.5,17.5 199.97,16.41L170.11,7.2"
12+
android:strokeWidth="0.446466"
13+
android:fillColor="#00000000"
14+
android:strokeColor="#ffffff"/>
15+
<path
16+
android:pathData="M168.88,6.58C169.71,6.38 170.56,6.41 171.37,6.66L200.23,15.56C204.15,16.76 206.78,20.42 206.69,24.52L204.38,123.04C204.24,128.96 199.6,133.78 193.7,134.14L50.68,142.94C49.53,143.01 48.38,142.93 47.25,142.71L18.94,137.22C18.49,137.13 17.98,136.97 17.53,136.65C15.98,135.58 15.2,134.04 14.89,133.04C14.75,132.59 14.75,132.15 14.78,131.79L21.02,45.84C21.16,43.81 22.61,42.1 24.59,41.62L168.88,6.58Z"
17+
android:strokeWidth="1.78586"
18+
android:fillColor="#00183C"
19+
android:strokeColor="#ffffff"/>
20+
<path
21+
android:pathData="M15.6,131.01L21.12,49.57C21.38,45.81 24.03,42.63 27.69,41.72L166.16,7.1C170.89,5.92 175.45,9.57 175.31,14.45L172.55,115.06C172.37,121.62 167.23,126.96 160.68,127.4L21.3,136.71C18.07,136.93 15.38,134.24 15.6,131.01Z"
22+
android:strokeWidth="0.446466"
23+
android:fillColor="#00183C"
24+
android:strokeColor="#ffffff"/>
25+
<path
26+
android:pathData="M190.37,82.21L191.71,55.51C191.73,55.06 192.13,54.73 192.57,54.8L194.94,55.16C194.99,55.17 195.04,55.18 195.09,55.2C195.78,55.46 197.05,55.93 197.15,55.93C197.24,55.93 197.78,56.73 198.09,57.21C198.13,57.28 198.16,57.35 198.18,57.42L198.5,58.58C198.52,58.65 198.53,58.73 198.53,58.8L197.9,84.18L197.68,85.74C197.66,85.87 197.61,85.99 197.53,86.1L196.88,86.93C196.81,87.02 196.71,87.1 196.6,87.15L195.35,87.73C195.21,87.79 195.06,87.81 194.91,87.79L193.7,87.6C193.57,87.58 193.45,87.53 193.35,87.45L191.86,86.28C191.79,86.22 191.72,86.15 191.68,86.06L190.81,84.55C190.77,84.47 190.74,84.39 190.72,84.3L190.38,82.38C190.37,82.33 190.37,82.27 190.37,82.21Z"
27+
android:fillColor="#00183C"/>
28+
<path
29+
android:pathData="M191.73,54.64L195.91,55.43C196.19,55.48 196.47,55.56 196.71,55.7C197.91,56.4 198.65,57.7 198.6,59.1L197.8,84.73C197.74,86.72 195.88,88.16 193.94,87.73M200.9,83.91L201.42,55.11C201.45,53.38 200.32,51.86 198.66,51.39L196.57,50.8C194.22,50.14 191.87,51.82 191.75,54.26L190.35,81.91C190.2,84.85 192.2,87.47 195.08,88.1L195.49,88.19C198.24,88.79 200.85,86.72 200.9,83.91ZM143.61,97.16L160.6,94.62C162.42,94.35 163.78,92.81 163.83,90.97L165.18,40.73C165.25,38.27 162.98,36.4 160.58,36.92L144.18,40.51C142.49,40.88 141.27,42.34 141.2,44.06L139.26,93.25C139.17,95.63 141.26,97.51 143.61,97.16Z"
30+
android:strokeWidth="0.446466"
31+
android:fillColor="#00000000"
32+
android:strokeColor="#ffffff"/>
33+
<path
34+
android:pathData="M70.72,136.7L91.71,139.49C92.31,139.57 92.28,140.46 91.67,140.49L49.32,142.93C49,142.94 48.68,142.92 48.37,142.86L35.47,140.33C35.43,140.32 35.38,140.31 35.34,140.29C34.59,140 34.76,138.89 35.57,138.84L69.98,136.67C70.23,136.66 70.48,136.66 70.72,136.7Z"
35+
android:strokeWidth="0.446466"
36+
android:fillColor="#00183C"
37+
android:strokeColor="#ffffff"/>
38+
<path
39+
android:pathData="M142.36,135.38L137.24,133.93C136.76,133.79 136.83,133.09 137.34,133.05L152.22,132.13C152.54,132.11 152.85,132.13 153.17,132.19L160.4,133.56C160.91,133.66 160.86,134.41 160.34,134.45L143.64,135.52C143.21,135.55 142.77,135.5 142.36,135.38Z"
40+
android:strokeWidth="0.446466"
41+
android:fillColor="#00000000"
42+
android:strokeColor="#ffffff"/>
43+
<path
44+
android:pathData="M43.68,142.85L76.94,95.76L123.18,27.88L45.6,46.17L3.34,57.05L43.68,142.85Z"
45+
android:strokeAlpha="0.6"
46+
android:fillAlpha="0.6">
47+
<aapt:attr name="android:fillColor">
48+
<gradient
49+
android:startX="33.95"
50+
android:startY="98.89"
51+
android:endX="89.67"
52+
android:endY="64.07"
53+
android:type="linear">
54+
<item android:offset="0" android:color="#0000BCFF"/>
55+
<item android:offset="0.27" android:color="#3300BCFF"/>
56+
<item android:offset="1" android:color="#7F00BCFF"/>
57+
</gradient>
58+
</aapt:attr>
59+
</path>
60+
</group>
61+
</vector>

‎common/src/commonMain/composeResources/drawable/phone_keys.xml‎

Lines changed: 48 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,49 @@
1-
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:aapt="http://schemas.android.com/aapt"
3-
android:width="440dp"
4-
android:height="443dp"
5-
android:viewportWidth="440"
6-
android:viewportHeight="443">
7-
<path
8-
android:pathData="M179.45,349.86L114.75,121.61C113.99,118.94 113.94,116.11 114.6,113.41L116.56,105.45L117.3,103.23C118.04,106.19 118.43,108.95 118.76,111.34C140.17,188.35 181.97,343.21 183.01,346.6C185.09,353.44 188.82,362.62 193.66,364.19C185.65,361.59 180.85,353.55 179.45,349.86Z"
9-
android:fillColor="#ffffff"/>
10-
<path
11-
android:pathData="M218.99,86.27L135.74,100.61C128.64,101.83 124.14,108.92 126.05,115.87L188.79,344.1C191.16,352.71 200.1,357.74 208.69,355.28L298.99,329.41C307.83,326.88 312.74,317.45 309.75,308.76L236.9,96.87C234.34,89.42 226.75,84.93 218.99,86.27Z"
12-
android:strokeWidth="0.642036"
13-
android:fillColor="#00183C"
14-
android:strokeColor="#ffffff"/>
15-
<path
16-
android:pathData="M220.98,80.44L128.75,96.39C121.32,97.67 116.62,105.09 118.63,112.35L184.85,351.62C187.33,360.6 196.64,365.83 205.6,363.29L306.67,334.6C315.99,331.95 321.14,321.99 317.91,312.86L239.66,91.38C236.93,83.67 229.04,79.04 220.98,80.44Z"
17-
android:strokeWidth="4.44828"
18-
android:fillColor="#00000000"
19-
android:strokeColor="#ffffff"/>
20-
<path
21-
android:pathData="M200.58,106.16L171.4,111.35C169.17,111.75 167.01,110.33 166.5,108.11C165.95,105.73 167.52,103.37 169.93,102.95L199.14,97.92C201.2,97.56 203.2,98.78 203.84,100.76C204.61,103.18 203.08,105.72 200.58,106.16Z"
22-
android:strokeWidth="0.642036"
23-
android:fillColor="#00000000"
24-
android:strokeColor="#ffffff"/>
25-
<group>
26-
<clip-path
27-
android:pathData="M222.62,100.38l116.82,20.6l-20.6,116.82l-116.82,-20.6z"/>
28-
<path
29-
android:pathData="M255.26,163.92C254.37,159.76 254.29,155.46 255.05,151.27C256.2,144.77 259.24,138.76 263.8,133.99C268.37,129.23 274.24,125.92 280.68,124.49C287.13,123.06 293.85,123.58 300,125.97C306.15,128.36 311.45,132.52 315.23,137.93C319.02,143.33 321.11,149.74 321.26,156.34C321.4,162.93 319.59,169.42 316.04,174.99C312.5,180.55 307.38,184.94 301.34,187.6C295.3,190.26 288.61,191.06 282.11,189.92C277.92,189.19 273.9,187.66 270.3,185.39L263.21,190.35L252.26,188.42L250.33,199.37L239.38,197.44L237.45,208.39L219.2,205.17L222.41,186.92L255.26,163.92Z"
30-
android:strokeLineJoin="round"
31-
android:strokeWidth="3.05448"
32-
android:fillColor="#00183C"
33-
android:strokeColor="#ffffff"
34-
android:strokeLineCap="round"/>
35-
<path
36-
android:pathData="M298,153.2C300.01,153.55 301.94,152.21 302.29,150.19C302.65,148.17 301.3,146.25 299.28,145.9C297.27,145.54 295.35,146.88 294.99,148.9C294.64,150.92 295.98,152.84 298,153.2Z"
37-
android:fillColor="#ffffff"/>
38-
</group>
39-
<group>
40-
<clip-path
41-
android:pathData="M221.07,147.66l114.03,-32.7l32.7,114.03l-114.03,32.7z"/>
42-
<path
43-
android:pathData="M278.27,190.46C275.64,187.11 273.69,183.28 272.53,179.18C270.71,172.84 270.82,166.1 272.83,159.82C274.84,153.53 278.67,147.99 283.83,143.88C289,139.77 295.26,137.29 301.84,136.74C308.42,136.19 315.01,137.61 320.78,140.81C326.55,144.01 331.24,148.85 334.26,154.71C337.28,160.58 338.5,167.21 337.75,173.76C337,180.32 334.33,186.51 330.07,191.54C325.8,196.58 320.14,200.24 313.8,202.06C309.71,203.24 305.43,203.62 301.2,203.16L297,210.73L286.31,213.79L289.38,224.48L278.69,227.55L281.75,238.24L263.94,243.35L258.83,225.53L278.27,190.46Z"
44-
android:strokeLineJoin="round"
45-
android:strokeWidth="3.05448"
46-
android:fillColor="#00183C"
47-
android:strokeColor="#ffffff"
48-
android:strokeLineCap="round"/>
49-
<path
50-
android:pathData="M311.98,162.09C313.95,161.52 315.08,159.47 314.52,157.5C313.95,155.53 311.9,154.4 309.93,154.96C307.97,155.52 306.83,157.58 307.39,159.55C307.96,161.51 310.01,162.65 311.98,162.09Z"
51-
android:fillColor="#ffffff"/>
52-
</group>
53-
<path
54-
android:pathData="M81.71,0.18L122.6,111.3L192.18,358.26L302.05,134.97L380.49,0.18L81.71,0.18Z"
55-
android:strokeAlpha="0.3"
56-
android:fillAlpha="0.3">
57-
<aapt:attr name="android:fillColor">
58-
<gradient
59-
android:startX="201.42"
60-
android:startY="2.16"
61-
android:endX="172.86"
62-
android:endY="205.41"
63-
android:type="linear">
64-
<item android:offset="0" android:color="#0000BCFF"/>
65-
<item android:offset="0.27" android:color="#3300BCFF"/>
66-
<item android:offset="1" android:color="#7F00BCFF"/>
67-
</gradient>
68-
</aapt:attr>
69-
</path>
1+
<vector xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android" android:height="200dp" android:viewportHeight="218" android:viewportWidth="255" android:width="233.94496dp">
2+
3+
<path android:fillColor="#ffffff" android:pathData="M104.09,202.23L66.74,70.47C66.3,68.93 66.27,67.3 66.66,65.74L67.78,61.14L68.21,59.86C68.64,61.57 68.87,63.16 69.05,64.54C81.42,109 105.55,198.39 106.14,200.35C107.35,204.3 109.5,209.6 112.29,210.51C107.67,209 104.9,204.36 104.09,202.23Z"/>
4+
5+
<path android:fillColor="#00183C" android:pathData="M126.92,50.07L78.86,58.35C74.76,59.05 72.16,63.14 73.27,67.15L109.49,198.91C110.85,203.88 116.01,206.78 120.97,205.36L173.1,190.43C178.2,188.96 181.03,183.52 179.31,178.51L137.26,56.19C135.78,51.89 131.4,49.3 126.92,50.07Z" android:strokeColor="#ffffff" android:strokeWidth="0.37063"/>
6+
7+
<path android:fillColor="#00000000" android:pathData="M128.06,46.7L74.82,55.91C70.53,56.65 67.82,60.93 68.98,65.13L107.21,203.25C108.64,208.43 114.02,211.45 119.19,209.99L177.54,193.42C182.91,191.9 185.88,186.15 184.02,180.88L138.85,53.02C137.27,48.57 132.72,45.9 128.06,46.7Z" android:strokeColor="#ffffff" android:strokeWidth="2.56787"/>
8+
9+
<path android:fillColor="#00000000" android:pathData="M116.29,61.55L99.45,64.55C98.16,64.78 96.91,63.96 96.62,62.68C96.3,61.3 97.2,59.94 98.6,59.7L115.46,56.79C116.64,56.59 117.8,57.29 118.17,58.44C118.61,59.83 117.73,61.3 116.29,61.55Z" android:strokeColor="#ffffff" android:strokeWidth="0.37063"/>
10+
11+
<group>
12+
13+
<clip-path android:pathData="M129.01,58.22l67.44,11.89l-11.89,67.44l-67.44,-11.89z"/>
14+
15+
<path android:fillColor="#00183C" android:pathData="M147.86,94.89C147.34,92.49 147.3,90.01 147.73,87.59C148.39,83.84 150.15,80.37 152.79,77.62C155.42,74.87 158.81,72.96 162.53,72.13C166.25,71.31 170.13,71.61 173.68,72.99C177.23,74.37 180.29,76.77 182.48,79.89C184.66,83.01 185.87,86.71 185.95,90.52C186.04,94.32 184.99,98.07 182.94,101.28C180.9,104.5 177.94,107.03 174.46,108.56C170.97,110.1 167.11,110.56 163.35,109.9C160.93,109.49 158.62,108.6 156.54,107.29L152.45,110.15L146.12,109.04L145.01,115.36L138.69,114.24L137.57,120.57L127.04,118.71L128.89,108.17L147.86,94.89Z" android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="1.76327"/>
16+
17+
<path android:fillColor="#ffffff" android:pathData="M172.53,88.7C173.69,88.91 174.8,88.13 175.01,86.97C175.21,85.8 174.43,84.69 173.27,84.49C172.1,84.28 170.99,85.06 170.79,86.23C170.59,87.39 171.36,88.5 172.53,88.7Z"/>
18+
19+
</group>
20+
21+
<group>
22+
23+
<clip-path android:pathData="M128.12,85.51l65.82,-18.87l18.87,65.82l-65.82,18.87z"/>
24+
25+
<path android:fillColor="#00183C" android:pathData="M161.14,110.21C159.62,108.28 158.49,106.07 157.83,103.71C156.78,100.04 156.84,96.15 158,92.53C159.16,88.9 161.37,85.7 164.35,83.32C167.33,80.95 170.95,79.52 174.74,79.2C178.54,78.89 182.34,79.71 185.68,81.55C189.01,83.4 191.72,86.19 193.46,89.58C195.2,92.96 195.9,96.79 195.47,100.58C195.04,104.36 193.5,107.93 191.04,110.84C188.58,113.75 185.31,115.86 181.65,116.91C179.29,117.6 176.82,117.81 174.37,117.55L171.95,121.92L165.78,123.68L167.55,129.86L161.38,131.63L163.15,137.8L152.86,140.75L149.91,130.46L161.14,110.21Z" android:strokeColor="#ffffff" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="1.76327"/>
26+
27+
<path android:fillColor="#ffffff" android:pathData="M180.6,93.84C181.73,93.51 182.39,92.33 182.06,91.19C181.74,90.05 180.55,89.4 179.42,89.72C178.28,90.05 177.62,91.23 177.95,92.37C178.27,93.51 179.46,94.16 180.6,93.84Z"/>
28+
29+
</group>
30+
31+
<path android:fillAlpha="0.3" android:pathData="M47.67,0.37L71.28,64.52L111.44,207.08L174.86,78.18L220.15,0.37L47.67,0.37Z" android:strokeAlpha="0.3">
32+
33+
<aapt:attr name="android:fillColor">
34+
35+
<gradient android:endX="100.29" android:endY="118.85" android:startX="116.78" android:startY="1.51" android:type="linear">
36+
37+
<item android:color="#0000BCFF" android:offset="0"/>
38+
39+
<item android:color="#3300BCFF" android:offset="0.27"/>
40+
41+
<item android:color="#7F00BCFF" android:offset="1"/>
42+
43+
</gradient>
44+
45+
</aapt:attr>
46+
47+
</path>
48+
7049
</vector>

0 commit comments

Comments
 (0)