Use new bisq 2.1.3 version #187
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ij does so adding its own config
- setup pom for JDK 11
From this experience we concluded effort will be way too hi for the gains and we are dropping this POC
dropped even though it supports J21. - change CN1 poc folder name
…e to support 3 apps (2 thin clients - iOS and Android - and 1 bisq node in Android)
…locally published m2 java 17 compatible common module jar POC. More info see bisq-network/bisq2@main...HenrikJannsen:bisq2:adjustments-for-andorid-support
- upgraded gradle wrapper to latest version - installed pods and uploading to repo to facilitate development on iOS - fix issue with generated project manifest for Android - add MacOS handy run config for fleet since it's not picking it up automatically
…I across the iOS and the 2 Android apps
- improved README files with current setup data and instructions
experience of a dev joining following the docs
…docs README: getting started improvements based on first new dev joining the project experience
- linked lifecycle to unique definiton (Based on android) for both platform - fully tested for Android and iOS - regenerated pods
* - implemented default trusted node changes + multiplatform navigate to url with handy base presenter method to reuse * - fix navigateToUrl in iOS * - Implemented enable/disable interactivity of UI in a generalized way with examples in home screen and avatar + node specific getting started texts * - fix bug on breadcrum navigation generating multiple leafs connections * - connected offers online with facade. * - robust implementation for enable/disable interactivity to run on ui thread - fix major bug: presenters loosing root link on first destroy
* - My Trades UI (#132), Trading UI Dialogs (#131) * - Create offer FAB button in Offer list screen (#114) * - showSnackBar() in BasePresenter. Tested in androidNode, androidClient. Having some other resource loading issue with iOS, not able to test. * - Copy, Paste, Scan QR (Tested in android) * - Code refactor: CloseIcon * Removed QR Code Scanner for this PR * Fix: Missing Icon imports * Offer card layout - Experimenting * - file refactorings: Removed duplicate OfferListPresenter in 'offers'; moved all files from 'offers' to 'offer' and from 'trades' to 'trade' * - [fix] Create Offer nav issue * - Remove Take offer nav stack, when Take offer flow is confirmed and TradeFlow nav happens; Snackbar warnings in PaymentMethod screen, when payment method is not selected * - removed qr related code; removed dead code; Snackbar color - Dark text over white BG * Take offer UI Improvements - AmountScreen - Amount selector - Placed vertically center; - PaymentMethodScreen - Make use of PaymentMethodCard as done in Createoffer flow; - ReviewScreen - BisqUIConstants; Misc UI Improvements - CreateOfferPaymentMethodScreen - Adjust spacing; - BisqAmount select - Comment on usage * - Fixed compile time issues * [Fix] Back navigation * - added potential implementation for ios BackHAndler commented for now as explained in the TODO --------- Co-authored-by: Rodrigo Varela <[email protected]>
* Add i18n support using java property files. Not working yet on ios. Processing of the file content need more work (manual linebreaks not detected yet) and testing. * Add 2 example usages * Add type check * Move resources to common main * Adjust gradle file to include resources in ios * Use Properties instead of loading resource as text * Dont throw if resources not found (for dev) * Add resources from commonMain to android. FOr ios its still not working. several attempts are kept in commented out form... * - fix crash when some mappings are not found/defined & defaulting to english * cleanups * Generate class with all resources based on resource files. Build fails as it seems it does not access the src dir with the generated class correctly. * Use source dir instead of build dir as on iOS there are issues. Split files per language. Add UTF8 support * - removed dead code --------- Co-authored-by: Rodrigo Varela <[email protected]>
* - bump android apps versions * - release configuration for android apps, including naming, versioning and proguard settings for each app * - updated ci config
- provided handy navigation methods on base presenter - applied to all usages
* Refactoring: Move replicated package into data package * Refactoring: Rename offer to offerbook. Move create_offer one level up * Refactoring: Move offerbook specific components to offerbook package * Refactoring: Rename classes and files * Refactoring: Move take_offer package one level up * Refactoring: Rename classes and files * Refactoring: Rename Routes, rearrange to group by domain * Cleanup: Remove demo test classes * Cleanup: Remove Greeting demo classes * Add trade process domain * Add `presenterScope.cancel()` call at `detachView` to ensure that jobs created in presenterScope are cancelled when view gets detached * Set devMode to true. For production we need to revert that. We should set that flag from the run configuration, but not sure how that works in Android (in Bisq 2 we pass it as JVM argument). Also reduce the devModeDelayInMs which is just to mimic a delay at clearnet. * Fix build issues as `localProperties["KEYSTORE_PATH"]` is null * Fix bug with delete offer at client * Fix missing reset of selectedTrade * request settings in splash controller * Fix missing parameter * Refactor: Rename and move classes * Move readme and update * Refactor dto and model classes * Add readme for websockets * - fix UI crash on closing trade * - fix reject trade UI white screen of death * - revert cocoapods downgrade (iOS crash on startup) * Check if paymentProof is set only for mainchain. Ensure we sent null and not empty string if not set on LN. --------- Co-authored-by: Rodrigo Varela <[email protected]>
* WebSocketClient dynamic host/port - make dependants on webSocketclient use a provider - provider listens to settings repository changes and updates instance cached - implementation for test connection on trusted node setup * - proper implementation of test connection + adjustements on updating settings * - added TODOs for short term changes coming
* - code refactor cleanup * - redirect to trusted node after no connectivity detected in splash
* - 3 states of connectivity implementation and usage for trusted node with reconnection on connectivity recovered * - reconnect services on reconnection for a resilient experience
- full implementation for both android apps: placeholder for potential UI - partial implementation for iOS: crash still propagates but gets logged - both implementation linked to shared code
- removed hardcoded presenter dependencies - provider to group several related presenters - use koin to provide them
* Ongoing trades notifications (node) - removed test code for notifications - add handy helpers on BasePresenters to push notifications - allow registration of observers in notiofications controller to run whilst app backgrounded/killed * - Notification controller can register/unregister observers - usage in main presenter to track open trades * - tidy up code - presenters related to trade process not singleton (use factory instead) * - make sure notifications are clickable on android - notification takes user to open trades tab - refactor main notification open trade code into its own service * - refactor to reuse route titles to detect destination + minor code naming adaptations
* - land user in open trades when clicking notification implemented for bisq connect android * refactor: extract foreground detector into a separate platform based code controller * - android client working (Except kill app case for the reasons in discussion) - improved logging for iOS
* iOS notifications implementation - background task that handles notifications only turned on whilst app is in the background - fix lifecycleaware not notifying onPause() correctly - ios notificationService implementation always return "in background" since the service only starts in background * - cleanup code
* - renaming of clients to Bisq Connect * - fix crash on take offer (when offer cannot be taken) * - ios release setup
* - Seller reputation warning dialog * - User agreement * - agreementAccepted - Moved to Settings model from User model * - TakeOffer Review: Progress Dialog and Success Dialog * - Chat Improvements: Current time; Quoted message trim; Scroll to quoted message on click * - Settings screen UI 1/2 * - fetch i18n_codes from Bisq2.LanguageRepository (Coulndt find/No service) that wraps this Repository * - Settings screen UI 2/3 * - User Agreement flow uses settingsServiceFacade, rather than settingsRepository * - Settings - Backend integration 1 * - searchable dropdown for supported languages; useAnimations, tradeNotifications removed * - Multi select for Dropdown with Chip control * - langugeCode, supportedLanguages in androidNode * - Settings page - Remaining controls wired functionally in androidNode * - update languagePairs from LanguageServiceFacade, when app language changes * - TextField validation - Implemented in SettingsScreen * - Text field validation for TrustedNodeSetupScreen.RemoteBisqURL * - isInteractive handled in Scaffolds, to block the entire scaffold content with an invisible overlay box that consumes all clicks and interactions * - show PoW control only in androidNode; println, deadcode cleanup * - Settings Page functionality for xClients; With LanguageServiceFacade, LanguageAPIGateway (tested in androidClient) * - TextField validations 1/2 * - TextField validations 2/2 * - useAnimations - to be accompanied with changes in bisq2 repo * - Cleanup * - fix pod files references (bug from previous PR) + fix compilation issue on iOS with new useAnimation setting * - hiding new general settings as they need more work (agreed with buddha) --------- Co-authored-by: Rodrigo Varela <[email protected]>
* - optimizations for gradle properties for a faster build (assembleDebuf ~45 secs). pushing also pods differences when testing this * - fix iOS config causing trouble on shared code build
HenrikJannsen
force-pushed
the
use-new-bisq-2.1.3-version
branch
from
753420c to
df95e5a
Compare
rodvar
reviewed
Feb 4, 2025
There was a problem hiding this comment.
The code looks good but can't test it because bisq2 latest in main is not building for me. Lots of errors like:
Projects/bisq2/offer/src/main/java/bisq/offer/bisq_musig/BisqMuSigOffer.java:37: error: cannot find symbol
List<FiatPaymentMethod> fiatPaymentMethods,
^
symbol: class FiatPaymentMethod
location: class BisqMuSigOffer
Projects/bisq2/offer/src/main/java/bisq/offer/bisq_musig/BisqMuSigOffer.java:60: error: cannot find symbol
List<TradeProtocolType> protocolTypes,
^
symbol: class TradeProtocolType
location: class BisqMuSigOffer
85 errors
is there any new module that needs to be added to buildAll or any changes in the env setup related to muSig maybe? @HenrikJannsen
gradle/libs.versions.toml
Outdated
| @@ -23,7 +23,7 @@ androidx-test-compose-ver = "1.6.8" | |||
| androidx-multidex = "2.0.1" | |||
| atomicfu = "0.26.1" | |||
| bignum-lib= "0.3.10" | |||
| bisq-core = "2.1.2" | |||
| bisq-core = "2.1.3" | |||
| @@ -21,7 +19,7 @@ class TrustedNodeSetupPresenter( | |||
| private val _isBisqApiUrlValid = MutableStateFlow(false) | |||
| override val isBisqApiUrlValid: StateFlow<Boolean> = _isBisqApiUrlValid | |||
|
|
|||
| private val _bisqApiUrl = MutableStateFlow("ws://10.0.0.1:8090") | |||
| private val _bisqApiUrl = MutableStateFlow("ws://10.0.2.2:8090") | |||
There was a problem hiding this comment.
this is a default value, it gets overiden but whatever is saved in the settings. Anyways nice to have it as the android emu
| @@ -62,7 +72,7 @@ fun TrustedNodeSetupScreen(isWorkflow: Boolean = true) { | |||
| BisqLogo() | |||
| Spacer(modifier = Modifier.height(24.dp)) | |||
| BisqText.largeRegular( | |||
| text = "To use Bisq through your trusted node, please enter the URL to connect to. E.g. ws://10.0.0.1:8090", | |||
| text = "To use Bisq through your trusted node, please enter the URL to connect to. E.g. ws://10.0.2.2:8090", | |||
There was a problem hiding this comment.
this is user facing example, really didn't need the change but its no big deal
There was a problem hiding this comment.
its just easier for devs without looking up what the correct IP... We should also auto-fill it IMO while in dev
Bisq 2 build is failing? I did a binary build yesterday, so I am pretty sure all is ok there. |
|
☝️ issues fixed with bisq-network/bisq2#3177 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.