mirror of https://github.com/BTCPrivate/copay.git
resolved conflicts
This commit is contained in:
parent
1f83f85189
commit
19a8733a9c
|
@ -84,6 +84,8 @@ FakeWallet.prototype.getAddressesInfo = function() {
|
|||
return ret;
|
||||
};
|
||||
|
||||
FakeWallet.prototype.subscribeToAddresses = function() {};
|
||||
|
||||
FakeWallet.prototype.isShared = function() {
|
||||
return this.totalCopayers > 1;
|
||||
}
|
||||
|
|
|
@ -113,7 +113,11 @@ describe('Unit: Rate Service', function() {
|
|||
beforeEach(module(function($provide) {
|
||||
$provide.value('request', {
|
||||
'get': function(_, cb) {
|
||||
cb(null, null, [{name: 'lol currency', code: 'LOL', rate: 2}]);
|
||||
cb(null, null, [{
|
||||
name: 'lol currency',
|
||||
code: 'LOL',
|
||||
rate: 2
|
||||
}]);
|
||||
}
|
||||
});
|
||||
}));
|
||||
|
|
Loading…
Reference in New Issue