Skip to content

Commit a397c56

Browse files
julian-CStackjulian-CStack
authored
Merge branch 'staging' into patch-1
2 parents 099a3a8 + a521b2a commit a397c56

17 files changed

Lines changed: 571 additions & 544 deletions

File tree

‎.github/workflows/build.yaml‎

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,14 @@ jobs:
1919

2020
build-linux:
2121
runs-on: ubuntu-24.04
22+
permissions:
23+
contents: read
24+
packages: read
2225
container:
23-
image: stackwallet/stackwallet-ci:latest
26+
image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:latest
2427
credentials:
25-
username: ${{ secrets.DOCKERHUB_USERNAME }}
26-
password: ${{ secrets.DOCKERHUB_TOKEN }}
28+
username: ${{ github.actor }}
29+
password: ${{ github.token }}
2730
steps:
2831
- uses: actions/checkout@v6
2932
with:
@@ -76,7 +79,7 @@ jobs:
7679
- name: Build
7780
env:
7881
USE_SYSTEM_SECURE_STORAGE_DEPS: "1"
79-
run: flutter build linux --release
82+
run: flutter build linux --release --verbose
8083

8184
- name: Package
8285
run: |
@@ -90,11 +93,14 @@ jobs:
9093

9194
build-android:
9295
runs-on: ubuntu-24.04
96+
permissions:
97+
contents: read
98+
packages: read
9399
container:
94-
image: stackwallet/stackwallet-ci:latest
100+
image: ghcr.io/${{ github.repository_owner }}/stackwallet-ci:latest
95101
credentials:
96-
username: ${{ secrets.DOCKERHUB_USERNAME }}
97-
password: ${{ secrets.DOCKERHUB_TOKEN }}
102+
username: ${{ github.actor }}
103+
password: ${{ github.token }}
98104
steps:
99105
- uses: actions/checkout@v6
100106
with:
@@ -186,7 +192,7 @@ jobs:
186192
path: android-artifacts/
187193

188194
build-windows:
189-
runs-on: windows-latest
195+
runs-on: windows-2022
190196
defaults:
191197
run:
192198
shell: bash
@@ -215,6 +221,13 @@ jobs:
215221
flutter-version: '3.38.1'
216222
channel: 'stable'
217223

224+
- uses: actions/setup-go@v5
225+
with:
226+
go-version: '1.24.13'
227+
228+
- name: Flutter doctor
229+
run: flutter doctor -v
230+
218231
- name: Configure app
219232
run: |
220233
cd scripts
@@ -244,6 +257,9 @@ jobs:
244257
CHANGE_NOW: ${{ secrets.CHANGE_NOW }}
245258
run: echo "$CHANGE_NOW" | base64 --decode > lib/external_api_keys.dart
246259

260+
- name: Build secp256k1.dll for Windows
261+
run: dart run coinlib:build_windows
262+
247263
- name: Build
248264
run: flutter build windows --release
249265

@@ -285,6 +301,10 @@ jobs:
285301
flutter-version: '3.38.1'
286302
channel: 'stable'
287303

304+
- uses: actions/setup-go@v5
305+
with:
306+
go-version: '1.24.13'
307+
288308
- name: Configure app
289309
run: |
290310
cd scripts
@@ -355,11 +375,20 @@ jobs:
355375
toolchain: '1.71.0'
356376
targets: aarch64-apple-ios
357377

378+
- uses: dtolnay/rust-toolchain@master
379+
with:
380+
toolchain: stable
381+
targets: aarch64-apple-ios
382+
358383
- uses: subosito/flutter-action@v2
359384
with:
360385
flutter-version: '3.38.1'
361386
channel: 'stable'
362387

388+
- uses: actions/setup-go@v5
389+
with:
390+
go-version: '1.24.13'
391+
363392
- name: Configure app
364393
run: |
365394
cd scripts

‎Dockerfile‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ ENV RUSTUP_HOME=/usr/local/rustup \
3333

3434
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
3535
| sh -s -- -y --default-toolchain 1.89.0 --profile minimal --no-modify-path \
36-
&& rustup install 1.85.1 1.71.0 --profile minimal \
36+
&& rustup install 1.85.1 1.71.0 stable --profile minimal \
3737
&& rustup target add x86_64-unknown-linux-gnu --toolchain 1.89.0 \
3838
&& cargo install cargo-ndk \
3939
&& chmod -R a+rwX "$CARGO_HOME" "$RUSTUP_HOME"
@@ -67,6 +67,13 @@ RUN mkdir -p "$ANDROID_SDK_ROOT/cmdline-tools" \
6767
"ndk;28.2.13676358" \
6868
&& chmod -R a+rwX "$ANDROID_SDK_ROOT"
6969

