Skip to content

Commit

Permalink
Merge pull request #6188 from xyzmaker123/mark-own-offers
Browse files Browse the repository at this point in the history 
Mark user's own offers in Market -> Offer book
  • Loading branch information
@ripcurlx
ripcurlx authored May 9, 2022
2 parents 4d02eef + 2b69e34 commit 8a13076
Show file tree
Hide file tree
Showing 4 changed files with 38 additions and 21 deletions.
1 change: 1 addition & 0 deletions core/src/main/resources/i18n/displayStrings.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ shared.unconfirmedTransactionsLimitReached=You have too many unconfirmed transac
shared.numItemsLabel=Number of entries: {0}
shared.filter=Filter
shared.enabled=Enabled
shared.me=Me


####################################################################
Expand Down
23 changes: 14 additions & 9 deletions desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartView.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,16 +596,21 @@ public void updateItem(final OfferListItem newItem, boolean empty) {
super.updateItem(newItem, empty);
if (newItem != null && !empty) {
final Offer offer = newItem.offer;
final NodeAddress makersNodeAddress = offer.getOwnerNodeAddress();
String role = Res.get("peerInfoIcon.tooltip.maker");
PeerInfoIconSmall peerInfoIcon = new PeerInfoIconSmall(makersNodeAddress,
role,
offer,
model.preferences,
model.accountAgeWitnessService,
useDevPrivilegeKeys);
boolean myOffer = model.isMyOffer(offer);
if (!myOffer) {
final NodeAddress makersNodeAddress = offer.getOwnerNodeAddress();
String role = Res.get("peerInfoIcon.tooltip.maker");
PeerInfoIconSmall peerInfoIcon = new PeerInfoIconSmall(makersNodeAddress,
role,
offer,
model.preferences,
model.accountAgeWitnessService,
useDevPrivilegeKeys);
// setAlignment(Pos.CENTER);
setGraphic(peerInfoIcon);
setGraphic(peerInfoIcon);
} else {
setGraphic(new Label(Res.get("shared.me")));
}
} else {
setGraphic(null);
}
Expand Down
15 changes: 13 additions & 2 deletions desktop/src/main/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
import bisq.core.monetary.Price;
import bisq.core.offer.Offer;
import bisq.core.offer.OfferDirection;
import bisq.core.offer.OpenOfferManager;
import bisq.core.provider.price.PriceFeedService;
import bisq.core.user.Preferences;
import bisq.core.util.VolumeUtil;
Expand Down Expand Up @@ -71,6 +72,7 @@ class OfferBookChartViewModel extends ActivatableViewModel {
private static final int TAB_INDEX = 0;

private final OfferBook offerBook;
private final OpenOfferManager openOfferManager;
final Preferences preferences;
final PriceFeedService priceFeedService;
final AccountAgeWitnessService accountAgeWitnessService;
Expand All @@ -96,9 +98,14 @@ class OfferBookChartViewModel extends ActivatableViewModel {
///////////////////////////////////////////////////////////////////////////////////////////

@Inject
OfferBookChartViewModel(OfferBook offerBook, Preferences preferences, PriceFeedService priceFeedService,
AccountAgeWitnessService accountAgeWitnessService, Navigation navigation) {
OfferBookChartViewModel(OfferBook offerBook,
OpenOfferManager openOfferManager,
Preferences preferences,
PriceFeedService priceFeedService,
AccountAgeWitnessService accountAgeWitnessService,
Navigation navigation) {
this.offerBook = offerBook;
this.openOfferManager = openOfferManager;
this.preferences = preferences;
this.priceFeedService = priceFeedService;
this.navigation = navigation;
Expand Down Expand Up @@ -207,6 +214,10 @@ public boolean isSellOffer(OfferDirection direction) {
return direction == OfferDirection.SELL;
}

public boolean isMyOffer(Offer offer) {
return openOfferManager.isMyOffer(offer);
}

public void goToOfferView(OfferDirection direction) {
updateScreenCurrencyInPreferences(direction);
Class<? extends OfferView> offerView = isSellOffer(direction) ? BuyOfferView.class : SellOfferView.class;
Expand Down
20 changes: 10 additions & 10 deletions desktop/src/test/java/bisq/desktop/main/market/offerbook/OfferBookChartViewModelTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public void testMaxCharactersForBuyPriceWithNoOffers() {

when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, empty, null, null, null);
final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, null, empty, null, null, null);
assertEquals(0, model.maxPlacesForBuyPrice.intValue());
}

Expand All @@ -76,7 +76,7 @@ public void testMaxCharactersForBuyPriceWithOfflinePriceFeedService() {
when(priceFeedService.updateCounterProperty()).thenReturn(new SimpleIntegerProperty());
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, empty, priceFeedService, null, null);
final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, null, empty, priceFeedService, null, null);
model.activate();
assertEquals(0, model.maxPlacesForBuyPrice.intValue());
}
Expand All @@ -90,7 +90,7 @@ public void testMaxCharactersForFiatBuyPrice() {

when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, empty, service, null, null);
final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, null, empty, service, null, null);
model.activate();
assertEquals(7, model.maxPlacesForBuyPrice.intValue());
offerBookListItems.addAll(make(btcBuyItem.but(with(OfferBookListItemMaker.price, 94016475L))));
Expand All @@ -106,7 +106,7 @@ public void testMaxCharactersForBuyVolumeWithNoOffers() {

when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, empty, null, null, null);
final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, null, empty, null, null, null);
assertEquals(0, model.maxPlacesForBuyVolume.intValue());
}

