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

The android and ios trc fail in send #11979

Open
wants to merge 482 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
482 commits
Select commit Hold shift + click to select a range
53cadd3
Update translations PO
cmgustavo Oct 10, 2017
58ece11
Merge pull request #6878 from cmgustavo/translations/update-15
JDonadio Oct 10, 2017
d243017
Merge pull request #6874 from cmgustavo/feat/split-coin-receive
JDonadio Oct 10, 2017
2bef303
Fix: missing variable in wallet service
Gamboster Oct 11, 2017
a4f4c99
Merge pull request #6887 from Gamboster/fix/missingVariableWalletService
JDonadio Oct 11, 2017
dc385d9
MeLi: fix font size and color on success screen
cmgustavo Oct 16, 2017
e21750f
Merge pull request #6911 from cmgustavo/bug/meli-font-size-color
JDonadio Oct 16, 2017
38306ec
MeLi: Adds link to support if gift card could not generate
cmgustavo Oct 17, 2017
edab4a2
Merge pull request #6918 from cmgustavo/feat/MeLi_support
gabrielbazan7 Oct 20, 2017
3ec5082
Removes unnecessary translate attrib
cmgustavo Oct 23, 2017
3defd2d
fix fingerprint request loop
JDonadio Oct 24, 2017
4c79153
Merge pull request #6964 from JDonadio/fix/fingerprint-request-loop
matiu Oct 24, 2017
82e71c7
v3.8.6
matiu Oct 24, 2017
80788d2
Merge pull request #6959 from cmgustavo/bug/translation-tag-01
matiu Oct 24, 2017
e988d39
Merge pull request #6965 from matiu/ver/3.8.6
cmgustavo Oct 24, 2017
0fd5301
Fix missing icon-1024 for iOS. Updates support for iPhone X
cmgustavo Oct 24, 2017
c40ecf4
Update cordova plugins and configuration
cmgustavo Oct 25, 2017
1a035e1
Fix status bar for iOS
cmgustavo Oct 25, 2017
ef25fa1
MeLi: catch and save error in some cases
cmgustavo Oct 25, 2017
7a63638
Bower: fix ionic resolution. Also updates bower package
cmgustavo Oct 25, 2017
57f6c47
Merge pull request #6968 from cmgustavo/bug/ios-missing-icon-1024
gabrielbazan7 Oct 26, 2017
eeb60fb
Merge pull request #6969 from cmgustavo/bug/meli-handle-error
gabrielbazan7 Oct 26, 2017
1a53286
Merge pull request #6970 from cmgustavo/bug/ionic-package-01
gabrielbazan7 Oct 26, 2017
9d4f96a
AGC: catch error and save status
cmgustavo Oct 26, 2017
565ffae
Merge pull request #6976 from cmgustavo/bug/amazon-on-failure
JDonadio Oct 26, 2017
39e1f02
Build android with latest SDK version
cmgustavo Oct 26, 2017
bb3e9ee
Merge pull request #6980 from cmgustavo/bug/android-build-latest-version
JDonadio Oct 27, 2017
2486f82
Fix deprecated param (npm start)
cmgustavo Oct 27, 2017
355f1dd
Merge pull request #6986 from cmgustavo/build/fix-deprecated-param
JDonadio Oct 27, 2017
35417d2
Updates bitcore-wallet-client
cmgustavo Oct 28, 2017
e42ec04
Merge pull request #6995 from cmgustavo/feat/updates-bwc
JDonadio Oct 28, 2017
347f449
Revert "Updates bitcore-wallet-client"
cmgustavo Oct 29, 2017
ed259d8
Merge pull request #6999 from bitpay/revert-6995-feat/updates-bwc
JDonadio Oct 29, 2017
3ab416e
Updates API. Catch errors on GET and POST calls. Show more info if us…
cmgustavo Nov 2, 2017
f2ce627
Updates ionic-v1 (bower component)
cmgustavo Nov 6, 2017
4f4b0ac
Fix bower conf
cmgustavo Nov 6, 2017
ea1bccc
Merge pull request #7034 from cmgustavo/bug/coinbase-integration-02
gabrielbazan7 Nov 6, 2017
8458726
Notify important messages from BWS
cmgustavo Nov 6, 2017
0c4b009
Merge pull request #7063 from cmgustavo/feat/important-messages-01
matiu Nov 7, 2017
ce26940
Fix iOS and Android versions. Fix Status bar due to new ionic-webview
cmgustavo Nov 7, 2017
736d0be
Bump v3.9.0
cmgustavo Nov 7, 2017
9cb4aa3
prevent updating the same wallet 2+
matiu Nov 8, 2017
434992b
keep updating progress for big wallets after reentering walletDetails
matiu Nov 8, 2017
1082b7d
Merge pull request #7078 from matiu/bug/history-update
cmgustavo Nov 10, 2017
b9b2fff
Merge pull request #7076 from cmgustavo/bug/ionic-ios-01
gabrielbazan7 Nov 10, 2017
52bc711
Merge pull request #7077 from cmgustavo/release/v3.9.0
gabrielbazan7 Nov 10, 2017
98a78d1
Enable BCH wallet by default. Create BTC and BCH wallets for new inst…
cmgustavo Nov 10, 2017
d299dd9
Update fr.po
Kirvx Nov 12, 2017
626ed56
Update fr.po
Kirvx Nov 12, 2017
3123c1f
Merge pull request #7129 from Kirvx/patch-4
cmgustavo Nov 13, 2017
b080e1a
Do not create bch wallet on fresh install
cmgustavo Nov 13, 2017
f0e8972
copy extended private key
gabrielbazan7 Nov 13, 2017
eb49b71
remove item divider label
gabrielbazan7 Nov 13, 2017
353b8bb
remove option if wallet can't sign
gabrielbazan7 Nov 13, 2017
3d34ef8
ref warning
gabrielbazan7 Nov 13, 2017
e5a57f1
BitPay Card: balance as currency format
cmgustavo Nov 14, 2017
6f35ab2
Merge pull request #7139 from gabrielbazan7/feat/copyPrivKey
cmgustavo Nov 15, 2017
d302891
Merge pull request #7155 from cmgustavo/bug/bpcard-currency-balance
gabrielbazan7 Nov 15, 2017
585e4d5
fix dependencies
matiu Nov 15, 2017
6fbdb8e
Merge pull request #7172 from matiu/deps/fix-bwc-6.40
cmgustavo Nov 15, 2017
2cac7c0
Add packages for Dev
cmgustavo Nov 15, 2017
ed30ec3
Merge pull request #7173 from cmgustavo/bug/dev-missing-packages-01
matiu Nov 15, 2017
87d4aa9
Updates splash images. Support iPhone X full screen
cmgustavo Oct 29, 2017
e68d88a
Update plugins. Fix statusBar. Fix splash
cmgustavo Nov 14, 2017
c233aa4
Share address: do not hide tabs if keyboard is opened
cmgustavo Nov 16, 2017
8af5e30
Merge pull request #7185 from cmgustavo/bug/ios-tabs-02
gabrielbazan7 Nov 16, 2017
c21cd06
Fix: fingerprint function updated for android
Gamboster Nov 16, 2017
1d30ae3
Merge pull request #42 from Gamboster/guga/splashImages
cmgustavo Nov 16, 2017
9eb6580
Adds email in the invoice creation. Amazon gift card.
cmgustavo Nov 16, 2017
f81da64
Adds email in the invoice creation. Mercado Libre gift cards.
cmgustavo Nov 16, 2017
ecbce7d
Fix URL for MeLi support
cmgustavo Nov 16, 2017
b69480d
Merge pull request #7186 from cmgustavo/feat/buy-gift-card-email
matiu Nov 17, 2017
5ce0306
Merge pull request #7000 from cmgustavo/feat/iphone-x-support-splash
matiu Nov 17, 2017
024eb4c
Merge pull request #7104 from cmgustavo/feat/enable-bch-wallet
matiu Nov 17, 2017
866e7c4
Merge pull request #7187 from cmgustavo/feat/update-url-mercado-libre…
matiu Nov 17, 2017
6c71d15
Update translations
cmgustavo Nov 17, 2017
9e4d805
Merge pull request #7195 from cmgustavo/translations/update-16
gabrielbazan7 Nov 20, 2017
dfef820
Update translations - PO files
cmgustavo Nov 20, 2017
968efd6
Merge pull request #7209 from cmgustavo/translations/update-17
gabrielbazan7 Nov 20, 2017
dc43834
Fixes: show xpriv key if touch-id enabled
cmgustavo Nov 20, 2017
1fdfe39
Merge pull request #7215 from cmgustavo/bug/show-xpriv-touch-id
gabrielbazan7 Nov 20, 2017
725ab68
Fix paypro with non-backwards-compatible request
cmgustavo Nov 22, 2017
e8c9d93
Merge pull request #7238 from cmgustavo/bug/paypro-non-backwards-comp…
matiu Nov 22, 2017
6608e84
Fix translations (DE, JA). Updates PT
cmgustavo Nov 22, 2017
ab69eb4
Bump v3.9.1
cmgustavo Nov 22, 2017
9ba880a
Merge pull request #7240 from cmgustavo/translations/update-18
JDonadio Nov 22, 2017
6277d1d
Merge pull request #7242 from cmgustavo/release/v3.9.1
matiu Nov 22, 2017
561a33b
Enable Mercado Libre Service
cmgustavo Nov 27, 2017
026f695
Bump v3.10.0
cmgustavo Nov 27, 2017
eadd03a
Merge pull request #7291 from cmgustavo/feat/meli-enabled-01
gabrielbazan7 Nov 27, 2017
5667aab
Revert "Feat/meli enabled 01"
matiu Nov 27, 2017
a615abc
Merge pull request #7293 from bitpay/revert-7291-feat/meli-enabled-01
gabrielbazan7 Nov 29, 2017
0fed6b7
Update README.md
matiu Dec 3, 2017
c68d14b
Merge pull request #7338 from bitpay/matiu-patch-2
JDonadio Dec 4, 2017
02dcef1
Improves walletDetails cache (history) view. Ref fee service: adds in…
cmgustavo Dec 8, 2017
61b0a87
Fix UI for clearCache
cmgustavo Dec 8, 2017
b944368
Merge pull request #7387 from cmgustavo/ref/wallet-details-02
JDonadio Dec 8, 2017
b50c245
fee warning modal
JDonadio Dec 13, 2017
2838e7c
Merge pull request #7454 from JDonadio/ref/fee-warning-modal
cmgustavo Dec 15, 2017
4a11563
Adds fee warn for top up
cmgustavo Dec 15, 2017
aeac796
Adds warn to amz/meli
cmgustavo Dec 15, 2017
05b22e5
Merge pull request #7499 from cmgustavo/feat/fee-warn
gabrielbazan7 Dec 18, 2017
f9b9f21
Enable MeLi. Updates links to redeem
cmgustavo Dec 18, 2017
7918886
missing ;
cmgustavo Dec 18, 2017
09fb579
Save pending gift cards if error occurs. Updates card if status failure
cmgustavo Dec 19, 2017
05a642e
Merge pull request #7520 from cmgustavo/feat/meli-link-redeem
gabrielbazan7 Dec 19, 2017
3de937a
Merge pull request #7532 from cmgustavo/feat/amazon-gift-card-re-try
gabrielbazan7 Dec 19, 2017
faa0a2d
Update cards if status failure
cmgustavo Dec 19, 2017
81b0b88
Merge pull request #7540 from cmgustavo/feat/meli-update-cards
gabrielbazan7 Dec 19, 2017
6c34971
Bump v3.10.1
cmgustavo Dec 20, 2017
00be2af
Merge pull request #7568 from cmgustavo/release/v3.10.1
JDonadio Dec 20, 2017
e1d9b48
details link
JDonadio Dec 21, 2017
fcf611e
add externalLink service for topup
JDonadio Dec 21, 2017
926d2ba
bitpay-card: fix cta-button placement on iPhone X
bitjson Dec 21, 2017
2403efd
Feat: ShapeShift
cmgustavo Dec 22, 2017
8c3f20f
Adds intro page. Save pending tx
cmgustavo Dec 22, 2017
fd20901
Fix UI
cmgustavo Dec 26, 2017
c37aa1a
Fix return shapeshift list
cmgustavo Dec 26, 2017
e4ae61a
Manual update. Save shifts
cmgustavo Dec 26, 2017
7527287
Merge pull request #7596 from JDonadio/ref/details-at-confirm
gabrielbazan7 Dec 26, 2017
7395b84
Merge pull request #7599 from bitjson/master
gabrielbazan7 Dec 26, 2017
6ac6579
Merge pull request #7607 from cmgustavo/feat/shapeshift-integration-01
gabrielbazan7 Dec 26, 2017
b73e493
Bump v3.11.0
cmgustavo Dec 26, 2017
f7bd160
Adds public key request. Fix refresh transactions list
cmgustavo Dec 26, 2017
bb88313
Fix wording. Adds more detail tx
cmgustavo Dec 26, 2017
111e206
Fix confirm and cancel on mobile
cmgustavo Dec 26, 2017
60f839a
Debounce for status request
cmgustavo Dec 26, 2017
adfda93
Fixes if btc and/or bch wallet does not exist
cmgustavo Dec 27, 2017
9babaae
Removes unnecessary code
cmgustavo Dec 27, 2017
f4a7cfc
Merge pull request #7681 from cmgustavo/feat/shapeshift-integration-02
gabrielbazan7 Dec 27, 2017
82fd434
Merge pull request #7674 from cmgustavo/release/v3.11.0
matiu Dec 27, 2017
aae884a
Fix UI details
cmgustavo Dec 28, 2017
536e08e
Adds send max option
cmgustavo Dec 29, 2017
deadaaf
Bump v3.11.1
cmgustavo Dec 29, 2017
0d57987
Merge pull request #7693 from cmgustavo/feat/shapeshift-integration-03
gabrielbazan7 Dec 29, 2017
e8183b0
Merge pull request #7697 from cmgustavo/release/v3.11.1
gabrielbazan7 Dec 29, 2017
d9f1278
Coinbase integration: Improve errors handler
cmgustavo Jan 10, 2018
322e43f
Adds unknown error
cmgustavo Jan 10, 2018
0873cb9
Fix blank screen if wallet.status not loaded. Enable to select multi-…
cmgustavo Jan 10, 2018
fb71a78
Accept terms before continue. Adds miner fee info
cmgustavo Jan 10, 2018
922768e
Adds support link to shapeshift team
cmgustavo Jan 10, 2018
cb735d7
Improves error message at confirm view
cmgustavo Jan 10, 2018
1b139f8
Merge pull request #7802 from cmgustavo/ref/coinbase-errors-handle
gabrielbazan7 Jan 11, 2018
a94e5c7
Merge pull request #7814 from cmgustavo/ref/confirm-error
gabrielbazan7 Jan 11, 2018
d9331c1
Merge pull request #7811 from cmgustavo/feat/shapeshift-integration-04
gabrielbazan7 Jan 11, 2018
62e9e2e
Adds more info to the transaction
cmgustavo Jan 11, 2018
2d48444
Update shift after remove
cmgustavo Jan 11, 2018
28e4420
Bump v3.12.0
cmgustavo Jan 11, 2018
4727740
Merge pull request #7823 from cmgustavo/feat/shapeshift-integration-05
gabrielbazan7 Jan 11, 2018
cc59fcd
Merge pull request #7824 from cmgustavo/release/v3.12.0
gabrielbazan7 Jan 11, 2018
a50a833
cashaddr in receive
matiu Jan 13, 2018
6c1d2e5
fix customAmount
matiu Jan 13, 2018
2d6671a
fix incoming data + address show in confirm
matiu Jan 13, 2018
aa2cf1b
fix send payment to BCH address only QR (not uri)
matiu Jan 14, 2018
0b2bad3
add config toggle
matiu Jan 14, 2018
6a3bf20
Merge pull request #7838 from matiu/feat/cashaddr
cmgustavo Jan 14, 2018
44c38de
Bump v3.12.1. Hide ShapeShift
cmgustavo Jan 14, 2018
ef3a0fa
add cashaddr to tx detail view + blockexplorer
matiu Jan 15, 2018
f891038
add cashaddr to txp details
matiu Jan 15, 2018
a5f8ed8
Merge pull request #7842 from cmgustavo/release/v3.12.1
matiu Jan 15, 2018
7f27c31
rm log
matiu Jan 15, 2018
6de2e85
Merge pull request #7843 from matiu/feat/cashaddr-tx-detail
matiu Jan 15, 2018
a011d6d
fix qr case
matiu Jan 16, 2018
6866753
Merge pull request #7857 from matiu/bug/qr-case
cmgustavo Jan 16, 2018
911e894
Bump v3.12.2
cmgustavo Jan 16, 2018
2a17ea6
Merge pull request #7858 from cmgustavo/release/v3.12.2-2
gabrielbazan7 Jan 16, 2018
97310e8
Bump v3.13.0
cmgustavo Jan 17, 2018
e7ee5b3
Merge pull request #7872 from cmgustavo/release/v3.13.0
gabrielbazan7 Jan 17, 2018
cb974fa
Amazon GC: Increase maximum amount
cmgustavo Jan 17, 2018
4bc7944
Merge pull request #7873 from cmgustavo/feat/amazon-gift-card-02
gabrielbazan7 Jan 17, 2018
0e4ca69
Changes BCH rates to bitpay.com
cmgustavo Jan 19, 2018
7ca9819
Shift: save data almost immediately after send transaction
cmgustavo Jan 19, 2018
f46bba3
Bump v3.13.1
cmgustavo Jan 19, 2018
7fc37e7
FEAT: ShapeShift send max label
gabrielbazan7 Jan 19, 2018
840ef01
Merge pull request #7900 from cmgustavo/bug/rate-bch-01
gabrielbazan7 Jan 19, 2018
3c10404
Merge pull request #7901 from cmgustavo/bug/shapeshift-02
gabrielbazan7 Jan 19, 2018
486a6b8
Merge pull request #7903 from gabrielbazan7/fix/shapelabel
cmgustavo Jan 19, 2018
a35e700
Merge pull request #7902 from cmgustavo/release/v3.13.1
gabrielbazan7 Jan 19, 2018
6347485
rm writing log
matiu Jan 23, 2018
8ffada3
Merge pull request #7922 from matiu/bug/write-log
cmgustavo Jan 23, 2018
3c464e9
Encrypt wallet at create
gabrielbazan7 Jan 23, 2018
133c6ca
Feat: Remove spending password from create personal/shared wallet
Gamboster Jan 23, 2018
fb057b4
Merge branch 'feat/removeSpendingPass' of github.com:bitpay/copay int…
Gamboster Jan 23, 2018
d9cafcd
password removed from join wallet
Gamboster Jan 23, 2018
0064370
Adds warning modal for encrypt wallet
cmgustavo Jan 23, 2018
e342cb0
Merge pull request #12 from Gamboster/feat/removeSpendingPass
gabrielbazan7 Jan 23, 2018
5edd509
Merge pull request #13 from cmgustavo/feat/encrypt-02
gabrielbazan7 Jan 23, 2018
e3edbad
Remove unused file
gabrielbazan7 Jan 23, 2018
09da35d
Bump 3.14.0
cmgustavo Jan 23, 2018
6995a34
Merge pull request #7923 from gabrielbazan7/feat/encrypt
cmgustavo Jan 24, 2018
66f11ba
Merge pull request #7924 from cmgustavo/release/v3.14.0
cmgustavo Jan 24, 2018
2a9b176
Update package names and use git since we aren't in npm yet
TheSin- Jan 29, 2018
5664f37
use terracoin version from git
TheSin- Jan 29, 2018
2e7098b
This file is generated, move back to original
TheSin- Jan 29, 2018
6531eb0
Add apply:TRCpay
TheSin- Jan 29, 2018
90cecf4
Add proper dep on bitcore-wallet-client-terracoin
TheSin- Jan 29, 2018
caeac6d
Update to TRCpay
TheSin- Apr 25, 2018
ab9d873
clean up package.json
TheSin- Apr 25, 2018
c79d76a
clean up package.json
TheSin- Apr 25, 2018
2da03d4
Update to TRCpay
TheSin- Apr 25, 2018
e5a28d0
Udpate to TRCpay
TheSin- Apr 25, 2018
6c8a85d
Update dir structure to lowercase to same case sensitive fs build issues
TheSin- Apr 25, 2018
0b608df
Update dir structure to lowercase to same case sensitive fs build issues
TheSin- Apr 25, 2018
2757ff6
Update url
TheSin- Apr 25, 2018
cb6c3a2
Update dir structure to lowercase to same case sensitive fs build issues
TheSin- Apr 25, 2018
3e0686c
Update link to case sensitive dir structure
TheSin- Apr 25, 2018
7c2e0ab
Trying ot fix the icon
TheSin- Apr 25, 2018
b6bdc75
Update git repo
TheSin- May 20, 2018
1b18f75
Update repo case
TheSin- May 20, 2018
a602611
update coveralls key
TheSin- May 20, 2018
badf1e1
More case changes
TheSin- May 20, 2018
9d113e0
Update Crowdin configuration file
TheSin- May 20, 2018
853b8b2
Update the key alias
TheSin- May 25, 2018
10128e8
Fix testnet enabling
TheSin- May 25, 2018
f48c4ac
Update links
TheSin- May 25, 2018
9016ea9
Update signing
TheSin- May 25, 2018
5169cc0
Update file name
TheSin- May 25, 2018
ea2ae80
Update some windows config values
TheSin- May 25, 2018
ca015e0
Change the bundle id, as apple does not seem to support io.
TheSin- Jun 2, 2018
e93212b
More Bundle ID changes
TheSin- Jun 2, 2018
79f61d9
Hopefully the last of them
TheSin- Jun 2, 2018
9ddb734
Update firebase configs for new Bundle ID
TheSin- Jun 2, 2018
3d17247
Update a couple of missed icons
TheSin- Jun 8, 2018
26607cb
Force wallet-client v5.1.3 for BIP44 Type 83 correction
TheSin- Jun 10, 2018
7f4be8a
BIP44 CoinType 83
TheSin- Jun 10, 2018
8768ea9
Enable ledger
TheSin- Jun 11, 2018
1e95427
Fix disclaimer location
TheSin- Jun 12, 2018
47871be
New push sender ID
TheSin- Jun 12, 2018
44db0b8
Update to use info.terracoin.trcpay appid
TheSin- Jun 12, 2018
235231e
Enable AppInvite
TheSin- Jun 12, 2018
abd7d4e
Fix an issue in cordova
TheSin- Jun 14, 2018
d38ffdd
update dir names
TheSin- Jun 14, 2018
fb70451
Attempt to fix the push notification icons in android
TheSin- Jun 15, 2018
30417cc
Update TRCpay itunes store id
TheSin- Jun 25, 2018
4c70637
Fix build items and keys
TheSin- Jun 26, 2018
7f333ea
Update Signing Key
TheSin- Jun 26, 2018
28cee6b
Neuter images to comply with apple
TheSin- Jun 27, 2018
ce575fe
Better way to provision for ios
TheSin- Jun 27, 2018
1d79e46
Update iOS link
TheSin- Jun 28, 2018
72dd411
Revert change in 235231e
TheSin- Jun 28, 2018
f3c8106
use the right config name
TheSin- Jun 28, 2018
72f0d53
Update email address for gpg key
TheSin- Jun 28, 2018
cf80b8e
Fix var case
TheSin- Jul 17, 2018
7a612e7
Fix typo
TheSin- Jul 17, 2018
50c4158
Update to 3.15.3
TheSin- Jul 17, 2018
7180bef
Update android version
TheSin- Jul 17, 2018
cfe8511
Update build vars
TheSin- Jul 20, 2018
2ad809c
Make sure we show the proper page for ratings
TheSin- Jul 20, 2018
ce11032
version 3.15.4
TheSin- Jul 20, 2018
9b1bc4f
Add isTRCpay detection for Ledger and Trezor support
TheSin- Jul 20, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .coveralls.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
repo_token: LccCN5zLEHlHnI86wSoX97JAF4ZluucAh
repo_token: lhn6oquMSOp1BxEHoH5u9DUZFOf46DIg1
11 changes: 0 additions & 11 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# http://editorconfig.org

