Skip to content

Commit 6fc78da

Browse files
kcw-gruntvsima
andcommitted
🚀[ 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 <[email protected]> * 🚀[ 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 <[email protected]> Co-authored-by: Victor Sima <[email protected]> * 🚀[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 <[email protected]> * 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 <[email protected]> Co-authored-by: Victor Sima <[email protected]> Co-authored-by: Victor Sima <[email protected]> * 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 <[email protected]> * 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 <[email protected]> * 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 <[email protected]>
1 parent d09f405 commit 6fc78da

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,10 @@ public void onPostMessage(WebView view, WebMessageCompat message, Uri sourceOrig
116116
replyProxy.postMessage("Got it!");
117117
}
118118
};
119+
119120
if (WebViewFeature.isFeatureSupported(WebViewFeature.WEB_MESSAGE_LISTENER)) {
120121
WebViewCompat.addWebMessageListener(webView, "bitrefillPostObj", rules, bitrefillListener);
121122
}
122-
123-
124123
String currency = getArguments().getString(CURRENCY_KEY);
125124
Partner partner = (Partner) getArguments().getSerializable(PARTNER_KEY);
126125

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

-3
Original file line numberDiff line numberDiff line change
@@ -172,10 +172,7 @@ private BRConstants() {
172172
_20201121_SIL,
173173
_20201121_DRIA,
174174
_20201121_FRIA,
175-
<<<<<<< HEAD
176175
_20230113_BAC,
177-
=======
178-
>>>>>>> 80e20a0e ([Techdebt/] pdate match firebase events 33 (#48))
179176
_20200207_DTHB,
180177
_20210405_TAWDF,
181178
_20210804_TAA2FAC,

0 commit comments

Comments
 (0)