Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ChangeHero plugin #1642

Closed
wants to merge 162 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
162 commits
Select commit Hold shift + click to select a range
7618905
Merge branch 'develop'
paullinator Mar 21, 2018
33c26a6
Bump Version 1.1.0
rjrs2k Mar 30, 2018
bcbf68b
Bump bitcoin version
thehobbit85 Mar 27, 2018
09ef88d
Upgrade core and bitcoin libraries
paullinator Apr 6, 2018
06e3d0c
Merge branch 'develop'
swansontec Apr 13, 2018
dbfb346
Merge branch 'develop'
paullinator Apr 20, 2018
372ae49
Merge branch 'develop'
paullinator Apr 20, 2018
23beeb6
Add login debug logging
wolverineks Apr 30, 2018
9ba8fb1
Merge branch 'develop'
swansontec May 9, 2018
8355c88
Merge branch 'develop'
swansontec May 10, 2018
c091a20
Merge branch 'develop'
wolverineks May 10, 2018
f300641
Merge branch 'develop'
swansontec May 11, 2018
ef6773d
Merge branch 'develop'
paullinator May 12, 2018
5c0a554
Merge branch 'develop'
swansontec May 14, 2018
3b0d67e
Merge branch 'develop'
paullinator Jun 16, 2018
33ed3e7
Merge branch 'develop'
paullinator Jun 18, 2018
d13941f
Merge branch 'develop'
paullinator Jun 19, 2018
827a1de
Merge branch 'develop'
wolverineks Jun 20, 2018
2b184c3
Merge develop to master
paullinator Jun 20, 2018
cb89a9a
Merge branch 'develop'
paullinator Jun 28, 2018
4e767a0
Merge branch 'develop'
paullinator Jul 7, 2018
ebd29c8
Merge branch 'develop'
paullinator Jul 11, 2018
7f1958b
Merge develop to master
paullinator Jul 24, 2018
fb5dafe
Merge branch 'develop'
paullinator Aug 10, 2018
64458c1
Change sort order of currencies
paullinator Aug 10, 2018
c251e5b
Update changelog
paullinator Aug 10, 2018
b168a97
Remove shims added margins on text and slider components
amanalili Aug 10, 2018
be7b7a4
bump bitcoin version to fix sweepPrivateKey issues
thehobbit85 Aug 14, 2018
7d4e3d0
bum version of login-ui-rn and gui version
ahujsak Aug 14, 2018
eb685fd
Bump bitcoin version
paullinator Aug 15, 2018
17eb01d
Update bitcoin plugin to fix issues with networks that have both segw…
thehobbit85 Aug 17, 2018
aa71044
update to 1.3.2
rjrs2k Aug 17, 2018
f6b7b9c
Merge pull request #795 from EdgeApp/rjrs2k-patch-2
swansontec Aug 17, 2018
77bf24f
Merge branch 'develop'
wolverineks Sep 1, 2018
6624902
Merge branch 'develop'
paullinator Sep 14, 2018
d30619c
Merge branch 'develop'
paullinator Sep 14, 2018
2133f8c
Merge branch 'develop'
paullinator Sep 15, 2018
89ab85d
update bitcoin dependency
thehobbit85 Sep 21, 2018
2a29205
Merge branch 'develop'
paullinator Oct 5, 2018
2b803b7
Merge branch 'develop'
paullinator Oct 6, 2018
662638c
Merge branch 'develop'
paullinator Oct 6, 2018
99cfeed
Remove eboost for now
paullinator Oct 7, 2018
0deaaab
update bitcoin dependency to get the Digi-Fix
thehobbit85 Oct 8, 2018
d65bfaf
Merge branch 'develop'
paullinator Oct 24, 2018
9dd89e7
Merge branch 'develop'
paullinator Oct 24, 2018
12ca522
Sign in With Google user agent
ahujsak Oct 24, 2018
bde9fc4
Fix theoretical bug with Shapeshift activation
swansontec Oct 24, 2018
5e7d451
fix token amounts
ahujsak Oct 25, 2018
79856e3
Update version 1.4.1
paullinator Oct 25, 2018
ef1c49c
Bump login-ui version
kylanhurt Oct 24, 2018
bd7defa
Conditionally fix wallet list dropdown for Android
kylanhurt Oct 25, 2018
f75eacf
Fix size issue caused by fee parameter
ahujsak Oct 25, 2018
cb21dd7
clean out fee related display code.
ahujsak Oct 25, 2018
3c26b6d
bump core version
ahujsak Oct 25, 2018
6095a53
Update changelog and version
paullinator Oct 26, 2018
8cb3036
Bump monero library to fix build break.
paullinator Nov 6, 2018
9a9d4a3
Merge branch 'develop'
paullinator Nov 17, 2018
cab521c
Merge branch 'develop'
paullinator Nov 18, 2018
aba276b
Add the BitcoinSV plugin
thehobbit85 Nov 21, 2018
0fc1efa
Add BitcoinSV as a split option to BitcoinCash
thehobbit85 Nov 21, 2018
84371a1
Implement conditional for splitting BCH -> BSV
kylanhurt Nov 21, 2018
e476db0
Update bitcoin and core-js
thehobbit85 Nov 22, 2018
998bd15
Bump edge-currency-accountbased to v0.0.13
paullinator Nov 24, 2018
f6c5c51
Fix several bugs with wallet options for splitting
paullinator Nov 22, 2018
61e094c
BCH to BSV split fixes
paullinator Nov 23, 2018
2be1ef1
Update ReleaseNotes.txt
paullinator Nov 27, 2018
d1e6a15
update the bitcoin
thehobbit85 Nov 28, 2018
9388d99
update core and setup some eslint settings
thehobbit85 Nov 27, 2018
65ab0f1
v1.4.4
paullinator Nov 28, 2018
fe5a292
v1.4.5
paullinator Dec 4, 2018
cb2e05b
Merge branch 'develop'
paullinator Dec 15, 2018
71420c4
Merge branch 'develop'
paullinator Dec 15, 2018
e415ee7
Merge branch 'develop'
paullinator Jan 12, 2019
979af7b
Merge branch 'develop'
paullinator Jan 15, 2019
d1d0bc4
Merge branch 'develop'
paullinator Jan 22, 2019
30cf76e
Merge branch 'develop'
paullinator Feb 12, 2019
65774cb
Merge branch 'develop'
paullinator Mar 8, 2019
5f8c001
Upgrade to react-native-fast-crypto v1.7.0
swansontec Mar 8, 2019
95df2a6
Merge branch 'develop'
swansontec Mar 8, 2019
53d8ffe
Fix native token visibility issue
kylanhurt Mar 11, 2019
9a942e3
Disable editing of all native tokens
kylanhurt Mar 11, 2019
ee4f338
Bump version number for token issues
kylanhurt Mar 12, 2019
5e63757
Merge branch 'develop'
swansontec Mar 22, 2019
a72bd41
Update edge-currency-bitcoin
kylanhurt Mar 25, 2019
baeac90
Merge branch 'develop'
swansontec Apr 3, 2019
e03f0a1
Merge branch 'develop'
swansontec Apr 3, 2019
57d409e
Merge branch 'develop'
swansontec Apr 4, 2019
93c837d
Merge remote-tracking branch 'origin/develop'
ahujsak Apr 18, 2019
9e72292
Merge branch 'develop'
swansontec Apr 19, 2019
7035634
Merge branch 'develop'
swansontec Apr 19, 2019
c0f172c
Bump bitcoin plugin to include LTC electrum server fix
kylanhurt Apr 22, 2019
861f325
merge develop into master, resolve package conflicts
ahujsak May 2, 2019
bc4b807
Merge branch 'develop'
swansontec May 4, 2019
a4a665b
Merge remote-tracking branch 'origin/develop'
ahujsak May 8, 2019
fc4739d
Merge branch 'develop'
swansontec May 15, 2019
6e23588
Add DOGE xpub option
peachbits May 23, 2019
1090564
Merge pull request #1385 from peachbits/patch-10
paullinator May 23, 2019
2c4393b
Merge branch 'develop'
swansontec May 27, 2019
128f85c
Merge branch 'develop'
swansontec Jun 11, 2019
5fbc13a
Merge branch 'develop'
swansontec Jun 12, 2019
832c679
Merge branch 'develop'
swansontec Jun 13, 2019
a1d2385
Update minimum SDK version to 23+ (Android 6)
swansontec Jun 19, 2019
250b0c0
v1.8.1
swansontec Jun 19, 2019
545c326
Merge branch 'develop'
swansontec Jun 20, 2019
cd438f0
Revert "Merge branch 'develop'"
swansontec Jun 26, 2019
1e56e28
Upgrade to edge-core-js v0.16.4
swansontec Jun 26, 2019
4e1148b
v1.8.2
swansontec Jun 26, 2019
90e096f
Merge branch 'develop'
swansontec Jul 5, 2019
5bc8442
Merge remote-tracking branch 'origin/develop'
ahujsak Jul 7, 2019
8253529
Merge branch 'develop'
swansontec Jul 8, 2019
fb3d21e
Merge branch 'develop'
swansontec Jul 9, 2019
27332c0
Bump plugins for Totle and Xagaue
kylanhurt Jul 11, 2019
739e15d
Merge branch 'develop'
swansontec Jul 16, 2019
1cade2b
Merge branch 'develop'
swansontec Jul 16, 2019
0de5c89
fixDeepLink
ahujsak Jul 17, 2019
624c67a
added new stack for deeplink
ahujsak Jul 17, 2019
c3a870d
Merge remote-tracking branch 'origin/develop'
ahujsak Jul 29, 2019
e2301c2
disable shapeshift
peachbits Aug 1, 2019
dca9f9a
bump to 1.8.6
peachbits Aug 1, 2019
f291557
Merge branch 'develop'
swansontec Aug 8, 2019
53fb44d
Merge commit '235c4cc32c071b3b328a6701db60b22382da206d'
peachbits Aug 8, 2019
e50ed9c
Switch iOS to manual signing
swansontec Aug 12, 2019
e8311f9
Bump to v1.8.8 for upload test
swansontec Aug 12, 2019
6848aa9
cherry pick of fix for wyre default routing: fixed conflicts
ahujsak Aug 13, 2019
9877ea3
Re-enable Safello
kylanhurt Aug 11, 2019
dea41d6
v1.8.9 (For Safello test)
swansontec Aug 15, 2019
2080c12
added bits of gold and updated priorities
peachbits Aug 15, 2019
ca667c8
Merge branch 'develop'
swansontec Aug 16, 2019
d61cdac
Merge remote-tracking branch 'origin/develop'
ahujsak Aug 20, 2019
bb781cf
update changelog
ahujsak Aug 20, 2019
71b3dbb
Merge remote-tracking branch 'origin/develop'
ahujsak Aug 21, 2019
2860d65
v1.8.9
ahujsak Aug 21, 2019
ecaf1b0
update changelog to reflect 1.8.9
ahujsak Aug 21, 2019
0e888fa
Upgrade edge-exchange-plugins (GoDex isEstimate to false)
kylanhurt Aug 22, 2019
c0f028f
Upgrade edge-currency-bitcoin
kylanhurt Aug 22, 2019
a772892
Bump exchange plugin to disable USDT source currency for GoDex
kylanhurt Aug 23, 2019
b96a666
Merge branch 'develop'
swansontec Aug 23, 2019
c82d63e
Added banxa
peachbits Aug 26, 2019
0731af5
Merge branch 'develop'
kylanhurt Aug 30, 2019
d4de63f
Bump edge-currency-accountbased for XTZ getBalance fix
kylanhurt Sep 4, 2019
6bb5e5b
v1.9.2
kylanhurt Sep 4, 2019
2e13286
Merge branch 'develop'
swansontec Sep 8, 2019
576415f
Merge branch 'develop'
swansontec Sep 9, 2019
6836b17
Merge branch 'develop'
swansontec Sep 13, 2019
a81f232
Merge branch 'develop'
swansontec Sep 13, 2019
8a4c45a
Merge branch 'develop'
swansontec Sep 15, 2019
aa4c5bd
Merge branch 'develop'
swansontec Sep 20, 2019
0b34af9
Merge remote-tracking branch 'origin/develop'
ahujsak Sep 21, 2019
6bbe680
Merge branch 'develop'
kylanhurt Sep 21, 2019
f78e97d
Merge branch 'develop'
swansontec Sep 25, 2019
e76958b
Leave all engines paused for memory usage
swansontec Sep 23, 2019
49ddfd2
Merge branch 'william/no-engines'
swansontec Sep 25, 2019
6d9aa34
Revert "Merge branch 'william/no-engines'"
swansontec Sep 25, 2019
86b747c
Merge branch 'develop'
swansontec Sep 26, 2019
d4dab43
changehero
Sep 26, 2019
57353d4
utils
Sep 26, 2019
e074da3
merge
Sep 26, 2019
c705eb2
lock
Sep 27, 2019
9057b39
removed testing dependencies
Sep 27, 2019
ddd524b
revert lock back
Sep 27, 2019
9c73f37
Merge remote-tracking branch 'upstream/develop' into changehero
Sep 27, 2019
aade171
removed testing gradle
Sep 27, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions env.example.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
"X_COINSWITCH_INIT": {
"apiKey": "xxxx"
},
"X_CHANGEHERO_INIT": {
"apiKey": "xxxx",
"secret": "xxxx"
},

"-------- app options --------": 0,
"DEBUG_CORE_BRIDGE": false,
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions src/assets/images/exchange/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// @flow

import changeheroFullLogo from './exchange_logo_changehero.png'
import changellyFullLogo from './exchange_logo_changelly.png'
import changenowFullLogo from './exchange_logo_changenow.png'
import coinswitchFullLogo from './exchange_logo_coinswitch.png'
Expand All @@ -8,6 +9,7 @@ import foxExchangeFullLogo from './exchange_logo_fox_exchange.png'
import godexFullLogo from './exchange_logo_godex.png'
import shapeshiftFullLogo from './exchange_logo_shapeshift.png'
import totleFullLogo from './exchange_logo_totle.png'
import changeheroLogo from './settingsExchangeChangeHero.png'
import changellyLogo from './settingsExchangeChangelly.png'
import changenowLogo from './settingsExchangeChangenow.png'
import coinswitchLogo from './settingsExchangeCoinswitch.png'
Expand All @@ -32,7 +34,8 @@ export const swapPluginIcons = {
foxExchange: foxExchangeLogo,
godex: godexLogo,
shapeshift: shapeshiftLogo,
totle: totleLogo
totle: totleLogo,
changehero: changeheroLogo
}

// Big logos for the quote scene:
Expand All @@ -44,5 +47,6 @@ export const swapPluginLogos = {
foxExchange: foxExchangeFullLogo,
godex: godexFullLogo,
shapeshift: shapeshiftFullLogo,
totle: totleFullLogo
totle: totleFullLogo,
changehero: changeheroFullLogo
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions src/components/services/ContactsLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,18 @@ const merchantPartners = [
jobTitle: '',
familyName: '',
recordID: ''
},
{
givenName: 'ChangeHero',
hasThumbnail: true,
thumbnailPath: 'https://developer.edge.app/content/changehero.png',
emailAddresses: [],
postalAddresses: [],
middleName: '',
company: '',
jobTitle: '',
familyName: '',
recordID: ''
}
]

Expand Down
3 changes: 2 additions & 1 deletion src/util/corePlugins.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ export const swapPlugins = {
foxExchange: ENV.FOX_INIT,
godex: ENV.GODEX_INIT,
shapeshift: ENV.SHAPESHIFT_INIT,
totle: ENV.TOTLE_INIT
totle: ENV.TOTLE_INIT,
changehero: ENV.CHANGEHERO_INIT
}

export const allPlugins = {
Expand Down