diff --git a/app-template/config-template.xml b/app-template/config-template.xml index e53496824..0545f5f03 100644 --- a/app-template/config-template.xml +++ b/app-template/config-template.xml @@ -29,7 +29,7 @@ - + diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 502b66527..989f18489 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -60,6 +60,7 @@ export class CopayApp { ' #' + this.app.info.commitHash); if (this.platform.is('cordova')) { + this.statusBar.overlaysWebView(true); this.statusBar.styleLightContent(); this.splashScreen.hide(); } diff --git a/src/pages/wallet-details/wallet-details.html b/src/pages/wallet-details/wallet-details.html index 84c1a54e1..81adb1bc6 100644 --- a/src/pages/wallet-details/wallet-details.html +++ b/src/pages/wallet-details/wallet-details.html @@ -1,19 +1,17 @@ - - + + {{wallet.name}} - - - - - +
-
+
{{wallet.status.totalBalanceStr}}
{{wallet.status.totalBalanceAlternative}} {{wallet.status.alternativeIsoCode}} @@ -148,13 +146,13 @@
{{'Sending' | translate}}
{{'Receiving' | translate}}
{{tx.action}}
-
+
{{tx.amount | satToUnit: wallet.coin}}
{{tx.time * 1000 | amTimeAgo}} {{tx.time * 1000 | amDateFormat:'MMM D, YYYY'}}
-
+
diff --git a/src/pages/wallet-details/wallet-details.scss b/src/pages/wallet-details/wallet-details.scss index cc4bac702..484be6f02 100644 --- a/src/pages/wallet-details/wallet-details.scss +++ b/src/pages/wallet-details/wallet-details.scss @@ -1,22 +1,16 @@ page-wallet-details { - ion-header { - .toolbar-title, ion-icon { - color: color($colors, light); - } - background: color($colors, primary); - } .balance-card { background: color($colors, primary); } .balance-header { position: relative; color: color($colors, light); - height: 10rem; + height: 12.5rem; text-align: center; } .balance-str { cursor: pointer; - padding-top: 1.5rem; + padding-top: 4rem; font-size: 35px; font-weight: 600; } @@ -25,12 +19,13 @@ page-wallet-details { font-weight: 500; } .balance-hidden { - padding-top: 2rem; + cursor: pointer; + padding-top: 5rem; font-size: 20px; font-weight: 500; } .balance-error { - padding: 5% 1rem 0 1rem; + padding: 10% 1rem 0 1rem; } .balance-spendable { cursor: pointer; @@ -41,26 +36,15 @@ page-wallet-details { } .tx-history { img { - width: 40px; - } - .label { - display: -webkit-inline-box; + width: 35px; } .action { - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; } - .detail { - position: absolute; - right: 16px; - text-align: end; - .amount { - } - .date { - color: color($colors, grey); - font-size: 12.5px; - } + .amount { + color: color($colors, dark); + } + .date { + font-size: 12.5px; } } @@ -118,7 +102,7 @@ page-wallet-details { width: 20px; height: 20px; margin: 5px 5px 0 0; - &.spinner-crescent circle { + * { stroke: color($colors, light); } } diff --git a/src/pages/wallet-details/wallet-details.ts b/src/pages/wallet-details/wallet-details.ts index bc34a8111..aeea2a1e7 100644 --- a/src/pages/wallet-details/wallet-details.ts +++ b/src/pages/wallet-details/wallet-details.ts @@ -220,13 +220,6 @@ export class WalletDetailsPage { this.navCtrl.push(WalletAddressesPage, { walletId: this.wallet.credentials.walletId }); } - public doRefresh(refresher) { - this.updateAll(true); - setTimeout(() => { - refresher.complete(); - }, 1000); - } - public getDate(txCreated) { let date = new Date(txCreated * 1000); return date; diff --git a/src/providers/on-going-process/on-going-process.ts b/src/providers/on-going-process/on-going-process.ts index 27d093fef..9054930d3 100644 --- a/src/providers/on-going-process/on-going-process.ts +++ b/src/providers/on-going-process/on-going-process.ts @@ -75,7 +75,7 @@ export class OnGoingProcessProvider { } this.loading = this.loadingCtrl.create({ spinner: 'hide', - content: showName + content: showName + '...' }); this.loading.present(); } diff --git a/src/theme/global.scss b/src/theme/global.scss index bc55d0143..467dceaf7 100644 --- a/src/theme/global.scss +++ b/src/theme/global.scss @@ -17,6 +17,9 @@ $global-colors: ( dark: #444, ); +// Refresh color +$refresher-icon-color: color($colors, primary); + .bottom-absolute { width: 100%; position: absolute; @@ -35,6 +38,9 @@ $global-colors: ( // Hide border when refresh .has-refresher > .scroll-content { border-top: none !important; + ion-spinner * { + stroke: color($colors, light); + } } // This style prevents the names of the tabs from disappear