diff --git a/public/views/buyCoinbase.html b/public/views/buyCoinbase.html index ce7eb33dd..553a6a6b0 100644 --- a/public/views/buyCoinbase.html +++ b/public/views/buyCoinbase.html @@ -1,5 +1,5 @@ -
@@ -9,13 +9,7 @@
-
-
-
-
-
-
-
+ {{buy.loading}}
@@ -32,42 +26,42 @@
-
+
-
-
- - +
- - - - BTC - USD
@@ -87,7 +81,7 @@
-
@@ -102,7 +96,7 @@
- @@ -146,11 +140,11 @@
  • Total {{buy.buyInfo.total.amount}} {{buy.buyInfo.total.currency}} -
  • +
  • Payout at {{buy.buyInfo.payout_at | amCalendar}} -
  • +
  • Deposit into Copay Wallet {{buy.selectedWalletName}} @@ -158,7 +152,7 @@
    -
    -
  • +
    diff --git a/public/views/coinbase.html b/public/views/coinbase.html index 051cc3f68..7111704c9 100644 --- a/public/views/coinbase.html +++ b/public/views/coinbase.html @@ -28,13 +28,7 @@
    -
    -
    -
    -
    -
    -
    -
    + Connecting to Coinbase... {{index.coinbaseLoading}}
    @@ -156,7 +150,7 @@ Sold Bought - -{{tx.amount.amount.replace('-','')}} + -{{tx.amount.amount.replace('-','')}} {{tx.amount.currency}}
    diff --git a/public/views/coinbaseUri.html b/public/views/coinbaseUri.html index b5475440e..995454fff 100644 --- a/public/views/coinbaseUri.html +++ b/public/views/coinbaseUri.html @@ -1,5 +1,5 @@ -
    @@ -8,13 +8,7 @@
    -
    -
    -
    -
    -
    -
    -
    + Connecting to Coinbase...
    @@ -22,10 +16,10 @@
    -
    - +
    {{coinbase.error}}
    diff --git a/public/views/copayers.html b/public/views/copayers.html index 1277ee210..bf8b1a35d 100644 --- a/public/views/copayers.html +++ b/public/views/copayers.html @@ -13,13 +13,7 @@
    -
    -
    -
    -
    -
    -
    -
    +
    diff --git a/public/views/create.html b/public/views/create.html index 17451479a..f2cfaff4a 100644 --- a/public/views/create.html +++ b/public/views/create.html @@ -10,26 +10,14 @@
    -
    -
    -
    -
    -
    -
    -
    + Creating Wallet...
    -
    -
    -
    -
    -
    -
    -
    + Connecting to {{create.hwWallet}} Wallet... Please accept to export two public keys from the Trezor app
    diff --git a/public/views/disclaimer.html b/public/views/disclaimer.html index 30e824c90..d0a02d7c8 100644 --- a/public/views/disclaimer.html +++ b/public/views/disclaimer.html @@ -27,13 +27,7 @@
    -
    -
    -
    -
    -
    -
    -
    + Creating Wallet...
    diff --git a/public/views/glidera.html b/public/views/glidera.html index ecbb23ec5..8baf17bac 100644 --- a/public/views/glidera.html +++ b/public/views/glidera.html @@ -10,13 +10,7 @@
    -
    -
    -
    -
    -
    -
    -
    + Connecting to Glidera... {{index.glideraLoading}}
    @@ -146,9 +140,9 @@
    -
      -
    • buy bitcoin diff --git a/public/views/glideraUri.html b/public/views/glideraUri.html index 20c661c87..0407880cb 100644 --- a/public/views/glideraUri.html +++ b/public/views/glideraUri.html @@ -1,5 +1,5 @@ -
      @@ -8,13 +8,7 @@
      -
      -
      -
      -
      -
      -
      -
      + Connecting to Glidera...
      @@ -22,10 +16,10 @@
      -
      - +
      {{glidera.error}}
      diff --git a/public/views/import.html b/public/views/import.html index 04800d26b..18f4e5740 100644 --- a/public/views/import.html +++ b/public/views/import.html @@ -7,25 +7,13 @@
      -
      -
      -
      -
      -
      -
      -
      + Importing wallet...
      -
      -
      -
      -
      -
      -
      -
      + Connecting to {{import.hwWallet}} Wallet...
      @@ -51,7 +39,7 @@
      -
      +
      - +
      - +
      -
      +
      diff --git a/public/views/join.html b/public/views/join.html index 6f6df130d..7e3ce1657 100644 --- a/public/views/join.html +++ b/public/views/join.html @@ -8,26 +8,14 @@
      -
      -
      -
      -
      -
      -
      -
      + Joining Wallet...
      -
      -
      -
      -
      -
      -
      -
      + Connecting to {{join.hwWallet}} Wallet... Please accept to export two public keys from the Trezor app
      @@ -40,7 +28,7 @@
      -
      +
      -
      diff --git a/public/views/preferencesDeleteWallet.html b/public/views/preferencesDeleteWallet.html index d4e2808f6..ddc53b5fd 100644 --- a/public/views/preferencesDeleteWallet.html +++ b/public/views/preferencesDeleteWallet.html @@ -8,13 +8,7 @@
      -
      -
      -
      -
      -
      -
      -
      + Deleting Wallet...
      diff --git a/public/views/preferencesEmail.html b/public/views/preferencesEmail.html index e7d308fb8..8356744c5 100644 --- a/public/views/preferencesEmail.html +++ b/public/views/preferencesEmail.html @@ -1,5 +1,5 @@ -
      @@ -11,13 +11,7 @@

      -
      -
      -
      -
      -
      -
      -
      + Saving preferences...
      diff --git a/public/views/preferencesFee.html b/public/views/preferencesFee.html index 6d775615c..878e5909d 100644 --- a/public/views/preferencesFee.html +++ b/public/views/preferencesFee.html @@ -8,13 +8,7 @@
      -
      -
      -
      -
      -
      -
      -
      +
      Loading... diff --git a/public/views/sellCoinbase.html b/public/views/sellCoinbase.html index a9450325e..f83369293 100644 --- a/public/views/sellCoinbase.html +++ b/public/views/sellCoinbase.html @@ -1,5 +1,5 @@ -
      @@ -9,13 +9,7 @@
      -
      -
      -
      -
      -
      -
      -
      + {{sell.loading}}
      @@ -30,25 +24,25 @@
      -
      -
      @@ -100,13 +94,13 @@
      -
      - Continue @@ -114,20 +108,20 @@
      -

      Price Sensitivity

      +

      Price Sensitivity

      Coinbase has not yet implemented an immediate method to sell bitcoin from a wallet. To make this sale, funds will be sent to your Coinbase account, and sold when Coinbase accepts the transaction (usually one hour).

      -

      Estimated sale value: {{sell.sellPrice.amount * amount | currency : 'USD ' : 2}}
      - Still sell if price fall until: + Still sell if price fall until: {{(sell.sellPrice.amount - (selectedPriceSensitivity.value / 100) * sell.sellPrice.amount) * amount | currency : 'USD ' : 2}}

      @@ -136,7 +130,7 @@ Back
      - @@ -182,15 +176,15 @@
    • Total {{sell.sellInfo.total.amount}} {{sell.sellInfo.total.currency}} -
    • +
    • Payout at {{sell.sellInfo.payout_at | amCalendar}} -
    • +
    -
    - +
    diff --git a/public/views/sellGlidera.html b/public/views/sellGlidera.html index 2ea8829f4..87cc10eae 100644 --- a/public/views/sellGlidera.html +++ b/public/views/sellGlidera.html @@ -1,5 +1,5 @@ -
    @@ -9,13 +9,7 @@
    -
    -
    -
    -
    -
    -
    -
    + {{sell.loading}}
    @@ -24,7 +18,7 @@

    Daily sell limit: {{index.glideraLimits.dailySell|currency:'':2}} {{index.glideraLimits.currency}} - (remaining {{index.glideraLimits.dailySellRemaining|currency:'':2}} {{index.glideraLimits.currency}}) + (remaining {{index.glideraLimits.dailySellRemaining|currency:'':2}} {{index.glideraLimits.currency}})
    Monthly sell limit: {{index.glideraLimits.monthlySell|currency:'':2}} {{index.glideraLimits.currency}} @@ -42,16 +36,16 @@

    - -
    - @@ -61,24 +55,24 @@
    - - - BTC - USD - +
    - Sell - {{sell.sellPrice.subtotal|currency:'':2}} {{sell.sellPrice.currency}} in Bitcoin - {{sell.sellPrice.qty}} BTC + Sell + {{sell.sellPrice.subtotal|currency:'':2}} {{sell.sellPrice.currency}} in Bitcoin + {{sell.sellPrice.qty}} BTC at {{sell.sellPrice.price|currency:'':2}} {{sell.sellPrice.currency}}/BTC
    @@ -90,13 +84,13 @@ ...
    -
    - +
    @@ -105,10 +99,10 @@ A SMS containing a confirmation code was sent to your phone.
    Please, enter the code below

    -
    -
    diff --git a/public/views/walletHome.html b/public/views/walletHome.html index 67f40faf4..bdfa8949e 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -18,26 +18,14 @@
    -
    -
    -
    -
    -
    -
    -
    + Reconnecting to Wallet Service...
    -
    -
    -
    -
    -
    -
    -
    +
    -
    -
    -
    -
    -
    -
    -
    + {{home.onGoingProcess}}...
    @@ -174,30 +156,24 @@
    - -

    + + +

    Activity

    -
    - No transactions yet +
    No transactions yet
    -
    +
    -
    -
    -
    -
    -
    -
    -
    +
    {{index.txProgress}} transactions downloaded
    @@ -271,13 +247,7 @@
    -
    -
    -
    -
    -
    -
    -
    +
    @@ -327,13 +297,7 @@
    -
    -
    -
    -
    -
    -
    -
    +