70+
ENV PATH=/usr/local/go/bin:$PATH
71+
72+
RUN curl -fsSL https://go.dev/dl/go1.24.13.linux-amd64.tar.gz -o /tmp/go.tar.gz \
73+
&& echo "1fc94b57134d51669c72173ad5d49fd62afb0f1db9bf3f798fd98ee423f8d730 /tmp/go.tar.gz" | sha256sum -c \
74+
&& tar -C /usr/local -xzf /tmp/go.tar.gz \
75+
&& rm /tmp/go.tar.gz
76+
7077
ENV FLUTTER_HOME=/opt/flutter \
7178
PATH=/opt/flutter/bin:/opt/flutter/bin/cache/dart-sdk/bin:$PATH
7279

@@ -78,7 +85,7 @@ RUN git clone --depth 1 --branch 3.38.1 https://github.com/flutter/flutter.git "
7885

7986
RUN git config --system --add safe.directory '*'
8087

81-
RUN flutter --version && rustc --version && cargo --version && node --version
88+
RUN flutter --version && rustc --version && cargo --version && node --version && go version
8289

8390

8491
# Minimal image for flutter test (no Rust, no Android SDK, no cross-compilers)

‎crypto_plugins/flutter_libepiccash‎

‎crypto_plugins/flutter_libmwc‎

‎crypto_plugins/frostdart‎

‎lib/pages/cakepay/cakepay_orders_view.dart‎

Lines changed: 12 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -67,60 +67,6 @@ class _CakePayOrdersViewState extends State<CakePayOrdersView> {
6767
}
6868
}
6969

70-
String _statusLabel(CakePayOrderStatus status) {
71-
switch (status) {
72-
case CakePayOrderStatus.new_:
73-
return "New";
74-
case CakePayOrderStatus.expiredButStillPending:
75-
return "Expired (pending)";
76-
case CakePayOrderStatus.expired:
77-
return "Expired";
78-
case CakePayOrderStatus.failed:
79-
return "Failed";
80-
case CakePayOrderStatus.paid:
81-
return "Paid";
82-
case CakePayOrderStatus.paidPartial:
83-
return "Partially paid";
84-
case CakePayOrderStatus.pendingPurchase:
85-
return "Pending purchase";
86-
case CakePayOrderStatus.purchaseProcessing:
87-
return "Processing";
88-
case CakePayOrderStatus.purchased:
89-
return "Purchased";
90-
case CakePayOrderStatus.pendingEmail:
91-
return "Pending email";
92-
case CakePayOrderStatus.complete:
93-
return "Complete";
94-
case CakePayOrderStatus.pendingRefund:
95-
return "Pending refund";
96-
case CakePayOrderStatus.refunded:
97-
return "Refunded";
98-
}
99-
}
100-
101-
Color _statusColor(BuildContext context, CakePayOrderStatus status) {
102-
final colors = Theme.of(context).extension<StackColors>()!;
103-
switch (status) {
104-
case CakePayOrderStatus.complete:
105-
case CakePayOrderStatus.purchased:
106-
return colors.accentColorGreen;
107-
case CakePayOrderStatus.new_:
108-
case CakePayOrderStatus.paid:
109-
case CakePayOrderStatus.paidPartial:
110-
return colors.accentColorBlue;
111-
case CakePayOrderStatus.pendingPurchase:
112-
case CakePayOrderStatus.purchaseProcessing:
113-
case CakePayOrderStatus.pendingEmail:
114-
case CakePayOrderStatus.expiredButStillPending:
115-
return colors.accentColorYellow;
116-
case CakePayOrderStatus.expired:
117-
case CakePayOrderStatus.failed:
118-
case CakePayOrderStatus.pendingRefund:
119-
case CakePayOrderStatus.refunded:
120-
return colors.textSubtitle1;
121-
}
122-
}
123-
12470
@override
12571
Widget build(BuildContext context) {
12672
final isDesktop = Util.isDesktop;
@@ -181,13 +127,16 @@ class _CakePayOrdersViewState extends State<CakePayOrdersView> {
181127
),
182128
decoration: BoxDecoration(
183129
borderRadius: BorderRadius.circular(8),
184-
color: _statusColor(
185-
context,
186-
order.status,
187-
).withValues(alpha: 0.2),
130+
color: order.status
131+
.color(
132+
Theme.of(
133+
context,
134+
).extension<StackColors>()!,
135+
)
136+
.withValues(alpha: 0.2),
188137
),
189138
child: Text(
190-
_statusLabel(order.status),
139+
order.status.label,
191140
style:
192141
(isDesktop
193142
? STextStyles.desktopTextExtraExtraSmall(
@@ -197,9 +146,10 @@ class _CakePayOrdersViewState extends State<CakePayOrdersView> {
197146
context,
198147
))
199148
.copyWith(
200-
color: _statusColor(
201-
context,
202-
order.status,
149+
color: order.status.color(
150+
Theme.of(
151+
context,
152+
).extension<StackColors>()!,
203153
),
204154
),
205155
),

0 commit comments

Comments
 (0)