Skip to content

Integrate new design mockup with ViewModel #2653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 64 commits into
base: new-design
Choose a base branch
from
Open

Integrate new design mockup with ViewModel #2653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
ec34b0f
feat: add Lightning Network support for Bitcoin wallets
konstantinullrich Oct 29, 2025
288085f
refactor: rename `fiatConvertationStore` to `fiatConversionStore` for…
konstantinullrich Oct 29, 2025
068adee
feat: enhance address validation with Lightning Network invoice suppo…
konstantinullrich Oct 30, 2025
9cccb6d
feat: add support for Lightning invoice detection, refactor MWEB depo…
konstantinullrich Oct 31, 2025
773a062
feat: add method to retrieve unused Spark deposit address for Bitcoin…
konstantinullrich Oct 31, 2025
3451969
feat: add Breez API key support and update secrets handling for Bitco…
konstantinullrich Oct 31, 2025
b06aea3
chore: update Breez SDK dependency to version 0.3.4 in pubspec files
konstantinullrich Oct 31, 2025
e11f468
Add bitcoin secrets config [skip ci]
OmarHatem28 Nov 1, 2025
0273df7
feat: extend Lightning wallet functionality with transaction history …
konstantinullrich Nov 3, 2025
3f507e5
feat: add LNURL-pay address detection and support in address parsing …
konstantinullrich Nov 4, 2025
3b139de
refactor: simplify `ReceivePageOption` logic
konstantinullrich Nov 4, 2025
0c0b04c
refactor: centralize `PaymentURI` generation logic across wallet types
konstantinullrich Nov 4, 2025
1d8c612
feat: enhance `PaymentURI` handling with asynchronous support and Lig…
konstantinullrich Nov 4, 2025
eedd44e
refactor: streamline `PaymentURI` logic and remove redundant URI impl…
konstantinullrich Nov 4, 2025
008f2af
refactor: remove redundant debug print statement from `bitcoin_wallet…
konstantinullrich Nov 4, 2025
db80ebf
refactor: improve consistency in widget styling and centralized label…
konstantinullrich Nov 5, 2025
37bf40d
feat: reload balance and tx history after sending a lightning transac…
konstantinullrich Nov 5, 2025
fda146c
feat: improve address formatting for human-readable addresses and upd…
konstantinullrich Nov 6, 2025
0ee2d9f
fix: merge conflicts
konstantinullrich Nov 6, 2025
c28e513
feat: add error handling for LightningWallet initialization and adjus…
konstantinullrich Nov 7, 2025
1fea406
integrate homepage from new ui mockup
malik1004x Nov 16, 2025
c5399af
fix import
malik1004x Nov 16, 2025
c92afe6
feat: add Lightning Network support for Bitcoin wallets
konstantinullrich Oct 29, 2025
c03783e
refactor: rename `fiatConvertationStore` to `fiatConversionStore` for…
konstantinullrich Oct 29, 2025
7e26e84
feat: enhance address validation with Lightning Network invoice suppo…
konstantinullrich Oct 30, 2025
ab6d724
feat: add support for Lightning invoice detection, refactor MWEB depo…
konstantinullrich Oct 31, 2025
ad0686e
feat: add method to retrieve unused Spark deposit address for Bitcoin…
konstantinullrich Oct 31, 2025
5995afb
feat: add Breez API key support and update secrets handling for Bitco…
konstantinullrich Oct 31, 2025
7ab3997
chore: update Breez SDK dependency to version 0.3.4 in pubspec files
konstantinullrich Oct 31, 2025
c02775d
Add bitcoin secrets config [skip ci]
OmarHatem28 Nov 1, 2025
a33a375
feat: extend Lightning wallet functionality with transaction history …
konstantinullrich Nov 3, 2025
2c311c9
feat: add LNURL-pay address detection and support in address parsing …
konstantinullrich Nov 4, 2025
9ac2850
refactor: simplify `ReceivePageOption` logic
konstantinullrich Nov 4, 2025
b0baf54
refactor: centralize `PaymentURI` generation logic across wallet types
konstantinullrich Nov 4, 2025
689c56e
feat: enhance `PaymentURI` handling with asynchronous support and Lig…
konstantinullrich Nov 4, 2025
e0932b4
refactor: streamline `PaymentURI` logic and remove redundant URI impl…
konstantinullrich Nov 4, 2025
21b4ad1
refactor: remove redundant debug print statement from `bitcoin_wallet…
konstantinullrich Nov 4, 2025
193a260
refactor: improve consistency in widget styling and centralized label…
konstantinullrich Nov 5, 2025
5ac24a9
feat: reload balance and tx history after sending a lightning transac…
konstantinullrich Nov 5, 2025
b78ee5b
feat: improve address formatting for human-readable addresses and upd…
konstantinullrich Nov 6, 2025
f40f950
fix: merge conflicts
konstantinullrich Nov 6, 2025
5357efb
feat: add error handling for LightningWallet initialization and adjus…
konstantinullrich Nov 7, 2025
14e7ed3
integrate homepage from new ui mockup
malik1004x Nov 16, 2025
b60abec
fix import
malik1004x Nov 16, 2025
fda0e27
Merge remote-tracking branch 'origin/new-design-mockup-integration' i…
malik1004x Nov 16, 2025
dbd0e05
add new-ui dir to pubspec_base
malik1004x Nov 16, 2025
564f193
minor layout fixes
malik1004x Nov 16, 2025
1041199
cleanup navbar logic
malik1004x Nov 16, 2025
cd8d43a
Modify navbar behaviour
tuxpizza Nov 17, 2025
fd25cab
smooth color change when selecting navbar options
malik1004x Nov 17, 2025
37b08b6
open old ui pages with new ui action buttons
malik1004x Nov 19, 2025
ac1e0e6
feat: working navbar in new ui
malik1004x Nov 19, 2025
b94a867
fix: minor sizing tweaks
malik1004x Nov 20, 2025
e033f06
CW-1266-integrate-bitcoin-lightning-through-spark-sdk (#2623)
konstantinullrich Nov 20, 2025
4ff35dd
Merge branch 'new-design' into new-design-mockup-integration
OmarHatem28 Nov 20, 2025
bdfbbc4
remove old code [skip ci]
OmarHatem28 Nov 20, 2025
102ca90
fix: page widgets rebuilt every time
malik1004x Nov 21, 2025
b1c9773
chore: formatting
malik1004x Nov 21, 2025
f8e78e4
remove unused navbar
malik1004x Nov 21, 2025
d97b0db
fix: lightning balance on balance card in lightning mode
malik1004x Nov 21, 2025
2c5f6cf
fix: return if uri == null
malik1004x Nov 21, 2025
8ca44cd
feat: trade history in new ui
malik1004x Nov 24, 2025
1d15b8e
feat: enhance balance model with secondary asset handling
konstantinullrich Nov 26, 2025
048d521
feat: unique card colors and icons for coins
malik1004x Nov 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/automated_integration_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:
- name: Add secrets
run: |
touch lib/.secrets.g.dart
touch cw_bitcoin/lib/.secrets.g.dart
touch cw_evm/lib/.secrets.g.dart
touch cw_solana/lib/.secrets.g.dart
touch cw_core/lib/.secrets.g.dart
Expand Down Expand Up @@ -130,6 +131,7 @@ jobs:
echo "const etherScanApiKey = '${{ secrets.ETHER_SCAN_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
echo "const moralisApiKey = '${{ secrets.MORALIS_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
echo "const nowNodesApiKey = '${{ secrets.EVM_NOWNODES_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
echo "const breezApiKey = '${{ secrets.BREEZ_API_KEY }}';" >> cw_bitcoin/lib/.secrets.g.dart
echo "const chatwootWebsiteToken = '${{ secrets.CHATWOOT_WEBSITE_TOKEN }}';" >> lib/.secrets.g.dart
echo "const exolixCakeWalletApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
echo "const exolixMoneroApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/pr_test_build_android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ jobs:
- name: Add secrets
run: |
touch lib/.secrets.g.dart
touch cw_bitcoin/lib/.secrets.g.dart
touch cw_evm/lib/.secrets.g.dart
touch cw_solana/lib/.secrets.g.dart
touch cw_core/lib/.secrets.g.dart
Expand Down Expand Up @@ -124,6 +125,7 @@ jobs:
echo "const etherScanApiKey = '${{ secrets.ETHER_SCAN_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
echo "const moralisApiKey = '${{ secrets.MORALIS_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
echo "const nowNodesApiKey = '${{ secrets.EVM_NOWNODES_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
echo "const breezApiKey = '${{ secrets.BREEZ_API_KEY }}';" >> cw_bitcoin/lib/.secrets.g.dart
echo "const chatwootWebsiteToken = '${{ secrets.CHATWOOT_WEBSITE_TOKEN }}';" >> lib/.secrets.g.dart
echo "const exolixCakeWalletApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
echo "const exolixMoneroApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
Expand Down Expand Up @@ -340,4 +342,4 @@ jobs:
cd build/app/outputs/flutter-apk
for i in arm64-v8a x86_64; do
../../../../scripts/android/check_16kb_align.sh app-$i-release.apk
done
done
2 changes: 2 additions & 0 deletions .github/workflows/pr_test_build_linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ jobs:
- name: Add secrets
run: |
touch lib/.secrets.g.dart
touch cw_bitcoin/lib/.secrets.g.dart
touch cw_evm/lib/.secrets.g.dart
touch cw_solana/lib/.secrets.g.dart
touch cw_core/lib/.secrets.g.dart
Expand Down Expand Up @@ -117,6 +118,7 @@ jobs:
echo "const etherScanApiKey = '${{ secrets.ETHER_SCAN_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
echo "const moralisApiKey = '${{ secrets.MORALIS_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
echo "const nowNodesApiKey = '${{ secrets.EVM_NOWNODES_API_KEY }}';" >> cw_evm/lib/.secrets.g.dart
echo "const breezApiKey = '${{ secrets.BREEZ_API_KEY }}';" >> cw_bitcoin/lib/.secrets.g.dart
echo "const chatwootWebsiteToken = '${{ secrets.CHATWOOT_WEBSITE_TOKEN }}';" >> lib/.secrets.g.dart
echo "const exolixCakeWalletApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
echo "const exolixMoneroApiKey = '${{ secrets.EXOLIX_API_KEY }}';" >> lib/.secrets.g.dart
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ android/app/key.jks
**/tool/.solana-secrets-config.json
**/tool/.nano-secrets-config.json
**/tool/.tron-secrets-config.json
**/tool/.bitcoin-secrets-config.json
**/lib/.secrets.g.dart
**/cw_evm/lib/.secrets.g.dart
**/cw_solana/lib/.secrets.g.dart
Expand Down
Binary file added assets/fonts/WixMadeforText-VariableFont_wght.ttf
View file
Open in desktop
Binary file not shown.
5 changes: 5 additions & 0 deletions assets/images/btc_chain_qr_lightning.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 46 additions & 0 deletions assets/images/lightning-icon.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions assets/new-ui/3dots.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading