Skip to content

Commit c33ef54

Browse files
committed
Resolve merge conflict in banking screen
- Combine both versions of the burn functionality - Use unique transaction hash generation - Keep burnAmount.toInt() conversion for type safety - Include proof hash in success message - Remove sensitive data clearing (not applicable here)
2 parents f6c9d27 + 9c3f8c7 commit c33ef54

File tree

13 files changed

+2452
-55
lines changed

13 files changed

+2452
-55
lines changed

.github/workflows/flutter-desktop.yml

Lines changed: 32 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,18 @@ jobs:
4747
- name: Enable macOS desktop support
4848
run: flutter config --enable-macos-desktop
4949

50-
- name: Download xfg-stark-cli
51-
run: |
52-
curl -L -o xfg-stark-cli-macos "https://github.com/ColinRitman/xfgwin/releases/download/v0.8.8/xfg-stark-cli-macos"
53-
chmod +x xfg-stark-cli-macos
54-
mkdir -p assets/bin
55-
mv xfg-stark-cli-macos assets/bin/
50+
- name: Download required binaries
51+
run: ./scripts/ensure-binaries.sh
5652

5753
- name: Install dependencies
5854
run: flutter pub get
5955

56+
- name: Run tests
57+
run: flutter test
58+
59+
- name: Analyze code
60+
run: flutter analyze
61+
6062
- name: Build macOS desktop app
6163
run: flutter build macos --release
6264

@@ -97,15 +99,18 @@ jobs:
9799
- name: Enable Windows desktop support
98100
run: flutter config --enable-windows-desktop
99101

100-
- name: Download xfg-stark-cli
101-
run: |
102-
curl -L -o xfg-stark-cli-windows.exe "https://github.com/ColinRitman/xfgwin/releases/download/v0.8.8/xfg-stark-cli-windows.exe"
103-
New-Item -ItemType Directory -Force -Path assets\bin
104-
Move-Item xfg-stark-cli-windows.exe assets\bin\xfg-stark-cli.exe
102+
- name: Download required binaries
103+
run: ./scripts/ensure-binaries.sh
105104

106105
- name: Install dependencies
107106
run: flutter pub get
108107

108+
- name: Run tests
109+
run: flutter test
110+
111+
- name: Analyze code
112+
run: flutter analyze
113+
109114
- name: Build Windows desktop app
110115
run: flutter build windows --release
111116

@@ -166,6 +171,12 @@ jobs:
166171
- name: Install dependencies
167172
run: flutter pub get
168173

174+
- name: Run tests
175+
run: flutter test
176+
177+
- name: Analyze code
178+
run: flutter analyze
179+
169180
- name: Build Linux desktop app (GLIBC 2.35)
170181
run: |
171182
flutter build linux --release
@@ -198,48 +209,12 @@ jobs:
198209
- name: Upload to Release
199210
if: github.event_name == 'release'
200211
uses: softprops/action-gh-release@v1
212+
env:
213+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
201214
with:
202215
files: build/linux/x64/release/bundle/XF₲-Wallet-Linux-GLIBC-2.31.tar.gz
203216
name: XF₲-Wallet-Linux-GLIBC-2.31.tar.gz
204217

205-
- name: Create AppImage (GLIBC 2.35)
206-
run: |
207-
cd build/linux/x64/release/bundle
208-
# Download appimagetool
209-
curl -LO https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
210-
chmod +x appimagetool-x86_64.AppImage
211-
# Create desktop file for AppImage
212-
cat > XF₲-Wallet.desktop << 'EOF'
213-
[Desktop Entry]
214-
Type=Application
215-
Name=XF₲ Wallet
216-
Comment=Privacy-focused cryptocurrency wallet
217-
Exec=fuego_wallet
218-
Icon=fuego_wallet
219-
Categories=Finance;
220-
EOF
221-
# Copy icon file
222-
cp ../../../../../app_icon_256.png fuego_wallet.png
223-
# Create AppImage (using extraction to avoid FUSE)
224-
./appimagetool-x86_64.AppImage --appimage-extract
225-
./squashfs-root/AppRun . XF₲-Wallet-Linux-GLIBC-2.35.AppImage
226-
# Clean up
227-
rm -f appimagetool-x86_64.AppImage
228-
229-
- name: Upload AppImage artifacts
230-
uses: actions/upload-artifact@v4
231-
with:
232-
name: xfg-wallet-linux-glibc-235-appimage
233-
path: build/linux/x64/release/bundle/XF₲-Wallet-Linux-GLIBC-2.35.AppImage
234-
retention-days: 30
235-
236-
- name: Upload AppImage to Release
237-
if: github.event_name == 'release'
238-
uses: softprops/action-gh-release@v1
239-
with:
240-
files: build/linux/x64/release/bundle/XF₲-Wallet-Linux-GLIBC-2.35.AppImage
241-
name: XF₲-Wallet-Linux-GLIBC-2.35.AppImage
242-
243218

244219
build-linux-latest:
245220
name: Build XF₲ Wallet (Linux - Latest)
@@ -271,6 +246,12 @@ jobs:
271246
- name: Install dependencies
272247
run: flutter pub get
273248

249+
- name: Run tests
250+
run: flutter test
251+
252+
- name: Analyze code
253+
run: flutter analyze
254+
274255
- name: Build Linux desktop app (Latest)
275256
run: flutter build linux --release
276257

@@ -289,6 +270,8 @@ jobs:
289270
- name: Upload to Release
290271
if: github.event_name == 'release'
291272
uses: softprops/action-gh-release@v1
273+
env:
274+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
292275
with:
293276
files: build/linux/x64/release/bundle/XF₲-Wallet-Linux-Latest.tar.gz
294277
name: XF₲-Wallet-Linux-Latest.tar.gz

0 commit comments

Comments
 (0)