## Plugins
# Atom (https://github.com/sindresorhus/atom-editorconfig)
# Vim (https://github.com/editorconfig/editorconfig-vim)
# Sublime (https://github.com/sindresorhus/editorconfig-sublime)
;

root = true

[*]
Expand All @@ -27,4 +17,3 @@ indent_style = tab
[**.html]
max_char = 78
brace_style = expand

3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ i18n/po/*.mo
i18n/crowdin_api_key.txt
src/js/translations.js

package-lock.json


# cordova
plugins
platforms
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ sudo: required
dist: trusty
language: node_js
node_js:
- '6'
- '8'
before_install:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
install:
- npm run apply:bitpay
- npm run apply:trcpay
# after_success:
# - npm run exec:coveralls
8 changes: 4 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@ module.exports = function(grunt) {
command: 'cd cordova/project && cordova build android --release',
},
androidsign: {
command: 'rm -f cordova/project/platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../copay.keystore -signedjar cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-unsigned.apk copay_play && ../android-sdk-macosx/build-tools/21.1.1/zipalign -v 4 cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-signed-aligned.apk ',
command: 'rm -f cordova/project/platforms/android/build/outputs/apk/android-release-signed-aligned.apk; jarsigner -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ../terracoin.keystore -signedjar cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-unsigned.apk TRCpayReleaseKey && ../android-sdk-macosx/build-tools/27.0.3/zipalign -v 4 cordova/project/platforms/android/build/outputs/apk/android-release-signed.apk cordova/project/platforms/android/build/outputs/apk/android-release-signed-aligned.apk ',
stdin: true,
},
desktopsign: {
cmd: 'gpg -u 1112CFA1 --output webkitbuilds/<%= pkg.title %>-linux.zip.sig --detach-sig webkitbuilds/<%= pkg.title %>-linux.zip ; gpg -u 1112CFA1 --output webkitbuilds/<%= pkg.title %>.exe.sig --detach-sig webkitbuilds/<%= pkg.title %>.exe'
cmd: 'gpg -u AAEF8EAB3F0C298BD75B6C8CA78B5052E13EC768 --output webkitbuilds/<%= pkg.title %>-linux.zip.sig --detach-sig webkitbuilds/<%= pkg.title %>-linux.zip ; gpg -u AAEF8EAB3F0C298BD75B6C8CA78B5052E13EC768 --output webkitbuilds/<%= pkg.title %>.exe.sig --detach-sig webkitbuilds/<%= pkg.title %>.exe'
},
desktopverify: {
cmd: 'gpg --verify webkitbuilds/<%= pkg.title %>-linux.zip.sig webkitbuilds/<%= pkg.title %>-linux.zip; gpg --verify webkitbuilds/<%= pkg.title %>.exe.sig webkitbuilds/<%= pkg.title %>.exe'
},
osxsign: {
cmd: 'gpg -u 1112CFA1 --output webkitbuilds/<%= pkg.title %>.dmg.sig --detach-sig webkitbuilds/<%= pkg.title %>.dmg'
cmd: 'gpg -u AAEF8EAB3F0C298BD75B6C8CA78B5052E13EC768 --output webkitbuilds/<%= pkg.title %>.dmg.sig --detach-sig webkitbuilds/<%= pkg.title %>.dmg'
},
},
watch: {
Expand Down Expand Up @@ -267,7 +267,7 @@ module.exports = function(grunt) {
grunt.registerTask('desktop', ['prod', 'nwjs', 'copy:linux', 'compress:linux']);
grunt.registerTask('osx', ['prod', 'nwjs', 'exec:macos', 'exec:osxsign']);
grunt.registerTask('osx-debug', ['default', 'nwjs']);
grunt.registerTask('chrome', ['exec:chrome']);
grunt.registerTask('chrome', ['default','exec:chrome']);
grunt.registerTask('wp', ['prod', 'exec:wp']);
grunt.registerTask('wp-copy', ['default', 'exec:wpcopy']);
grunt.registerTask('wp-init', ['default', 'exec:wpinit']);
Expand Down
130 changes: 53 additions & 77 deletions README.md

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions angular-bitcore-wallet-client/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
var bwcModule = angular.module('bwcModule', []);
var Client = require('../node_modules/bitcore-wallet-client');
var Client = require('../node_modules/bitcore-wallet-client-terracoin');

bwcModule.constant('MODULE_VERSION', '1.0.0');

Expand All @@ -13,6 +13,10 @@ bwcModule.provider("bwcService", function() {
return Client.Bitcore;
};

service.getBitcoreCash = function() {
return Client.BitcoreCash;
};

service.getErrors = function() {
return Client.errors;
};
Expand All @@ -34,7 +38,7 @@ bwcModule.provider("bwcService", function() {

//note opts use `bwsurl` all lowercase;
var bwc = new Client({
baseUrl: opts.bwsurl || 'https://bws.bitpay.com/bws/api',
baseUrl: opts.bwsurl || 'https://bws.terracoin.io/bws/api',
verbose: opts.verbose,
timeout: 100000,
transports: ['polling'],
Expand Down
2 changes: 1 addition & 1 deletion app-template/apply.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var templates = {
'manifest.json': 'chrome-app/',
// 'bower.json': '/',
};
var configDir = process.argv[2] || 'copay';
var configDir = process.argv[2] || 'trcpay';
var JSONheader = ' { ' + "\n" + ' "//":"Changes to this file will be overwritten",' + "\n" + ' "//":" Modify it in the app-template directory", ' + "\n";

var MakefileHeader = "# PLEASE! Do not edit this file directly \n# Modify it at app-template/\n";
Expand Down
35 changes: 0 additions & 35 deletions app-template/bitpay/appConfig.json

This file was deleted.

Binary file removed app-template/bitpay/img/128x128.png
Binary file not shown.
Binary file removed app-template/bitpay/img/16x16.png
Binary file not shown.
Binary file removed app-template/bitpay/img/24x24.png
Binary file not shown.
Binary file removed app-template/bitpay/img/256x256.png
Binary file not shown.
Binary file removed app-template/bitpay/img/32x32.png
Binary file not shown.
Binary file removed app-template/bitpay/img/48x48.png
Binary file not shown.
Binary file removed app-template/bitpay/img/64x64.png
Binary file not shown.
Binary file removed app-template/bitpay/img/96x96.png
Binary file not shown.
Binary file removed app-template/bitpay/img/favicon.ico
Binary file not shown.
Binary file removed app-template/bitpay/img/icon.png
Binary file not shown.
1 change: 0 additions & 1 deletion app-template/bitpay/img/logo-negative.svg

This file was deleted.

Binary file removed app-template/bitpay/img/logo.ico
Binary file not shown.
1 change: 0 additions & 1 deletion app-template/bitpay/img/logo.svg

This file was deleted.

2 changes: 1 addition & 1 deletion app-template/build-macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ if [ $SHOULD_SIGN ]
then
echo "Signing ${APP_NAME} DMG"

export IDENTITY="3rd Party Mac Developer Application: BitPay, Inc. (884JRH5R93)"
export IDENTITY="3rd Party Mac Developer Application: Terracoin Foundation, The (743WAUKKZJ)"

# not need for 'out of app store' distribution (?)
# export PARENT_PLIST=parent.plist
Expand Down
Loading