From 410c496bfc64c0dfe3d2738f9f720e39cd83baeb Mon Sep 17 00:00:00 2001 From: David Adegoke <64401859+Blazebrain@users.noreply.github.com> Date: Wed, 18 Mar 2026 21:21:52 +0100 Subject: [PATCH] fix: Minor swap fixes (#3046) * Integrate new design mockup with ViewModel (#2653) * feat: add Lightning Network support for Bitcoin wallets * refactor: rename `fiatConvertationStore` to `fiatConversionStore` for consistency and update related occurrences across codebase * feat: enhance address validation with Lightning Network invoice support for BTC & refactor wallet type/token checks in view model * feat: add support for Lightning invoice detection, refactor MWEB deposit/withdraw actions, and integrate Lightning transaction creation with updated priority handling * feat: add method to retrieve unused Spark deposit address for Bitcoin wallets * feat: add Breez API key support and update secrets handling for Bitcoin Lightning wallet integration in workflows * chore: update Breez SDK dependency to version 0.3.4 in pubspec files * Add bitcoin secrets config [skip ci] * feat: extend Lightning wallet functionality with transaction history fetching * feat: add LNURL-pay address detection and support in address parsing flow for Bitcoin Lightning integration * refactor: simplify `ReceivePageOption` logic * refactor: centralize `PaymentURI` generation logic across wallet types * feat: enhance `PaymentURI` handling with asynchronous support and Lightning-specific functionality * refactor: streamline `PaymentURI` logic and remove redundant URI implementations across wallet types * refactor: remove redundant debug print statement from `bitcoin_wallet_addresses.dart` * refactor: improve consistency in widget styling and centralized label logic, add Bitcoin Lightning deposit/withdraw support * feat: reload balance and tx history after sending a lightning transaction * feat: improve address formatting for human-readable addresses and update the default LNURL domain * fix: merge conflicts * feat: add error handling for LightningWallet initialization and adjust transaction direction logic * integrate homepage from new ui mockup * fix import * feat: add Lightning Network support for Bitcoin wallets * refactor: rename `fiatConvertationStore` to `fiatConversionStore` for consistency and update related occurrences across codebase * feat: enhance address validation with Lightning Network invoice support for BTC & refactor wallet type/token checks in view model * feat: add support for Lightning invoice detection, refactor MWEB deposit/withdraw actions, and integrate Lightning transaction creation with updated priority handling * feat: add method to retrieve unused Spark deposit address for Bitcoin wallets * feat: add Breez API key support and update secrets handling for Bitcoin Lightning wallet integration in workflows * chore: update Breez SDK dependency to version 0.3.4 in pubspec files * Add bitcoin secrets config [skip ci] * feat: extend Lightning wallet functionality with transaction history fetching * feat: add LNURL-pay address detection and support in address parsing flow for Bitcoin Lightning integration * refactor: simplify `ReceivePageOption` logic * refactor: centralize `PaymentURI` generation logic across wallet types * feat: enhance `PaymentURI` handling with asynchronous support and Lightning-specific functionality * refactor: streamline `PaymentURI` logic and remove redundant URI implementations across wallet types * refactor: remove redundant debug print statement from `bitcoin_wallet_addresses.dart` * refactor: improve consistency in widget styling and centralized label logic, add Bitcoin Lightning deposit/withdraw support * feat: reload balance and tx history after sending a lightning transaction * feat: improve address formatting for human-readable addresses and update the default LNURL domain * fix: merge conflicts * feat: add error handling for LightningWallet initialization and adjust transaction direction logic * integrate homepage from new ui mockup * fix import * add new-ui dir to pubspec_base * minor layout fixes * cleanup navbar logic * Modify navbar behaviour * smooth color change when selecting navbar options * open old ui pages with new ui action buttons * feat: working navbar in new ui * fix: minor sizing tweaks * CW-1266-integrate-bitcoin-lightning-through-spark-sdk (#2623) * feat: add Lightning Network support for Bitcoin wallets * refactor: rename `fiatConvertationStore` to `fiatConversionStore` for consistency and update related occurrences across codebase * feat: enhance address validation with Lightning Network invoice support for BTC & refactor wallet type/token checks in view model * feat: add support for Lightning invoice detection, refactor MWEB deposit/withdraw actions, and integrate Lightning transaction creation with updated priority handling * feat: add method to retrieve unused Spark deposit address for Bitcoin wallets * feat: add Breez API key support and update secrets handling for Bitcoin Lightning wallet integration in workflows * chore: update Breez SDK dependency to version 0.3.4 in pubspec files * Add bitcoin secrets config [skip ci] * feat: extend Lightning wallet functionality with transaction history fetching * feat: add LNURL-pay address detection and support in address parsing flow for Bitcoin Lightning integration * refactor: simplify `ReceivePageOption` logic * refactor: centralize `PaymentURI` generation logic across wallet types * feat: enhance `PaymentURI` handling with asynchronous support and Lightning-specific functionality * refactor: streamline `PaymentURI` logic and remove redundant URI implementations across wallet types * refactor: remove redundant debug print statement from `bitcoin_wallet_addresses.dart` * refactor: improve consistency in widget styling and centralized label logic, add Bitcoin Lightning deposit/withdraw support * feat: reload balance and tx history after sending a lightning transaction * feat: improve address formatting for human-readable addresses and update the default LNURL domain * fix: merge conflicts * feat: add error handling for LightningWallet initialization and adjust transaction direction logic * feat: enable private transactions by default in LightningWallet and update Breez SDK version to 0.4.2 * minor fixes [skip ci] * chore: fix some minor issues in comments (#2654) Signed-off-by: black5box * fix: handle send-all functionality for LightningWallet transactions and adjust amount calculation logic * fix-german (#2659) * chore: update German localization strings for consistency and accuracy * chore: update German localization strings for consistency and accuracy [skip-ci] * feat: add LNURL support for address validation and LightningWallet compatibility, enhance error handling for OpenCryptoPay * fix: adjust LightningWallet amount parsing from 9 to 8 decimal places * feat: add LNURL support in LightningPaymentRequest and LightningWallet * Fix navigation gradient (#2657) * Fix navigation gradient * Fix CONFIG_ARGS formatting in app_config.sh (#2660) * fix: block wrongly parsed addresses (#2656) * fix: block wrongly parsed addresses * fix: move parsed address check into handlePaymentFlow method * fix: Handle QR URLs separately for pay anything flow * feat: add electrum seed support for Lightning * refactor: improve `parseFixed` logic and add comprehensive unit tests for edge cases (#2661) * Update cw_bitcoin/lib/bitcoin_wallet.dart [skip ci] * resolve conflict issue --------- Signed-off-by: black5box Co-authored-by: Omar Hatem Co-authored-by: black5box Co-authored-by: tuxsudo Co-authored-by: cyan Co-authored-by: David Adegoke <64401859+Blazebrain@users.noreply.github.com> * remove old code [skip ci] * fix: page widgets rebuilt every time * chore: formatting * remove unused navbar * fix: lightning balance on balance card in lightning mode * fix: return if uri == null * feat: trade history in new ui * feat: enhance balance model with secondary asset handling * feat: unique card colors and icons for coins * wip: card customization * fix: merge conflict * feat: customizable balance card * Fix some spacings and test sizing * Fix formatting * feat: add Lightning Network support for send flow and fee handling adjustments * refactor: remove unnecessary debug print statement in send flow for Lightning Network balance * feat: integrate OpenCryptoPay QR handling in send flow and improve scan action handling logic * feat: add maxDepositClaimFee parameter for Lightning wallet configuration * Switch balance card to RoundedSuperellipse and set color list to Wrap * Fix * Switch to scroll view * refactor: update navigation route from `receive` to `addressPage` in coin action row * feat: bloc-based viewmodel for card customizer * feat: mobx-independent balance card customizer vm * minor fixes * copyWith constructor for cleaner state changes * refactor: wrap `HistorySection` with `Observer` for reactive state updates, update navigation for "Buy" action, and fix incorrect balance property * feat: enhance Bitcoin receive flow with Lightning and SegWit options, update address page registration, and localize coin action labels * feat: add helper methods for Lightning and SegWit receive page options in Bitcoin configuration * feat: add Lightning transaction type handling and enable navigation to transaction details from history * Add more special card types * feat: new ui settings page * feat: add Lightning actions to balance cards, refactor card rendering logic * refactor: update settings page localization, hide unused settings items * feat: add secrets generation for cw_bitcoin, including breezApiKey * Lightning switcher animation (#2725) * Properly animate bitcoin/lightning switcher * Cleanup and fix sizing * Final cleanup * Fix action button colors (#2732) * feat: add hardware wallet type handling and improve parsed address reset flow * Refactor settings page to use generic row items (#2745) * fix android back button in settings on android, force iphone-style transitions on all platforms * move settings page to generic row impl * fix imports * Balance card fixes (#2729) * Update balance card sizing * Fix spacing * Initial font changes (#2731) * Initial font changes * More font changes * feat: integrate Lightning transaction support and improve transaction history UX - Enhanced dashboard to compute confirmations using the first and last transactions. - Updated `BitcoinWallet` to subscribe for and manage Lightning transactions. - Improved `HistoryTile` layout and introduced new leading icons for Lightning transactions. * feat: add unclaimed deposit actions and enhance Lightning event handling * release changes [skip ci] * Enhanced card customizer (#2744) * enhanced card customizer * Fix conflicts * Add missing icons + adjust spacing --------- Co-authored-by: tuxsudo * feat: enhance Lightning invoice handling and address validation - Added support for identifying non-zero amount Lightning invoices. - Refined invoice matching with updated regex patterns. - Improved UI to conditionally display addresses in sending confirmations. - Adjusted logic to handle zero-value Lightning invoices. * feat: add `isPayjoinAvailable` computed property and update Payjoin visibility logic * feat: improve Lightning wallet handling and block explorer logic * update patch version [skip ci] --------- Signed-off-by: black5box Co-authored-by: Konstantin Ullrich Co-authored-by: OmarHatem Co-authored-by: tuxsudo Co-authored-by: black5box Co-authored-by: cyan Co-authored-by: David Adegoke <64401859+Blazebrain@users.noreply.github.com> * minor new ui fixes * padding for new row separators * remove debug prints * New design improve nav bar (#2763) * tweak navigation bar touch targets and sizing * feat: add tests for identifying zero and non-zero amount Lightning invoices (#2772) * feat: add tests for identifying zero and non-zero amount Lightning invoices - Added unit tests to validate recognition of Bolt11 zero-amount and non-zero-amount invoices. - Enhanced `isBolt11ZeroInvoice` function to handle `lightning:` prefixed invoices. * fix: correct currency selection logic for Lightning wallets in Send ViewModel * feat: improve Lightning wallet initialization and address generation - Updated `init` method in `LightningWallet` to return a boolean for initialization success, adding error handling for failed setups. - Integrated dynamic name generation using `generateName` for Lightning wallet addresses. * refactor: relocate `generate_name` to `cw_core` and update imports * chore: update breez sdk (#2789) * Wire tokens and NFTs to new Home page (#2804) * wiring for assets on home page * fix imports * wire nft page in new ui * fix nft display in new ui * fix totalWidth calc * add tokens button + bugfixes * add tokens button + bugfixes * fix late initialization * fix history section exception * fixes * Add haptic feedback (#2813) * Add haptic feedback * Add haptic feedback to correct ActionButton * Return bottom gradient (#2808) * Add IgnorePointer to bottom nav gradient (#2822) * New design send page (#2791) * new ui send page (wip) * coin control page improvements * fee settings, new send confirmation modal * minor aesthetic fixes * load network name without cw_bitcoin import * recipient dot cleanup * minor logic fixes * ui polish * - add aliaspay support - fix wording for max button - fix back button action in modals * Sizing changes * dismiss transaction on modal close * sizing fix * - fix remove recipient icon - properly round amounts - fix coin control page spacing * - fix remove recipient icon - properly round amounts - fix coin control page spacing * - fix button sizing - add description for fees page * Update lib/view_model/unspent_coins/unspent_coins_list_view_model.dart [skip ci] * Update lib/view_model/send/send_view_model.dart [skip ci] --------- Co-authored-by: tuxsudo Co-authored-by: Omar Hatem * Fix conflicts with dev * Fix conflicts with dev * Add zcash receive options to new design flow * wire in missing settings in new ui * up migration version * formatting * translations * lint.sh * New design receive page (#2834) * feat: viewmodel on new receive page (wip) * feat: address type selector for new ui receive page * fix: minor fixes to touch targets and tap anims * minor ui fix * wip receive page changes * receive page + address selection page * receive page + address selection page * add font * add svg * minor ui fixes * receive page fixes/improvements * change receive page modal design * further ui polish * icons for infobox * fix restricted import * fix closing label modal * - fix balance card appearance on address page - fix search bar position - fix mweb position in address type selector * receive page fixes * fix anonpay * remove restricted import * fixes * fix receive on zec * simplify chain id * lint fix * fix migration numbering Co-authored-by: Omar Hatem * fix migration version Co-authored-by: Omar Hatem * fix settings * readability * fix formatting * move dismiss infobox to vm * disable addr rotation on zcash * remove _setEffects * translations --------- Co-authored-by: Omar Hatem * New UI Sync bar (#2831) * syncbar * small styling fixes * modify duration * lint.sh * syncHeavy wallet types Co-authored-by: Omar Hatem * update translations, add pull-down refresh, separate top bar components to files --------- Co-authored-by: Omar Hatem * alphabetize * New design balance card icons (#2824) * Add the other crypto card icons * Update Zano, add Zcash and Arbitrum * Update default card style and available gradients * Fix broken preview * Fix animation * Color combinations fix * Minor updates * Add decred icon * if(!mounted) return; * New design minor fixes (#2842) * More minor fixes * Update modal sheet behaviour * Update missing currency image links * List row and navigation bar tweaks * Minor navbar fix * New UI Swap page (#2829) * new ui send page (wip) * coin control page improvements * fee settings, new send confirmation modal * minor aesthetic fixes * load network name without cw_bitcoin import * recipient dot cleanup * minor logic fixes * ui polish * - add aliaspay support - fix wording for max button - fix back button action in modals * Sizing changes * dismiss transaction on modal close * sizing fix * - fix remove recipient icon - properly round amounts - fix coin control page spacing * - fix remove recipient icon - properly round amounts - fix coin control page spacing * - fix button sizing - add description for fees page * swap page * fixes * further fixes * merge * png -> svg * minor condition changes * lint.sh * fix swapsxyz isCentralized Co-authored-by: Omar Hatem * translations, readability improvements, remove debug rows * cleanup * alphabetize strings * small bugfixes --------- Co-authored-by: tuxsudo Co-authored-by: Omar Hatem * fix new ui coin control page layout (#2843) * New design lightning flows (#2821) * new ui send page (wip) * coin control page improvements * fee settings, new send confirmation modal * minor aesthetic fixes * load network name without cw_bitcoin import * recipient dot cleanup * minor logic fixes * ui polish * - add aliaspay support - fix wording for max button - fix back button action in modals * Sizing changes * dismiss transaction on modal close * sizing fix * - fix remove recipient icon - properly round amounts - fix coin control page spacing * - fix remove recipient icon - properly round amounts - fix coin control page spacing * - fix button sizing - add description for fees page * lightning flow wip * lightning flow wip #2 * lightning withdraw flow * lightning deposit flow (wip, currently works but really janky) * send from external + bugfixes * merge fixes * merge fixes * fixes * Update lib/new-ui/widgets/send_page/l2_action_wallet_selector.dart --------- Co-authored-by: tuxsudo Co-authored-by: Omar Hatem * fix covered create wallet button * fix: close modal after transaction commitment in Send ViewModel (#2858) * New design tweaks (#2847) * Add more haptic feedback * Fix background gradients and modify SafeArea in home_page.dart * Fix history padding, fix divider color, disable Charts, update base_page.dart appbar style, fix nav bar border + height on iOS * Lightning Username setup flow for new UI (#2845) * lightning username edit/create flow * fix button color * fix layout * fixes * remove character limitation for internal builds * remove dependency on cw_bitcoin * fix username requirements * fixes * condition fix * Update lib/new-ui/pages/lightning_username_page.dart --------- Co-authored-by: OmarHatem * keyboard hide overlay for iphone * New design UI tweaks (#2870) * Fix nav height on Android * Fix blue gradient * Update transactions view and minor UI tweaks * CW1011-Allow-users-to-view-bitcoin-amounts-in-sats (#2678) * feat: introduce `formatFixed` integration and sats display preference * feat: enable display of Bitcoin amounts in satoshis and refactor amount formatting logic * refactor: consolidate fee formatting logic and add support for MWEB availability check * feat: add support for satoshi-based amount display and enhance fiat conversion logic * feat: add support for satoshi-based amount parsing, formatting, and display preferences across buy/sell flow and UI adjustments * feat: implement `AmountParsingProxy` with unit tests for parsing and formatting crypto amounts in various display modes * feat: replace `preferBalanceInSats` with `displayAmountsInSatoshi` and introduce `AmountParsingProxy` for unified crypto amount handling across the app * refactor: streamline amount formatting logic and enhance unspent coins handling with `AmountParsingProxy` integration for unified crypto processing * refactor: replace direct bitcoin amount formatting with `AmountParsingProxy` and remove debug print in `exchange_view_model` * refactor: replace `getIt` with `_appStore.amountParsingProxy`, remove redundant dependencies across view models and adjust related imports * refactor: remove redundant `AmountParsingProxy` registration in DI setup to simplify dependency management [skip ci] * feat: add getCryptoSymbol to simplify the Symbol selection between Sats and Bitcoin * fix: merge conflict * Revert "fix: merge conflict" This reverts commit 6debdaa0466747d6fcc85d6bd0be115e6fb4d856. * fix import [skip ci] * feat: remove number formatter from exchangeVM * refactor: replace `SettingsStore` with `AppStore` across view models, integrate `AmountParsingProxy` for amount formatting, and clean up redundant imports * refactor: remove debug print statements from `getCryptoOutputAmount` in `AmountParsingProxy` * feat: enhance fee and deposit amount formatting with crypto symbols and improved parsing * feat: integrate `AmountParsingProxy` for improved Bitcoin amount parsing in `PaymentURI` and fiat-to-crypto conversion * feat: append crypto symbols to Bitcoin transaction amounts in dashboard view * feat: improve crypto amount parsing in SendCard widget and Output view model using `AmountParsingProxy` * feat: conditionally show Bitcoin amount display setting for Bitcoin wallets and refactor `DisplaySettingsViewModel` to use `AppStore` * refactor: clean up redundant imports in `bitcoin_wallet.dart` and `electrum_wallet.dart` * feat: append crypto symbols to fee values in send and cake pay card widgets for improved clarity * refactor: replace `currencyTitle` with `currency` across widgets and integrate `AmountParsingProxy` for improved crypto amount formatting and parsing * refactor: improve validation logic and amount parsing in SendCard and Output widgets * refactor: standardize amount parsing and formatting logic with `AmountParsingProxy` across ViewModels and widgets * refactor: `AppStore` remove debug prints * refactor: rename amount parsing/formatting methods for better clarity in tests [skip ci] * fix: AmountParsingProxy and optimize `cryptoAmount` handling in BuySellViewModel * fix: adjust balance calculation for Monero and Wownero to exclude unlocked amount from full balance * fix: correct `_appStore` usage and format adjustments in `SendViewModel` * feat: enhance satoshi on new-ui * feat: add computed property for `amountParsingProxy` in AppStore * feat: localize Bitcoin amount display option and update asset history UI * feat: improve exchange amount processing and refactor fiat conversion values --------- Co-authored-by: OmarHatem * New design unconfirmed balance widget (#2861) * unconfirmed balance display widget for new ui * unconfirmed balance display widget for new ui * merge * alphabetize translations * New UI fixes (#2860) * fix asset top bar * improve wordmark in large qr mode on receive * receive option fixes * exchange -> swap * send page fixes * update pubspec base * go to home on wallet change * nicer card customizer * don't show account name for single-account wallets * special card design for lightning * fiat amount bar improvement * update translations * add sending indicator * fix non-number input to receive amount * de-jank fiat input * nicer balance card animation when switching btc-ln * nicer balance card animation when switching btc-ln * fix backup password input * display time+date in history * fix error on buy * fix incorrect wallet showing in wallets tab * fix wallet list layout * only show coin control option on hasCoinControl * better error on send page * fiat value in coin control * add zano to isSyncHeeavy * fix keys in settings * fix assets condition * fix import * remove BasePage dependency in RescanPage * add missing settings * show send/receive in swap confirm sheet * fix receive background on ios * fix assets spacing * fix trade tile sizing * fix padding * fix icon in wallet select modal * change text on swap initial modal * spacing * l2 send external modal styling * fix null on swap confirm sheet * change infobox text * add chain icon to asset widgets * add chain icon to asset widgets * disable swap page reset * fix wallet list page layout * revert merge conflict issue [skip ci] --------- Co-authored-by: Omar Hatem * Account Customizer for new UI Monero (#2859) * new ui monero account management (wip) * account reordering wip * account reordering wip * account reordering (works) * cards view compact mode * format * translation * name generation * fix for non-xmr wallets * } * allow reset order, fallback on improperly saved order * translation * fix for pre-reorder wallet loading * fix loading * - save cards on modal slide-down - always load active account as first * fix card customizer close anim * fixes * fix condition * merge * fix migration versions * use updated flutter rust bridge in lightning and payjoin * mvp fixes * new ui mweb mask/unmask * fallback for balance card amount format * New UI tweaks (#2872) * Update lightning transaction history view * Add BNB card design * Color, padding, and radius fixes * Fix wallet list bottom section & gradient * Update Apps page * reformat * nicer sat picker * fix keyboard * chain badges * enhance styling for card customizer * mweb settings icon * mweb chain badge * update wording in settings * bnb chain icon * always round send amount * always round all amount * token placeholder * Fix ModernButton colors (#2888) * Fix ModernButton colors * Minor * guard for unconfirmed balance widget * fix error on wallet switch * New design mvp fixes (#2890) * mvp fixes * fallback for balance card amount format * reformat * nicer sat picker * fix keyboard * chain badges * enhance styling for card customizer * bnb chain icon * always round send amount * always round all amount * guard for unconfirmed balance widget * fix error on wallet switch * Update lib/new-ui/pages/account_customizer.dart Co-authored-by: Omar Hatem * fixes --------- Co-authored-by: Omar Hatem * Install Protoc in reusable build workflow Added step to install Protoc before building. * Fix protobuf-compiler installation step Update package list before installing protobuf-compiler. * Modify Protoc installation command to handle update errors Change the install command for Protoc to avoid failure on update. * Streamline Lightning wallet balance management and crypto handling (#2893) * refactor: streamline crypto amount handling and improve Lightning balance management - Removed redundancy in balance calculations for Lightning wallets. - Centralized crypto symbol creation with `selectedCryptoCurrencySymbol`. - Enhanced crypto amount handling and formatting with `AmountParsingProxy`. - Simplified logic for displaying Lightning balances across UI components. * refactor: remove sats display logic and unused formatting from BalanceCard widget * chore: update breez-sdk-spark-flutter to latest commit * feat: enhance crypto amount formatting with localized separators and max decimals * fixes * fix: handle null balance records in Lightning wallet cards * New design add validators (#2894) * add validation, fix node form * Add validator to send amount input field Added a validator to the amount input field. --------- Co-authored-by: Omar Hatem * Disable 'addresses' button on receive screen for BTC LN (#2896) * feat: Disable addresses button on receive screen for BTC LN * chore: remove debug print in uri computation * feat: introduce swap action toggle and UI updates * feat: conditionally display Zcash card setting for Zcash wallets in Display Settings * Fix leading button color (#2898) * fix amount format * fix loadCards * pre-beta fixes * cyjan: fix: order being null for certain index * pre-beta fixes v2 (#2905) * minor context check [skip ci] * persist fee priority for zcash (#2907) * Add support for Zcash address detection and amount logic refactor (#2906) * refactor: consolidate crypto amount handling with `displayAmount` and `cryptoCurrencySymbol`, improve fiat conversion logic, and optimize token currency management * refactor: simplify `displayAmount` logic and remove unused `_rawAmount` property * feat: add support for Zcash transparent address detection and simplify amount conversion logic * Improve Lightning invoice handling and crypto formatting (#2908) * fix: update Lightning address regex to support additional formats and prefixes * fix: conditionally render advanced settings dropdown based on fees or coin control availability * feat: enhance address detection, Lightning invoice handling, and crypto formatting * feat: improve Lightning invoice parsing and crypto amount formatting on send page * chore: remove unnecessary exception printing in `getBolt11Amount` function * Fix lightning swap * import fix (hide Mac;) * parse -> tryParse * Transaction Commited -> Transaction Sent! * feat: enable clipboard paste for deposit and receive addresses in swap page (#2909) * fix: resolving LNURLS (#2911) * new UI pre-beta fixes (#2910) * fixes * parse -> tryParse * change sat display settings style * minor fix until hive is removed [skip ci] * Remove redundant logic and improve send page features (#2913) * fix: update crypto amount parsing logic in send confirmation sheet * feat: Added checkbox to toggle Litecoin MWEB coins on the send page. fix: LNUrlPayRecord * fix: remove redundant `.withLocalSeperator()` from fiat balance formatting logic * fix: update Bitcoin amount display titles to align with consistent formatting standards * force boolean to update (#2916) * force boolean to update * fix bnb balance * fixes #4 (#2917) * only display sats for btc wallets in card customizer * fix: resolve async handling of Lightning transaction history in `fetchTransactions` method (#2919) * New design pre beta fixes 5 (#2918) * improve l2 deposit/withdraw flow layouts * add copied indicator * SafeArea * fix addr rotation * fix styling of lightning switcher * no raster graphics in new ui please * optimization for assets/history section * remove unused bloc provider * optimize dashboard + fix duplicated name * disable lightning mode on wallet change * remove broken animation * safearea around nodes page * fix rescan page layout * fix exception on really fast switching * remove broken blur * card customizer autosave * remove debug print * add better fallbacks for currency titles * revert due to broken animation * fix send page crash * fix chain title for arb * fix cupertino date picker * Update lib/new-ui/widgets/receive_page/receive_bottom_buttons.dart [skip ci] --------- Co-authored-by: Omar Hatem * feat: add focus management and external address validation to send page forms - Introduced `focusNode` to `NewSendAddressInput` for better input handling. - Enhanced address validation by synchronizing with parsed external addresses. - Updated logic for non-MWEB unspent coin type in send actions. - Suppressed unnecessary exception logs in Bitcoin wallet transactions. * New design swap page fixes (#2923) * swap page fixes * add scroll controller * comment * tweak refresh pulldown (#2924) * add copy button to l2 send external modal (#2925) * account customizer padding * feat: lightning transaction fetching and Lightning wallet integration (#2927) - Allow nullable `height` in `ElectrumTransactionInfo`. - Add `fromDate` support for filtered Lightning transaction history retrieval. - Simplify Lightning address handling logic in wallet addresses. - Optimize Lightning wallet transaction syncing based on the last Lightning transaction date. - Clean up imports in `electrum_transaction_history.dart`. * New balance handeling (#2931) * feat: lightning transaction fetching and Lightning wallet integration - Allow nullable `height` in `ElectrumTransactionInfo`. - Add `fromDate` support for filtered Lightning transaction history retrieval. - Simplify Lightning address handling logic in wallet addresses. - Optimize Lightning wallet transaction syncing based on the last Lightning transaction date. - Clean up imports in `electrum_transaction_history.dart`. * feat: add support for Lightning balance in wallet snapshot and initialization * Disable Lightning switcher for hardware wallets (#2932) * fix: disable Lightning switcher for hardware wallets * fix: update wallet type check to use `isSoftwareWallet` for Lightning support * New design pre beta fixes 6 (#2929) * fix swaps from ln * prevent crash if ln balance isn't loaded yet * fix currency icons disappearing on swap confirm sheet * fix swap fiat validation * display ln at top on swap currency selector in btc wallets * update icon for card options * display default fiat and crypto at top of currency picker * fix fiat amount bar formatting * add modal scroll controller to provider logs * revert premature optimization (sizing issue) * New design pre beta fixes 7 (#2935) * fix swaps from ln * prevent crash if ln balance isn't loaded yet * fix currency icons disappearing on swap confirm sheet * fix swap fiat validation * display ln at top on swap currency selector in btc wallets * update icon for card options * display default fiat and crypto at top of currency picker * fix fiat amount bar formatting * add modal scroll controller to provider logs * revert premature optimization (sizing issue) * copyable trade id * disable swaptrade on ln * set isFixedRate properly * update color * display trocador provider on swap confirmation sheet * add "exchange rate is fixed" text --------- Co-authored-by: Omar Hatem * updated l2 modal (#2934) * display names for send addr input (#2936) * fix: MWEB toggle logic on send page (#2938) * feat: add retry logic to `getAddress` in Lightning wallet (#2939) * Enhance crypto address handling and add Lightning invoice support (#2937) * feat: enhance crypto address handling and add Lightning invoice support - Added `_overrideFromCryptoCurrency` and `_overrideToCryptoCurrency` for Zcash unified and shielded addresses. - Improved Lightning invoice generation with `getLightningInvoice` for Bitcoin wallets. - Updated error handling in exchange provider to accommodate API changes. - Introduced Lightning invoice fallback for deposit and receive addresses in ExchangeViewModel. * feat: Added `_overrideFromCryptoCurrency` and `_overrideToCryptoCurrency` for Zcash unified and shielded addresses. * fix pay anything on paste button (#2940) * Prevent multiple paste triggering any pay flow * fixup fiat input (#2941) * New design small fixes (#2920) * Fix optical symmetry for swipe to send text * Update nav bar icons * Top bar and card tweaks * Update paddings --------- Co-authored-by: malik1004x * fix erc20 balance display (#2944) * fix erc20 balance display * route through cw_evm * New design beta fixes (#2943) * fix asset tile layout * fix card customizer keyboard jumping * fix cardsview exception * fix swap modal height * remove syncbar percentage * add copy icon to trade id * fix trade confirmation appearing twice * remove useless mweb setting * add tag to contact currency selector text * prettify picker for ln * fix receive crash * always route to NewSendPage * handle ln amount on paste * handle ln amount on payment request creation * prettify ln errors * readd "blocks" word * register deeplinks * Enhance bitcoin error message [skip ci] * fix support chat page (#2946) * new-design-fix-confirm-sheet-parsing-error (#2950) * feat: use bigint instead of doubles * feat: use bigint instead of doubles * feat: use bigint instead of doubles * fix: also show sats in confirm sheet * fix: also show sats in confirm sheet * feat: localize amounts and cap amount in tx history (#2951) * fix: linux CI * feat: localize token balances (#2954) * fix: send amount hww (#2955) * chore: use latest breez sdk (#2953) * fix addAddressWord * fixes (#2957) * receive fixes (#2959) * fix: stabilize android build by increasing jvm heap size (#2958) * fix: lighting by having the new SDK Save into a new location (#2961) * New design rc fixes (#2960) * additional safeguards for isSyncHeavy check * fix account name getting reset * update base icon * fix units in swap * readd memos to zec * New design minor UI (#2956) * Wrap text for list item widgets * Update lightning address and QR icons * Update near intents icon * Fix share issue * Fix (#2963) * fix tx amount formatting * rename currency * change wording for zec memo * fix base icon * fix app icon script [skip ci] * New design rc fixes 2 (#2965) * fix account name changes * fix spacing on addresses page * add payjoin copy modal * improve memo ui * potential fix for ci * Set default address for zcash and bitcoin for buy flow (#2979) * new monero.com icons (#2980) * parse and validate deposit amount from api (#2967) * generic fixes * minor context fix [skip ci] * Generic fixes (#2982) - solana send all bug - pasting SOL address triggering payanything flow - add more address types for payanything detection * rescan fix * about page (#2974) Co-authored-by: Omar Hatem * update settings icons/wording (#2973) * Changelog modal (New UI) (#2971) * add new changelog modal * typo * print -> printV * Update lib/new-ui/widgets/changelog_modal.dart [skip ci] --------- Co-authored-by: Omar Hatem * fix node form (#2970) * new-design-add-breez-logging (#2984) * feat: add Lightning log export functionality for Bitcoin wallets * feat: add multilingual support for Lightning log export strings * feat: add Lightning support toggle in settings and translations for multiple languages * refactor: simplify `setUseLightning` by removing redundant store update * Update cw_bitcoin/lib/electrum_wallet.dart [skip ci] --------- Co-authored-by: Omar Hatem * minor fixes [skip ci] * minor context fixe [skip ci] * fix: make walletinfoid unique to prevent duplicates (#2969) * fix: walletconnect not working in new design builds (#2993) * new-design-fix-mweb-coin-enabling (#2995) * feat: add unspent coin type handling to asset details modal send button * fix: improve German translations for wallet, seed, and Lightning-related strings * fix: update Dutch translations to correct terminology and formatting #2992 (#2997) * fix: drop gn (#3000) * vulnerable seeds popup on new ui (#3004) * update mac os monero.com icons (#3003) * Add Payjoin log export and improve logging behavior (#2999) * fix: suppress exception logging in `getAddress` method of Lightning wallet - Added a try-catch block to avoid unnecessary exception logs during Lightning address retries. * fix: update fallback message for missing Lightning address detection * feat: add Payjoin log export and logging enhancements * fix: localize "Export Payjoin Logs" string in settings page * fix: litecoin mweb balance being included in the second asset (#2998) * Minor fixes (#2994) * Minor fixes * Update lib/new-ui/new_dashboard.dart [skip ci] --------- Co-authored-by: Omar Hatem * New design post release fixes (#3002) * fix: only throw on deserialize if kDebugMode is true (#2976) This closes #2972, in debug mode we will still catch these issues but if somehow that happens on production it will fallback to safe default * fix: update docs and dockerfile (#2975) * fix: missing steps for linux build [skip ci] (#2985) * move balance to bigint * move balance to bigint * fix electrum issue * fix unconfirmed balance * fixes * Fix minor issue in Spanish translation (#2991) * Fix minor issue in French translation (#2987) * Fix minor issues in German translation (#2986) * update constructor calls in configure.dart * fixes * remove expnded * V6.0.1 Early Release Candidate --------- Co-authored-by: cyan Co-authored-by: Edwin den Boer Co-authored-by: OmarHatem * Swaps xyz swap enhancements (#2615) * refactor token cache and limit handling * Improve SwapsXYZ external send logic * Improve SwapsXYZ fixed-rate handling * disable fixedRate for SwapsXyz * SwapsXYZ contract call * Add track url for swaps xyz * add arbitrum support * add check for unsupported source tokens * enable SwapsXyzExchangeProvider in provider list * refactor SwapsXYZ provider and trade flow handling * Update exchange_trade_view_model.dart * validate evm call-data * Revert "validate evm call-data" * fix msg value for ERC-20 transfers * fix flag for swapsXYZ send check * Update send_view_model.dart * handle Swaps.xyz method selectors & approvals * fix evm approvals * Improve EVM token approval & receipt handling * merge split token transfers in evm tx * fix token allowance check for approvals * add sourceToken validation to EVM tx creation * prioritizing incoming transactions over fetched outgoing ones * compute net flow when merging transactions * add truncateTrailingText to list items and widgets --------- Co-authored-by: Omar Hatem Co-authored-by: Serhii-Borodenko <17529954+Serhii-Borodenko@users.noreply.github.com> * fix wownero balance (#3007) * fix keyboard (#3006) * fix android build * check if stream is closed [skip ci] * [skip ci] lint * fix: populate amount field (#3009) * fix address rotation exception (#3011) * copy uri with amount from recieve page (#3010) * add "transaction sent!" to swap confirmation sheet (#3012) * fix wallet change on token swaps (#3013) * Fix fee estimation and recipient logic in Lightning Network (#3014) * fix: update `hasMultiRecipient` logic to include non-Lightning coin type check * fix: Lightning Network fee estimation and parsing logic * fix: adjust `sumByBigInt` logic to handle `sendAll` flag in send page * fix: move sqlite migrations to sqlite.dart (#3008) * fix: move sqlite migrations to sqlite.dart fix: backup restore not initializing SQL properly * Update cw_core/lib/db/sqlite.dart --------- Co-authored-by: Omar Hatem * feat: update currency symbol handling and extend Electrum transaction details (#3016) * Use isCentralized for truncation trade id [skip ci] * fix: Incorrect token amount for tokens and filter out new spam transactions after swaps (#3015) * New design release swap fixes (#3018) * fix deserialize ln * fix get wallet type for bnb tokens * show extraId for swaps * chore: translate using gpt-5.2 (#3021) * add NEAR send-all validation * tiny ui fixes (#3023) * use double parsing for amount comparison[skip ci] * adjust lightning address error message * feat: add BTC LN support to available methods and payment data handling * feat: add cached Lightning address handling for improved performance (#3025) - Introduced `cachedAddress` field to store and reuse the last fetched Lightning address. - Updated `getLightningAddress` method to fallback on `cachedAddress` if no new address is fetched. - Extended wallet constructors and snapshots to include `cachedLightningAddress` for persistence. * Revert transaction history color * Minor * Apply suggestion from @malik1004x * new-design-post-release-fixes-3 (#3028) * fix unnecessary account switching * fix exception on bad payment amount * fallback for currencies on external swap modal * increase balance card touch target * don't use lightning addresses for exchange * increase max length for ln encoding * don't show infobox on ln receive * fix showing old tx details (null tx on createTransaction) * remove unused import * refactor: relocate `_logStream` declaration in `LightningWallet` for better code organization (#3029) * monero build fix update build numbers fix best rate null [skip ci] * hide swap on mweb asset * minor context fix [skip ci] * Fix Silent payment case * new-ui: fix changelog typo (#3036) Fix typo in changelog for account management. * Modify date format to Month DD YYYY * feat: docker based ci * Fix 2FA continue button location (#3043) * fix: Desktop wallet bugs (#2968) * fix: Desktop wallet bugs - repeated wallets post migration - newly created wallets not showing up - extra large components on desktop, needed maxwidth * chore: Remove duplicate logic * chore: remove formatting * refactor: streamline updateList method and handle multiple calls with a future based mutex * refactor: enhance swipe to confirm with dynamic width handling and improved drag threshold logic * fix: Minor fixes * fix: Male exchange provider logger nullable [skip ci] * Improve error handling and duplicate invoice handling in Lightning wallet (#3047) * fix: handle duplicate Lightning invoice payments gracefully * fix: improved error handling in Lightning wallet * General improvements (#3030) * General Improvements - Make borderRadius for CTAs uniform 18px - Identify hardware wallets in title of Seeds/Keys page - Make entire wallet tile clickable in wallet list * chore: Simplify check * Update lib/view_model/wallet_keys_view_model.dart [skip ci] --------- Co-authored-by: Omar Hatem * homescreen improvements (#3034) * Homescreen improvements - Increase touch area for card editing icon - Tapping any card in the background should move it ino the foreground without closing the account tab - make top left chain icon primary color with full opacity when syncing and 20% when done - add tor indicator to top bar when enabled * fix: remove unneeded color filter * refactor: Adjust structure for tor and sync indicators * minor fixes (#3045) * add safe fallback for strings and remove status code checks * Refactor fetchLimits method to return nullable Limits for better error handling. --------- Signed-off-by: black5box Co-authored-by: malik1004x Co-authored-by: Konstantin Ullrich Co-authored-by: OmarHatem Co-authored-by: tuxsudo Co-authored-by: black5box Co-authored-by: cyan Co-authored-by: Konstantin Ullrich Co-authored-by: Serhii Co-authored-by: Edwin den Boer Co-authored-by: Serhii <17529954+serhii-bor@users.noreply.github.com> Co-authored-by: Serhii-Borodenko <17529954+Serhii-Borodenko@users.noreply.github.com> Co-authored-by: rottenwheel <92872541+rottenwheel@users.noreply.github.com> --- lib/core/trade_monitor.dart | 1 - lib/entities/calculate_fiat_amount.dart | 3 +- .../provider/chainflip_exchange_provider.dart | 2 +- .../provider/changenow_exchange_provider.dart | 40 ++++--- lib/exchange/provider/exchange_provider.dart | 2 +- .../provider/exolix_exchange_provider.dart | 4 +- .../provider/jupiter_exchange_provider.dart | 2 +- .../letsexchange_exchange_provider.dart | 2 +- .../near_Intents_exchange_provider.dart | 2 +- .../provider/sideshift_exchange_provider.dart | 2 +- .../simpleswap_exchange_provider.dart | 2 +- .../stealth_ex_exchange_provider.dart | 2 +- .../provider/swapsxyz_exchange_provider.dart | 2 +- .../provider/swaptrade_exchange_provider.dart | 41 ++++--- .../provider/thorchain_exchange.provider.dart | 2 +- .../provider/trocador_exchange_provider.dart | 105 +++++++++++------- .../provider/xoswap_exchange_provider.dart | 2 +- .../dev/exchange_provider_logs_page.dart | 4 +- lib/utils/exchange_provider_logger.dart | 19 ++-- .../exchange_provider_logs_view_model.dart | 5 +- .../exchange/exchange_view_model.dart | 98 ++++++++++++++-- 21 files changed, 229 insertions(+), 113 deletions(-) diff --git a/lib/core/trade_monitor.dart b/lib/core/trade_monitor.dart index f97b47c3e..07cd3eeca 100644 --- a/lib/core/trade_monitor.dart +++ b/lib/core/trade_monitor.dart @@ -127,7 +127,6 @@ class TradeMonitor { bool _shouldSkipTrade(Trade trade, String walletId, ExchangeProvider? provider) { if (trade.walletId != walletId) { - printV('Skipping trade ${trade.id} because it\'s not for this wallet'); return true; } diff --git a/lib/entities/calculate_fiat_amount.dart b/lib/entities/calculate_fiat_amount.dart index 574600bd2..e4e4b29a4 100644 --- a/lib/entities/calculate_fiat_amount.dart +++ b/lib/entities/calculate_fiat_amount.dart @@ -5,7 +5,8 @@ String calculateFiatAmount({double? price, String? cryptoAmount, bool raw = fals cryptoAmount = cryptoAmount.replaceAll(',', '.'); - final _amount = double.parse(cryptoAmount); + final _amount = double.tryParse(cryptoAmount); + if (_amount == null || _amount.isNaN) return '0.00'; final _result = price * _amount; final result = _result < 0 ? _result * -1 : _result; diff --git a/lib/exchange/provider/chainflip_exchange_provider.dart b/lib/exchange/provider/chainflip_exchange_provider.dart index 787070be9..71109225b 100644 --- a/lib/exchange/provider/chainflip_exchange_provider.dart +++ b/lib/exchange/provider/chainflip_exchange_provider.dart @@ -63,7 +63,7 @@ class ChainflipExchangeProvider extends ExchangeProvider { Future checkIsAvailable() async => true; @override - Future fetchLimits( + Future fetchLimits( {required CryptoCurrency from, required CryptoCurrency to, required bool isFixedRateMode}) async { diff --git a/lib/exchange/provider/changenow_exchange_provider.dart b/lib/exchange/provider/changenow_exchange_provider.dart index 24f1ec812..69b906d3c 100644 --- a/lib/exchange/provider/changenow_exchange_provider.dart +++ b/lib/exchange/provider/changenow_exchange_provider.dart @@ -23,7 +23,6 @@ class ChangeNowExchangeProvider extends ExchangeProvider { : _settingsStore = settingsStore, _lastUsedRateId = ''; - static final apiKey = isMoneroOnly ? secrets.changeNowMoneroApiKey : secrets.changeNowCakeWalletApiKey; static const apiAuthority = 'api.changenow.io'; @@ -55,7 +54,7 @@ class ChangeNowExchangeProvider extends ExchangeProvider { Future checkIsAvailable() async => true; @override - Future fetchLimits( + Future fetchLimits( {required CryptoCurrency from, required CryptoCurrency to, required bool isFixedRateMode}) async { @@ -81,18 +80,19 @@ class ChangeNowExchangeProvider extends ExchangeProvider { throw Exception('Unexpected http status: ${response.statusCode}'); final responseJSON = json.decode(response.body) as Map; - return Limits( - min: responseJSON['minAmount'] as double?, max: responseJSON['maxAmount'] as double?); + final min = double.tryParse(responseJSON['minAmount']?.toString() ?? ''); + final max = double.tryParse(responseJSON['maxAmount']?.toString() ?? ''); + if (max == 0) return null; + return Limits(min: min, max: max); } @override - Future fetchRate({ - required CryptoCurrency from, - required CryptoCurrency to, - required double amount, - required bool isFixedRateMode, - required bool isReceiveAmount - }) async { + Future fetchRate( + {required CryptoCurrency from, + required CryptoCurrency to, + required double amount, + required bool isFixedRateMode, + required bool isReceiveAmount}) async { try { if (amount == 0) return 0.0; @@ -117,8 +117,9 @@ class ChangeNowExchangeProvider extends ExchangeProvider { final response = await ProxyWrapper().get(clearnetUri: uri, headers: headers); final responseJSON = json.decode(response.body) as Map; - final fromAmount = double.parse(responseJSON['fromAmount'].toString()); - final toAmount = double.parse(responseJSON['toAmount'].toString()); + final fromAmount = double.tryParse(responseJSON['fromAmount']?.toString() ?? '') ?? 0.0; + final toAmount = double.tryParse(responseJSON['toAmount']?.toString() ?? '') ?? 0.0; + if (fromAmount <= 0 || toAmount <= 0) return 0.0; final rateId = responseJSON['rateId'] as String? ?? ''; if (rateId.isNotEmpty) _lastUsedRateId = rateId; @@ -278,14 +279,18 @@ class ChangeNowExchangeProvider extends ExchangeProvider { final fromCurrency = responseJSON['fromCurrency'] as String; final fromNetwork = responseJSON['fromNetwork'] as String?; final _normalizedFromNetwork = _normalizeNetworkType(fromNetwork ?? ''); - final fromTag = fromCurrency.toUpperCase() == _normalizedFromNetwork.toUpperCase() ? null : _normalizedFromNetwork; + final fromTag = fromCurrency.toUpperCase() == _normalizedFromNetwork.toUpperCase() + ? null + : _normalizedFromNetwork; final from = CryptoCurrency.safeParseCurrencyFromString(fromCurrency, tag: fromTag); // Parsing 'to' currency final toCurrency = responseJSON['toCurrency'] as String; final toNetwork = responseJSON['toNetwork'] as String?; final _normalizedToNetwork = _normalizeNetworkType(toNetwork ?? ''); - final toTag = toCurrency.toUpperCase() == _normalizedToNetwork.toUpperCase() ? null : _normalizedToNetwork; + final toTag = toCurrency.toUpperCase() == _normalizedToNetwork.toUpperCase() + ? null + : _normalizedToNetwork; final to = CryptoCurrency.safeParseCurrencyFromString(toCurrency, tag: toTag); final inputAddress = responseJSON['payinAddress'] as String; @@ -310,7 +315,8 @@ class ChangeNowExchangeProvider extends ExchangeProvider { expiredAt: expiredAt, outputTransaction: outputTransaction, payoutAddress: payoutAddress, - userCurrencyFromRaw: '${fromCurrency.toUpperCase()}' + '_' + '${fromTag?.toUpperCase() ?? ''}', + userCurrencyFromRaw: + '${fromCurrency.toUpperCase()}' + '_' + '${fromTag?.toUpperCase() ?? ''}', userCurrencyToRaw: '${toCurrency.toUpperCase()}' + '_' + '${toTag?.toUpperCase() ?? ''}', ); } @@ -363,6 +369,4 @@ class ChangeNowExchangeProvider extends ExchangeProvider { _ => network, }; } - - } diff --git a/lib/exchange/provider/exchange_provider.dart b/lib/exchange/provider/exchange_provider.dart index 2f2bfafb9..513af4c4a 100644 --- a/lib/exchange/provider/exchange_provider.dart +++ b/lib/exchange/provider/exchange_provider.dart @@ -23,7 +23,7 @@ abstract class ExchangeProvider { @override String toString() => title; - Future fetchLimits( + Future fetchLimits( {required CryptoCurrency from, required CryptoCurrency to, required bool isFixedRateMode}); Future createTrade( diff --git a/lib/exchange/provider/exolix_exchange_provider.dart b/lib/exchange/provider/exolix_exchange_provider.dart index 7b8234bb5..caa1c3347 100644 --- a/lib/exchange/provider/exolix_exchange_provider.dart +++ b/lib/exchange/provider/exolix_exchange_provider.dart @@ -42,7 +42,7 @@ class ExolixExchangeProvider extends ExchangeProvider { Future checkIsAvailable() async => true; @override - Future fetchLimits({ + Future fetchLimits({ required CryptoCurrency from, required CryptoCurrency to, required bool isFixedRateMode, @@ -143,7 +143,7 @@ class ExolixExchangeProvider extends ExchangeProvider { throw Exception(message); } - final rate = responseJSON['rate'] as double; + final rate = double.tryParse(responseJSON['rate']?.toString() ?? '') ?? 0.0; ExchangeProviderLogger.logSuccess( provider: description, diff --git a/lib/exchange/provider/jupiter_exchange_provider.dart b/lib/exchange/provider/jupiter_exchange_provider.dart index 379bd4243..ff9b529fb 100644 --- a/lib/exchange/provider/jupiter_exchange_provider.dart +++ b/lib/exchange/provider/jupiter_exchange_provider.dart @@ -72,7 +72,7 @@ class JupiterExchangeProvider extends ExchangeProvider { } @override - Future fetchLimits({ + Future fetchLimits({ required CryptoCurrency from, required CryptoCurrency to, required bool isFixedRateMode, diff --git a/lib/exchange/provider/letsexchange_exchange_provider.dart b/lib/exchange/provider/letsexchange_exchange_provider.dart index b57912370..d2c9191d8 100644 --- a/lib/exchange/provider/letsexchange_exchange_provider.dart +++ b/lib/exchange/provider/letsexchange_exchange_provider.dart @@ -47,7 +47,7 @@ class LetsExchangeExchangeProvider extends ExchangeProvider { Future checkIsAvailable() async => true; @override - Future fetchLimits( + Future fetchLimits( {required CryptoCurrency from, required CryptoCurrency to, required bool isFixedRateMode}) async { diff --git a/lib/exchange/provider/near_Intents_exchange_provider.dart b/lib/exchange/provider/near_Intents_exchange_provider.dart index b36a42026..0f5206244 100644 --- a/lib/exchange/provider/near_Intents_exchange_provider.dart +++ b/lib/exchange/provider/near_Intents_exchange_provider.dart @@ -97,7 +97,7 @@ class NearIntentsExchangeProvider extends ExchangeProvider { Future checkIsAvailable() async => true; @override - Future fetchLimits( + Future fetchLimits( {required CryptoCurrency from, required CryptoCurrency to, required bool isFixedRateMode}) async { diff --git a/lib/exchange/provider/sideshift_exchange_provider.dart b/lib/exchange/provider/sideshift_exchange_provider.dart index 340842244..cd914213e 100644 --- a/lib/exchange/provider/sideshift_exchange_provider.dart +++ b/lib/exchange/provider/sideshift_exchange_provider.dart @@ -60,7 +60,7 @@ class SideShiftExchangeProvider extends ExchangeProvider { } @override - Future fetchLimits( + Future fetchLimits( {required CryptoCurrency from, required CryptoCurrency to, required bool isFixedRateMode}) async { diff --git a/lib/exchange/provider/simpleswap_exchange_provider.dart b/lib/exchange/provider/simpleswap_exchange_provider.dart index 3d14c6918..211aeff78 100644 --- a/lib/exchange/provider/simpleswap_exchange_provider.dart +++ b/lib/exchange/provider/simpleswap_exchange_provider.dart @@ -51,7 +51,7 @@ class SimpleSwapExchangeProvider extends ExchangeProvider { } @override - Future fetchLimits( + Future fetchLimits( {required CryptoCurrency from, required CryptoCurrency to, required bool isFixedRateMode}) async { diff --git a/lib/exchange/provider/stealth_ex_exchange_provider.dart b/lib/exchange/provider/stealth_ex_exchange_provider.dart index a10affa39..d8d8831b2 100644 --- a/lib/exchange/provider/stealth_ex_exchange_provider.dart +++ b/lib/exchange/provider/stealth_ex_exchange_provider.dart @@ -43,7 +43,7 @@ class StealthExExchangeProvider extends ExchangeProvider { Future checkIsAvailable() async => true; @override - Future fetchLimits( + Future fetchLimits( {required CryptoCurrency from, required CryptoCurrency to, required bool isFixedRateMode}) async { diff --git a/lib/exchange/provider/swapsxyz_exchange_provider.dart b/lib/exchange/provider/swapsxyz_exchange_provider.dart index 68f4cb0ee..10e8eb2ef 100644 --- a/lib/exchange/provider/swapsxyz_exchange_provider.dart +++ b/lib/exchange/provider/swapsxyz_exchange_provider.dart @@ -62,7 +62,7 @@ class SwapsXyzExchangeProvider extends ExchangeProvider { Future checkIsAvailable() async => true; @override - Future fetchLimits({ + Future fetchLimits({ required CryptoCurrency from, required CryptoCurrency to, required bool isFixedRateMode, diff --git a/lib/exchange/provider/swaptrade_exchange_provider.dart b/lib/exchange/provider/swaptrade_exchange_provider.dart index 65f296812..e78fc66f3 100644 --- a/lib/exchange/provider/swaptrade_exchange_provider.dart +++ b/lib/exchange/provider/swaptrade_exchange_provider.dart @@ -9,7 +9,6 @@ import 'package:cake_wallet/exchange/trade_not_created_exception.dart'; import 'package:cake_wallet/exchange/trade_not_found_exception.dart'; import 'package:cake_wallet/exchange/trade_request.dart'; import 'package:cake_wallet/exchange/trade_state.dart'; -import 'package:cake_wallet/exchange/utils/currency_pairs_utils.dart'; import 'package:cw_core/utils/proxy_wrapper.dart'; import 'package:cw_core/crypto_currency.dart'; import 'package:cw_core/utils/print_verbose.dart'; @@ -47,7 +46,7 @@ class SwapTradeExchangeProvider extends ExchangeProvider { Future checkIsAvailable() async => true; @override - Future fetchLimits({ + Future fetchLimits({ required CryptoCurrency from, required CryptoCurrency to, required bool isFixedRateMode, @@ -55,29 +54,33 @@ class SwapTradeExchangeProvider extends ExchangeProvider { try { final uri = Uri.https(apiAuthority, getCoins); final response = await ProxyWrapper().get(clearnetUri: uri); - final responseJSON = json.decode(response.body) as Map; if (response.statusCode != 200) throw Exception('Unexpected http status: ${response.statusCode}'); - final coinsInfo = responseJSON['data'] as List; + final coinsInfoRaw = responseJSON['data']; + final coinsInfo = coinsInfoRaw is List ? coinsInfoRaw : []; - final coin = coinsInfo.firstWhere( - (coin) => coin['id'].toString().toUpperCase() == _normalizeCurrency(from), - orElse: () => null, + final normalized = _normalizeCurrency(from); + final coin = coinsInfo.cast>().firstWhere( + (c) => (c['id']?.toString().toUpperCase() ?? '') == normalized, + orElse: () => {}, ); - if (coin == null) throw Exception('Coin not found: ${_normalizeCurrency(from)}'); + if (coin.isEmpty) { + // Currency not supported by SwapTrade (e.g. USDC, DOGE). + return null; + } - return Limits( - min: double.parse(coin['min'].toString()), - max: double.parse(coin['max'].toString()), - ); + final min = double.tryParse(coin['min']?.toString() ?? '') ?? 0.0; + final max = double.tryParse(coin['max']?.toString() ?? '') ?? 0.0; + if (max == 0) return null; + return Limits(min: min, max: max); } catch (e) { printV(e.toString()); - throw Exception('Error fetching limits: ${e.toString()}'); + return null; } } @@ -189,7 +192,7 @@ class SwapTradeExchangeProvider extends ExchangeProvider { 'amount_send': request.fromAmount, 'recipient': request.toAddress, 'ref': 'cake', - 'markup': markup, + 'markup': int.tryParse(markup.toString()) ?? 0, 'refund_address': request.refundAddress, }; @@ -394,7 +397,15 @@ class SwapTradeExchangeProvider extends ExchangeProvider { CryptoCurrency.bnb => 'BNB_BSC', CryptoCurrency.usdterc20 => 'USDT_ERC20', CryptoCurrency.usdttrc20 => 'TRX_USDT_S2UZ', - _ => '', + CryptoCurrency.usdtbsc => 'USDT_BSC', + CryptoCurrency.sol => 'SOL', + CryptoCurrency.btc => 'BTC', + CryptoCurrency.xmr => 'XMR', + CryptoCurrency.ltc => 'LTC', + CryptoCurrency.ada => 'ADA', + CryptoCurrency.bch => 'BCH', + CryptoCurrency.zec => 'ZEC', + _ => currency.title.toUpperCase(), }; return network; } diff --git a/lib/exchange/provider/thorchain_exchange.provider.dart b/lib/exchange/provider/thorchain_exchange.provider.dart index 69b11ad57..c3f09d5b9 100644 --- a/lib/exchange/provider/thorchain_exchange.provider.dart +++ b/lib/exchange/provider/thorchain_exchange.provider.dart @@ -109,7 +109,7 @@ class ThorChainExchangeProvider extends ExchangeProvider { } @override - Future fetchLimits( + Future fetchLimits( {required CryptoCurrency from, required CryptoCurrency to, required bool isFixedRateMode}) async { diff --git a/lib/exchange/provider/trocador_exchange_provider.dart b/lib/exchange/provider/trocador_exchange_provider.dart index 179e82463..060575d36 100644 --- a/lib/exchange/provider/trocador_exchange_provider.dart +++ b/lib/exchange/provider/trocador_exchange_provider.dart @@ -82,7 +82,7 @@ class TrocadorExchangeProvider extends ExchangeProvider { Future checkIsAvailable() async => true; @override - Future fetchLimits( + Future fetchLimits( {required CryptoCurrency from, required CryptoCurrency to, required bool isFixedRateMode}) async { @@ -103,10 +103,10 @@ class TrocadorExchangeProvider extends ExchangeProvider { final coinJson = responseJSON.first as Map; - return Limits( - min: coinJson['minimum'] as double?, - max: coinJson['maximum'] as double?, - ); + final min = double.tryParse(coinJson['minimum']?.toString() ?? ''); + final max = double.tryParse(coinJson['maximum']?.toString() ?? ''); + if (max == 0) return null; + return Limits(min: min, max: max); } @override @@ -135,11 +135,18 @@ class TrocadorExchangeProvider extends ExchangeProvider { final response = await ProxyWrapper().get(clearnetUri: uri, headers: {'API-Key': apiKey}); final responseJSON = json.decode(response.body) as Map; - final fromAmount = double.parse(responseJSON['amount_from'].toString()); - final toAmount = double.parse(responseJSON['amount_to'].toString()); - final rateId = responseJSON['trade_id'] as String? ?? ''; + final fromAmount = double.tryParse(responseJSON['amount_from']?.toString() ?? '') ?? 0.0; + final toAmount = double.tryParse(responseJSON['amount_to']?.toString() ?? '') ?? 0.0; - var quotes = responseJSON['quotes']['quotes'] as List; + if (fromAmount <= 0 || toAmount <= 0) return 0.0; + + final quotesData = responseJSON['quotes']; + final rateId = _safeString(responseJSON, 'trade_id'); + + if (quotesData == null || quotesData is! Map) { + return 0.0; + } + final quotes = (quotesData['quotes'] as List?) ?? []; _provider = quotes .where((quote) => providerStates[quote['provider']] != false) .map((quote) => quote['provider']) @@ -243,7 +250,7 @@ class TrocadorExchangeProvider extends ExchangeProvider { params['id'] = _lastUsedRateId; } - if (_provider.isEmpty) { + if (_provider.isEmpty || _provider.first == null || _provider.first.toString().isEmpty) { ExchangeProviderLogger.logError( provider: description, function: 'createTrade', @@ -264,15 +271,15 @@ class TrocadorExchangeProvider extends ExchangeProvider { throw Exception('No available provider is enabled'); } - params['provider'] = _provider.first as String; + params['provider'] = _provider.first.toString(); final uri = await _getUri(createTradePath, params); final response = await ProxyWrapper().get(clearnetUri: uri, headers: {'API-Key': apiKey}); if (response.statusCode == 400) { final responseJSON = json.decode(response.body) as Map; - final error = responseJSON['error'] as String; - final message = responseJSON['message'] as String; + final error = _safeString(responseJSON, 'error', 'Unknown error'); + final message = _safeString(responseJSON, 'message'); ExchangeProviderLogger.logError( provider: description, @@ -319,18 +326,18 @@ class TrocadorExchangeProvider extends ExchangeProvider { } final responseJSON = json.decode(response.body) as Map; - final id = responseJSON['trade_id'] as String; - final inputAddress = responseJSON['address_provider'] as String; - final refundAddress = responseJSON['refund_address'] as String; - final status = responseJSON['status'] as String; - final payoutAddress = responseJSON['address_user'] as String; - final date = responseJSON['date'] as String; - final password = responseJSON['password'] as String; - final providerId = responseJSON['id_provider'] as String; - final providerName = responseJSON['provider'] as String; - final amount = responseJSON['amount_from']?.toString(); - final receiveAmount = responseJSON['amount_to']?.toString(); - final addressProviderMemo = responseJSON['address_provider_memo'] as String?; + final id = _safeString(responseJSON, 'trade_id'); + final inputAddress = _safeString(responseJSON, 'address_provider'); + final refundAddress = _safeString(responseJSON, 'refund_address'); + final status = _safeString(responseJSON, 'status'); + final payoutAddress = _safeString(responseJSON, 'address_user'); + final date = _safeString(responseJSON, 'date'); + final password = _safeString(responseJSON, 'password'); + final providerId = _safeString(responseJSON, 'id_provider'); + final providerName = _safeString(responseJSON, 'provider'); + final amount = _safeString(responseJSON, 'amount_from'); + final receiveAmount = _safeString(responseJSON, 'amount_to'); + final addressProviderMemo = _safeString(responseJSON, 'address_provider_memo'); ExchangeProviderLogger.logSuccess( provider: description, @@ -365,6 +372,9 @@ class TrocadorExchangeProvider extends ExchangeProvider { }, ); + final amountToTrade = amount.isEmpty ? request.fromAmount : amount; + final receiveAmountToTrade = receiveAmount.isEmpty ? request.toAmount : receiveAmount; + return Trade( id: id, from: request.fromCurrency, @@ -377,8 +387,8 @@ class TrocadorExchangeProvider extends ExchangeProvider { providerId: providerId, providerName: providerName, createdAt: DateTime.tryParse(date)?.toLocal(), - amount: amount ?? request.fromAmount, - receiveAmount: receiveAmount ?? request.toAmount, + amount: amountToTrade, + receiveAmount: receiveAmountToTrade, payoutAddress: payoutAddress, isSendAll: isSendAll, extraId: addressProviderMemo, @@ -396,19 +406,21 @@ class TrocadorExchangeProvider extends ExchangeProvider { throw Exception('Unexpected http status: ${response.statusCode}'); final responseListJson = json.decode(response.body) as List; - final responseJSON = responseListJson.first; - final id = responseJSON['trade_id'] as String; - final payoutAddress = responseJSON['address_user'] as String; - final refundAddress = responseJSON['refund_address'] as String; - final inputAddress = responseJSON['address_provider'] as String; + final responseJSON = responseListJson.first as Map; + final id = _safeString(responseJSON, 'trade_id'); + final payoutAddress = _safeString(responseJSON, 'address_user'); + final refundAddress = _safeString(responseJSON, 'refund_address'); + final inputAddress = _safeString(responseJSON, 'address_provider'); final fromAmount = responseJSON['amount_from']?.toString() ?? '0'; - final password = responseJSON['password'] as String; - final providerId = responseJSON['id_provider'] as String; - final providerName = responseJSON['provider'] as String; - final addressProviderMemo = responseJSON['address_provider_memo'] as String?; + final password = _safeString(responseJSON, 'password'); + final providerId = _safeString(responseJSON, 'id_provider'); + final providerName = _safeString(responseJSON, 'provider'); + final memoVal = _safeString(responseJSON, 'address_provider_memo'); + final addressProviderMemo = memoVal.isEmpty ? null : memoVal; - final fromCurrency = responseJSON['ticker_from'] as String; - final fromNetwork = responseJSON['network_from'] as String?; + final fromCurrency = _safeString(responseJSON, 'ticker_from'); + final fromNetworkVal = _safeString(responseJSON, 'network_from'); + final fromNetwork = fromNetworkVal.isEmpty ? null : fromNetworkVal; final _normalizedFromNetwork = _normalizeNetworkType(fromNetwork ?? ''); final fromTag = _normalizedFromNetwork.isEmpty || _normalizedFromNetwork == fromCurrency.toUpperCase() || @@ -418,8 +430,9 @@ class TrocadorExchangeProvider extends ExchangeProvider { final from = CryptoCurrency.safeParseCurrencyFromString(fromCurrency, tag: fromTag); - final toCurrency = responseJSON['ticker_to'] as String; - final networkTo = responseJSON['network_to'] as String?; + final toCurrency = _safeString(responseJSON, 'ticker_to'); + final networkToVal = _safeString(responseJSON, 'network_to'); + final networkTo = networkToVal.isEmpty ? null : networkToVal; final _normalizedToNetwork = _normalizeNetworkType(networkTo ?? ''); final toTag = _normalizedToNetwork.isEmpty || _normalizedToNetwork == toCurrency.toUpperCase() || @@ -435,9 +448,9 @@ class TrocadorExchangeProvider extends ExchangeProvider { provider: description, inputAddress: inputAddress, refundAddress: refundAddress, - createdAt: DateTime.parse(responseJSON['date'] as String), + createdAt: DateTime.tryParse(_safeString(responseJSON, 'date')), amount: fromAmount, - state: TradeState.deserialize(raw: responseJSON['status'] as String), + state: TradeState.deserialize(raw: _safeString(responseJSON, 'status')), payoutAddress: payoutAddress, password: password, providerId: providerId, @@ -541,6 +554,14 @@ class TrocadorExchangeProvider extends ExchangeProvider { return Uri.https(clearNetAuthority, path, queryParams); } } + + /// Safe string extraction from API response. Handles different data types. + static String _safeString(Map m, String key, [String nullError = '']) { + final v = m[key]; + if (v == null) return nullError; + if (v is String) return v; + return v.toString(); + } } class TrocadorPartners { diff --git a/lib/exchange/provider/xoswap_exchange_provider.dart b/lib/exchange/provider/xoswap_exchange_provider.dart index 7e7eeebed..34bf923e0 100644 --- a/lib/exchange/provider/xoswap_exchange_provider.dart +++ b/lib/exchange/provider/xoswap_exchange_provider.dart @@ -150,7 +150,7 @@ class XOSwapExchangeProvider extends ExchangeProvider { } } - Future fetchLimits({ + Future fetchLimits({ required CryptoCurrency from, required CryptoCurrency to, required bool isFixedRateMode, diff --git a/lib/src/screens/dev/exchange_provider_logs_page.dart b/lib/src/screens/dev/exchange_provider_logs_page.dart index 26aa5e8fc..ae71c98c8 100644 --- a/lib/src/screens/dev/exchange_provider_logs_page.dart +++ b/lib/src/screens/dev/exchange_provider_logs_page.dart @@ -130,7 +130,7 @@ class _StatsCardState extends State<_StatsCard> { child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Text(entry.key.title), + Text(entry.key?.title ?? 'Unknown'), Text(entry.value.toString()), ], ), @@ -310,7 +310,7 @@ class _LogEntryCard extends StatelessWidget { SizedBox(width: 8), Expanded( child: Text( - "${log.provider.title} - ${log.function}", + "${log.provider?.title ?? 'Unknown/Empty'} - ${log.function}", style: Theme.of(context).textTheme.titleMedium, ), ), diff --git a/lib/utils/exchange_provider_logger.dart b/lib/utils/exchange_provider_logger.dart index 6e7c5533b..4c2824446 100644 --- a/lib/utils/exchange_provider_logger.dart +++ b/lib/utils/exchange_provider_logger.dart @@ -1,9 +1,10 @@ import 'dart:convert'; +import 'package:cake_wallet/core/utilities.dart'; import 'package:cake_wallet/exchange/exchange_provider_description.dart'; class ExchangeProviderLogEntry { final DateTime timestamp; - final ExchangeProviderDescription provider; + final ExchangeProviderDescription? provider; final String function; final String? error; final String? stackTrace; @@ -14,8 +15,8 @@ class ExchangeProviderLogEntry { ExchangeProviderLogEntry({ required this.timestamp, - required this.provider, required this.function, + this.provider, this.error, this.stackTrace, this.callStack, @@ -26,7 +27,7 @@ class ExchangeProviderLogEntry { String toLogString() { final buffer = StringBuffer(); - buffer.writeln('Provider: ${provider.title}'); + buffer.writeln('Provider: ${provider?.title ?? 'Unknown/Empty'}'); buffer.writeln('Function: $function'); buffer.writeln('Timestamp: ${timestamp.toIso8601String()}'); buffer.writeln('Success: $isSuccess'); @@ -58,7 +59,7 @@ class ExchangeProviderLogEntry { Map toJson() { return { 'timestamp': timestamp.toIso8601String(), - 'provider': provider.title, + 'provider': provider?.title, 'function': function, 'error': error, 'stackTrace': stackTrace, @@ -85,14 +86,14 @@ class ExchangeProviderLogEntry { ExchangeProviderDescription.stealthEx, ExchangeProviderDescription.chainflip, ExchangeProviderDescription.xoSwap, + ExchangeProviderDescription.swapsXyz, + ExchangeProviderDescription.nearIntents, + ExchangeProviderDescription.jupiter, ]; return ExchangeProviderLogEntry( timestamp: DateTime.parse(json['timestamp'] as String), - provider: allProviders.firstWhere( - (p) => p.title == json['provider'] as String, - orElse: () => ExchangeProviderDescription.changeNow, - ), + provider: allProviders.firstWhereOrNull((p) => p.title == json['provider'] as String), function: json['function'] as String, error: json['error'] as String?, stackTrace: json['stackTrace'] as String?, @@ -131,9 +132,9 @@ class ExchangeProviderLogger { } static void logError({ - required ExchangeProviderDescription provider, required String function, required dynamic error, + ExchangeProviderDescription? provider, StackTrace? stackTrace, Map? requestData, String? callStack, diff --git a/lib/view_model/dev/exchange_provider_logs_view_model.dart b/lib/view_model/dev/exchange_provider_logs_view_model.dart index 7c4ac16fd..f72e7568b 100644 --- a/lib/view_model/dev/exchange_provider_logs_view_model.dart +++ b/lib/view_model/dev/exchange_provider_logs_view_model.dart @@ -43,10 +43,11 @@ abstract class ExchangeProviderLogsViewModelBase with Store { int get errorLogs => logs.where((log) => !log.isSuccess).length; @computed - Map get logsByProvider { + Map get logsByProvider { final Map counts = {}; for (final log in logs) { - counts[log.provider] = (counts[log.provider] ?? 0) + 1; + if (log.provider == null) continue; + counts[log.provider!] = (counts[log.provider!] ?? 0) + 1; } return counts; } diff --git a/lib/view_model/exchange/exchange_view_model.dart b/lib/view_model/exchange/exchange_view_model.dart index d6854ac63..defdd8316 100644 --- a/lib/view_model/exchange/exchange_view_model.dart +++ b/lib/view_model/exchange/exchange_view_model.dart @@ -40,6 +40,7 @@ import 'package:cake_wallet/exchange/trade_request.dart'; import 'package:cake_wallet/generated/i18n.dart'; import 'package:cake_wallet/src/screens/exchange/widgets/currency_picker.dart'; import 'package:cake_wallet/store/app_store.dart'; +import 'package:cake_wallet/utils/exchange_provider_logger.dart'; import 'package:cake_wallet/utils/show_pop_up.dart'; import 'package:cw_core/currency.dart'; import "package:cw_core/wallet_info.dart"; @@ -321,7 +322,7 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with final List _tradeAvailableProviders = []; - Map _providerLimits = {}; + Map _providerLimits = {}; @observable ObservableList selectedProviders; @@ -681,14 +682,16 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with if (receiveAmountFiat.split(".").last.length <= digits) { return receiveAmountFiat; } - return double.parse(receiveAmountFiat).toStringAsPrecision(digits); + + return double.tryParse(receiveAmountFiat)?.toStringAsPrecision(digits) ?? '0.00'; } String roundedDepositAmountFiat(int digits) { if (depositAmountFiat.split(".").last.length <= digits) { return depositAmountFiat; } - return double.parse(depositAmountFiat).toStringAsPrecision(digits); + + return double.tryParse(depositAmountFiat)?.toStringAsPrecision(digits) ?? '0.00'; } @action @@ -875,6 +878,8 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with // will throw "Concurrent modification during iteration" error if modified at the same // time [createTrade] is called, as this is not a normal map, but a sorted map } + } else { + printV('calculateBestRate: ${_providers[i].title} returned rate=0'); } } @@ -914,10 +919,10 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with to: to, isFixedRateMode: isFixedRateMode, ) - .onError((error, stackTrace) => Limits(max: 0.0, min: double.maxFinite)) + .onError((error, stackTrace) => null) .timeout( Duration(seconds: 7), - onTimeout: () => Limits(max: 0.0, min: double.maxFinite), + onTimeout: () => null, ); return MapEntry(provider, limits); }).toList(); @@ -925,7 +930,9 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with final entries = await Future.wait(futures); _providerLimits = Map.fromEntries(entries); - _providerLimits.values.forEach((tempLimits) { + _providerLimits.values + .whereType() + .forEach((tempLimits) { if (lowestMin != null && (tempLimits.min ?? -1) < lowestMin!) { lowestMin = tempLimits.min; } @@ -968,18 +975,58 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with } } - late final Map providers; + if (depositCurrency == CryptoCurrency.btcln && + depositAddress == wallet.walletAddresses.addressForExchange) { + final invoice = await bitcoin!.getLightningInvoice(wallet, BigInt.zero); + if (invoice != null) { + depositAddress = invoice; + } + } + + if (receiveCurrency == CryptoCurrency.btcln && + receiveAddress == wallet.walletAddresses.addressForExchange) { + final invoice = await bitcoin!.getLightningInvoice(wallet, BigInt.zero); + if (invoice != null) { + receiveAddress = invoice; + } + } + + Map providers; if (forcedProvider != null) { providers = {forcedProviderRate: forcedProvider!}; } else { - providers = _sortedAvailableProviders; + providers = Map.fromEntries( + _sortedAvailableProviders.entries.where( + (e) => selectedProviders.contains(e.value), + ), + ); } // Ensure we have providers available before attempting to create trade if (providers.isEmpty) { await calculateBestRate(); + if (forcedProvider != null) { + providers = {forcedProviderRate: forcedProvider!}; + } else { + providers = Map.fromEntries( + _sortedAvailableProviders.entries.where( + (e) => selectedProviders.contains(e.value), + ), + ); + } if (providers.isEmpty) { + ExchangeProviderLogger.logError( + provider: null, + function: 'createTrade', + error: 'No providers available for $depositCurrency->$receiveCurrency', + requestData: { + 'from': depositCurrency.title, + 'to': receiveCurrency.title, + 'fromAmount': _depositAmount, + 'toAmount': _receiveAmount, + }, + ); tradeState = TradeIsCreatedFailure( title: S.current.trade_not_created, error: S.current.none_of_selected_providers_can_exchange); @@ -1022,6 +1069,8 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with final provider = providersSnapshot[i]; final providerRate = ratesSnapshot[i]; + printV('createTrade: trying provider=${provider.title}'); + // Skip Swaps.xyz when sending from external if (isSendFromExternal && provider.description == ExchangeProviderDescription.swapsXyz) { @@ -1055,7 +1104,10 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with amount = amount.replaceAll(',', '.'); if (limitsState is LimitsLoadedSuccessfully) { - if (double.tryParse(amount) == null) continue; + if (double.tryParse(amount) == null) { + printV('createTrade: ${provider.title} amount parse failed: "$amount"'); + continue; + } if (limits.min != null && double.parse(amount) < limits.min!) { continue; @@ -1075,6 +1127,17 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with final canCreateTrade = await isCanCreateTrade(trade); if (!canCreateTrade.result) { + ExchangeProviderLogger.logError( + provider: provider.description, + function: 'createTrade', + error: canCreateTrade.errorMessage ?? 'isCanCreateTrade returned false', + requestData: { + 'from': depositCurrency.title, + 'to': receiveCurrency.title, + 'fromAmount': _depositAmount, + 'toAmount': _receiveAmount, + }, + ); continue; } @@ -1084,7 +1147,21 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with /// return after the first successful trade return; - } catch (e) { + } catch (e, s) { + ExchangeProviderLogger.logError( + provider: provider.description, + function: 'createTrade', + error: e, + stackTrace: s, + requestData: { + 'from': depositCurrency.title, + 'to': receiveCurrency.title, + 'fromAmount': _depositAmount, + 'toAmount': _receiveAmount, + 'toAddress': receiveAddress, + 'refundAddress': depositAddress, + }, + ); continue; } } @@ -1206,6 +1283,7 @@ abstract class ExchangeViewModelBase extends WalletChangeListenerViewModel with _receiveAmount = ''; bestRate = 0.0; bestRateProvider = null; + _sortedAvailableProviders.clear(); loadLimits(); _setAvailableProviders(); }