mirror of https://github.com/BTCPrivate/copay.git
Fix: feedback ui, send input for android and address generation on receive
This commit is contained in:
parent
ae35cd04ec
commit
efd7eb0e68
|
@ -27,8 +27,12 @@ page-feedback-complete {
|
|||
.share-buttons {
|
||||
padding: 50px 10px 30px;
|
||||
text-align: center;
|
||||
height: 100%;
|
||||
background-color: color($colors,blank);
|
||||
min-height: 200px;
|
||||
position: absolute;
|
||||
bottom: 0rem;
|
||||
width: 100%;
|
||||
height: 30%;
|
||||
}
|
||||
.share-buttons__action {
|
||||
display: inline-block;
|
||||
|
|
|
@ -9,13 +9,13 @@
|
|||
<div *ngIf="hasBtcWallets || hasBchWallets">
|
||||
<div class="send-header-wrapper">
|
||||
<span class="send-heading" translate>Recipient</span>
|
||||
<div class="search-wrapper">
|
||||
<ion-icon class="bitcoin-icon" name="search-btc"></ion-icon>
|
||||
<ion-item class="search-wrapper">
|
||||
<ion-icon item-start class="bitcoin-icon" name="search-btc"></ion-icon>
|
||||
<ion-input placeholder="{{'Search or enter bitcoin address' | translate}}" [(ngModel)]="search" (ngModelChange)="findContact(search)"></ion-input>
|
||||
<ion-icon class="scan-icon" (click)="openScanner()">
|
||||
<ion-icon item-end class="scan-icon" (click)="openScanner()">
|
||||
<img src="assets/img/scan-ico.svg">
|
||||
</ion-icon>
|
||||
</div>
|
||||
</ion-item>
|
||||
</div>
|
||||
|
||||
<div class="card" *ngIf="filteredContactsList && filteredContactsList[0]">
|
||||
|
|
|
@ -39,22 +39,29 @@ page-send {
|
|||
margin-top: 15px;
|
||||
background-color: #f2f2f2;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
align-items: baseline;
|
||||
.item-inner {
|
||||
margin-left: 0rem !important;
|
||||
border-bottom: 0px !important;
|
||||
box-shadow: none !important;
|
||||
}
|
||||
.scan-icon {
|
||||
margin: 1rem;
|
||||
z-index: 999;
|
||||
}
|
||||
.bitcoin-icon {
|
||||
margin-left: 1.5rem;
|
||||
margin-right: 1rem;
|
||||
margin-top: 1rem;
|
||||
margin-bottom: 1rem;
|
||||
width: 1rem;
|
||||
height: 1rem;
|
||||
// custom icons
|
||||
&[class*="search-btc"] {
|
||||
mask-image: url(../assets/img/icon-bitcoin-symbol.svg);
|
||||
mask-size: contain;
|
||||
mask-size: 16px;
|
||||
mask-position: 50% 50%;
|
||||
mask-repeat: no-repeat;
|
||||
background: #cccccc;
|
||||
width: 2rem;
|
||||
height: 2rem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -386,6 +386,7 @@ export class WalletProvider {
|
|||
) {
|
||||
this.logger.warn(this.bwcErrorProvider.msg(err, 'Server Error'));
|
||||
prefix = null;
|
||||
this.popupProvider.ionicAlert(null, this.bwcErrorProvider.msg('MAIN_ADDRESS_GAP_REACHED'));
|
||||
wallet.getMainAddresses({
|
||||
reverse: true,
|
||||
limit: 1
|
||||
|
|
Loading…
Reference in New Issue