Skip to content

Commit

Permalink
Merge pull request #8544 from msalcala11/betterWalletDetailsWithStick…
Browse files Browse the repository at this point in the history
…yHeaders

Improve Wallet Details Styling, and Implement Sticky Month Headers
  • Loading branch information
cmgustavo authored May 4, 2018
2 parents e7a14ec + e64f326 commit c7f88f6
Show file tree
Hide file tree
Showing 13 changed files with 567 additions and 285 deletions.
29 changes: 17 additions & 12 deletions src/assets/img/icon-proposal-pending.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 25 additions & 13 deletions src/assets/img/tx-action/icon-confirming.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions src/pages/home/home.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ describe('HomePage', () => {
fixture = testEnv.fixture;
instance = testEnv.instance;
testBed = testEnv.testBed;
instance.showCard = {
setShowRateCard: () => {}
};
fixture.detectChanges();
})
)
Expand Down Expand Up @@ -144,7 +147,7 @@ describe('HomePage', () => {
(window as any).require = () => {
return {
App: {
on: (event, cb) => { },
on: (event, cb) => {},
argv: ['URL']
}
};
Expand All @@ -155,9 +158,6 @@ describe('HomePage', () => {
delete (window as any).require;
delete (window as any)._urlHandled;
});
it('should not break', () => {
instance.handleDeepLinksNW();
});
it('should not try to handle deeplinks if was already handled', () => {
jasmine.clock().install();
const spy = spyOn(instance, 'handleOpenUrl');
Expand Down
2 changes: 1 addition & 1 deletion src/pages/includes/txp/txp.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<div class="amount">
<span *ngIf="tx.action == 'sent'"></span>
<span *ngIf="tx.action == 'invalid'" translate>(possible double spend)</span>
<span *ngIf="tx.action != 'invalid'">{{tx.amount | satToUnit: tx.coin}}</span>
<span *ngIf="tx.action != 'invalid'">{{tx.amount | satToUnit: tx.coin}}</span>
</div>
<div class="date">
<time *ngIf="tx.createdOn && createdWithinPastDay(tx.createdOn * 1000)">{{tx.createdOn * 1000 | amTimeAgo}}</time>
Expand Down
19 changes: 11 additions & 8 deletions src/pages/send/confirm/confirm.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import { Logger } from './../../../providers/logger/logger';
import { PersistenceProvider } from './../../../providers/persistence/persistence';
import { ProfileProvider } from './../../../providers/profile/profile';

xdescribe('ConfirmPage', () => {
describe('ConfirmPage', () => {
let fixture: ComponentFixture<ConfirmPage>;
let instance: any;
let testBed: typeof TestBed;
Expand Down Expand Up @@ -87,10 +87,13 @@ xdescribe('ConfirmPage', () => {
fixture = testEnv.fixture;
instance = testEnv.instance;
testBed = testEnv.testBed;
instance.navParams.data.toAddress =
'n4VQ5YdHf7hLQ2gWQYYrcxoE5B7nWuDFNF';
instance.navParams = {
data: {
toAddress: 'n4VQ5YdHf7hLQ2gWQYYrcxoE5B7nWuDFNF'
}
};
instance.tx = { coin: 'BTC' };
spyOn(instance.onGoingProcessProvider, 'set').and.callFake(() => { });
spyOn(instance.onGoingProcessProvider, 'set');
fixture.detectChanges();
})
)
Expand Down Expand Up @@ -152,11 +155,11 @@ xdescribe('ConfirmPage', () => {
describe('chooseFeeLevel', () => {
it('should display a fee modal', () => {
const modal = {
present: () => { },
onDidDismiss: () => { }
present: () => {},
onDidDismiss: () => {}
};
const presentSpy = spyOn(modal, 'present');
spyOn(instance.modalCtrl, 'create').and.returnValue(modal);
instance.modalCtrl.create = () => modal;
instance.chooseFeeLevel();
expect(presentSpy).toHaveBeenCalled();
});
Expand Down Expand Up @@ -256,7 +259,7 @@ xdescribe('ConfirmPage', () => {
});
});
describe('publishAndSign', () => {
it('should work', () => { });
it('should work', () => {});
});
});
});
Loading

0 comments on commit c7f88f6

Please sign in to comment.