Expand All @@ -119,7 +119,7 @@ public void testMaxCharactersForFiatBuyVolume() {

when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, empty, service, null, null);
final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, null, empty, service, null, null);
model.activate();
assertEquals(1, model.maxPlacesForBuyVolume.intValue()); //0
offerBookListItems.addAll(make(btcBuyItem.but(with(OfferBookListItemMaker.amount, 100000000L))));
Expand All @@ -135,7 +135,7 @@ public void testMaxCharactersForSellPriceWithNoOffers() {

when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, empty, null, null, null);
final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, null, empty, null, null, null);
assertEquals(0, model.maxPlacesForSellPrice.intValue());
}

Expand All @@ -154,7 +154,7 @@ public void testMaxCharactersForSellPriceWithOfflinePriceFeedService() {
when(priceFeedService.updateCounterProperty()).thenReturn(new SimpleIntegerProperty());
when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, empty, priceFeedService, null, null);
final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, null, empty, priceFeedService, null, null);
model.activate();
assertEquals(0, model.maxPlacesForSellPrice.intValue());
}
Expand All @@ -168,7 +168,7 @@ public void testMaxCharactersForFiatSellPrice() {

when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, empty, service, null, null);
final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, null, empty, service, null, null);
model.activate();
assertEquals(7, model.maxPlacesForSellPrice.intValue()); // 10.0000 default price
offerBookListItems.addAll(make(btcSellItem.but(with(OfferBookListItemMaker.price, 94016475L))));
Expand All @@ -184,7 +184,7 @@ public void testMaxCharactersForSellVolumeWithNoOffers() {

when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, empty, null, null, null);
final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, null, empty, null, null, null);
assertEquals(0, model.maxPlacesForSellVolume.intValue());
}

Expand All @@ -197,7 +197,7 @@ public void testMaxCharactersForFiatSellVolume() {

when(offerBook.getOfferBookListItems()).thenReturn(offerBookListItems);

final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, empty, service, null, null);
final OfferBookChartViewModel model = new OfferBookChartViewModel(offerBook, null, empty, service, null, null);
model.activate();
assertEquals(1, model.maxPlacesForSellVolume.intValue()); //0
offerBookListItems.addAll(make(btcSellItem.but(with(OfferBookListItemMaker.amount, 100000000L))));
Expand Down

0 comments on commit 8a13076

Please sign in to comment.