I'm super close friends with this girl, and I'm her closest friend here too. She has a close friend back in her home country as well.

She asked me along to a trip she had planned with that friend last year, and we went together. Despite meeting the other girl for the first time we all got along great seeing as we all had a similar sense of humour and all. However there was some passive aggressive shit going on which made me want to rage sometimes.

Sometimes I'd get quite friendly with the other girl, and my friend would do something to interject in a manner suggesting she did not like me getting closer to her friend (as in she only wanted her friend to be close to her). Like, I'm good with makeup so I would do the girl's makeup before going out to be nice, because she didn't know how to do. But my friend in an annoyed tone would tell me to go and do my own stuff, that she'd finish it off.

Then there'd be passive aggressive shit which belongs in high school, like if we'd walk on the pavement they'd kinda walk in a way that forces me to walk behind them. Then if I walked in front my friend would get annoyed and tell me to allow some space for her friend. Or once, I was paying for our meal at a restaurant, I had paid for them too (we take turns paying the whole tab at different meals). I turned around and they were gone. The girl had run to some other shop, and my friend just kinda looked at me and ran off to follow her without fucking telling me where they're going, so I had to search for them. Stuff like that which I stayed quiet about because I felt it was petty and I didn't want to ruin an otherwise fun holiday.

We've booked another trip together which is coming up soon and I don't want to run into the same kind of shit. What to do?