🚀[ Release v.2.7.1] Merge into Develop (#104)

* 🚀[ Release v.2.7.0] Merge into Main (#30)

* Added український language

- add uk xml file
-  removed the nl, sv, da files
- Escaped apostrphes in UK strings file
- Updated language choices

* 💣🐞[Hotbug fix] sharedprefs fb fix (#19)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

* subproject commit

* version bump

* Disabled FB send, Added Get Tasks

* Patch to hard code fees

- Static fees
- Removed the dep
- Turn crashlytics back on/off/on

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* 🚀[ Release v.2.6.0] Merge into Develop  (#13)

* version bump

* Hotfix/crashes v2.6.0 (#17)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

Co-authored-by: kcw-grunt <mrkerrywashington@icloud.com>

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* 🚀[Release] v2.6.1 (#21)

* version code bump

* 🚀[ Release v.2.6.0] Merge into Main  (#12)

* Added український language

- add uk xml file
-  removed the nl, sv, da files
- Escaped apostrphes in UK strings file
- Updated language choices

* 🥳[Feature] Unstoppable ext update (#11)

* WIP: DNC

Dropped in the UD code prior to testing

* Added study link

* Fix unstoppable domains dependency

* Updated the UD ext text

WIP::::Need to refactor once UK and deletion on SV, NL, DA

* added UK lang

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* version bump

* Hotfix/crashes v2.6.0 (#17)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

Co-authored-by: kcw-grunt <mrkerrywashington@icloud.com>

Co-authored-by: Victor Sima <vic.sima@gmail.com>

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* Feature/add bitrefill (#28)

* added bitrefill

- added kotlin fix

* Added localizations

- added logo

* Added Bitrefill Link

* hides fiat scollview from Bitrefill

* Adjusted the padding at the buy tab item view

* fixe test in Bitrefill detail

* fied logo and layout

* bump version and version code

* Feature/update branding (#29)

* added new logo

- reset the layout

* version code

* replaced coin logo

* bump versioncode

* fixed dep version

* added Bitrefill web listener

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* Create FUNDING.yml

For GH Sponsor

* 💣🐞[Hotbug fix] sharedprefs fb fix (#19)

* Added notes

* Bugfix - add missing pendingIntent flag for android 13

* Use firebase bom

* subproject commit

* version bump

* Disabled FB send, Added Get Tasks

* Patch to hard code fees

- Static fees
- Removed the dep
- Turn crashlytics back on/off/on

Co-authored-by: Victor Sima <vic.sima@gmail.com>

* Feature/add bitrefill (#28)

* added bitrefill

- added kotlin fix

* Added localizations

- added logo

* Added Bitrefill Link

* hides fiat scollview from Bitrefill

* Adjusted the padding at the buy tab item view

* fixe test in Bitrefill detail

* fied logo and layout

* bump version and version code

* Feature/update branding (#29)

* added new logo

- reset the layout

* version code

* 🚀[ Release v.2.7.0] Merge into Develop (#32)

* replaced coin logo

* bump versioncode

* fixed dep version

* added Bitrefill web listener

* [Techdebt/] pdate match firebase events 33 (#48)

* Added the equivalenmt events

- updated web link

* WIP : Should compile

* Fixed constants

* Udpaded all Analytics constants

* Added basic tests

- This is WIP
- Need to debug the Tests

* version bump

* fiexd compile bug

* version bump

* renmoved staging

* moved backup rates

* code bump

* Updated test configs

* Move api resources to central location

- version code bump

Co-authored-by: Victor Sima <vic.sima@gmail.com>

app/src/main/java/com/breadwallet/presenter/fragments/FragmentBuy.java

@@ -116,11 +116,10 @@ public void onPostMessage(WebView view, WebMessageCompat message, Uri sourceOrig
                 replyProxy.postMessage("Got it!");
             }
         };
+
         if (WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER)) {
             WebViewCompat.addWebMessageListener(webView, "bitrefillPostObj", rules, bitrefillListener);
         }
-
-
         String currency = getArguments().getString(CURRENCY_KEY);
         Partner partner = (Partner) getArguments().getSerializable(PARTNER_KEY);
 

app/src/main/java/com/breadwallet/tools/util/BRConstants.java

@@ -172,10 +172,7 @@ private BRConstants() {
             _20201121_SIL,
             _20201121_DRIA,
             _20201121_FRIA,
-<<<<<<< HEAD
             _20230113_BAC,
-=======
->>>>>>> 80e20a0e ([Techdebt/] pdate match firebase events 33 (#48))
             _20200207_DTHB,
             _20210405_TAWDF,
             _20210804_TAA2FAC,