From 4910e2f9bdf1305469edd9c55c59fb90d0e5267d Mon Sep 17 00:00:00 2001
From: Frances Pangilinan <frankie.diamond@gmail.com>
Date: Tue, 20 Dec 2016 13:49:22 -0800
Subject: remove network Id 2 from explorer link and Add network Id 3

---
 ui/app/components/transaction-list-item.js | 3 +--
 ui/lib/explorer-link.js                    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'ui')

diff --git a/ui/app/components/transaction-list-item.js b/ui/app/components/transaction-list-item.js
index 491e90c7c..f92a4ab2e 100644
--- a/ui/app/components/transaction-list-item.js
+++ b/ui/app/components/transaction-list-item.js
@@ -27,7 +27,7 @@ TransactionListItem.prototype.render = function () {
 
   let isLinkable = false
   const numericNet = parseInt(network)
-  isLinkable = numericNet === 1 || numericNet === 2
+  isLinkable = numericNet === 1 || numericNet === 3
 
   var isMsg = ('msgParams' in transaction)
   var isTx = ('txParams' in transaction)
@@ -41,7 +41,6 @@ TransactionListItem.prototype.render = function () {
   }
 
   const isClickable = ('hash' in transaction && isLinkable) || isPending
-
   return (
     h(`.transaction-list-item.flex-row.flex-space-between${isClickable ? '.pointer' : ''}`, {
       onClick: (event) => {
diff --git a/ui/lib/explorer-link.js b/ui/lib/explorer-link.js
index 2993d1cf1..dc6be2984 100644
--- a/ui/lib/explorer-link.js
+++ b/ui/lib/explorer-link.js
@@ -5,7 +5,7 @@ module.exports = function (hash, network) {
     case 1: // main net
       prefix = ''
       break
-    case 2: // morden test net
+    case 3: // morden test net
       prefix = 'testnet.'
       break
     default:
-- 
cgit 


From 29060acb722c855344b02416754ab7513be44493 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.diamond@gmail.com>
Date: Tue, 10 Jan 2017 12:18:39 -0800
Subject: update coinbase info and view

---
 ui/app/components/coinbase-form.js | 8 ++++----
 ui/app/reducers/app.js             | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'ui')

diff --git a/ui/app/components/coinbase-form.js b/ui/app/components/coinbase-form.js
index 3c5708bf8..32e3066fd 100644
--- a/ui/app/components/coinbase-form.js
+++ b/ui/app/components/coinbase-form.js
@@ -72,7 +72,7 @@ CoinbaseForm.prototype.render = function () {
         lineHeight: '13px',
       },
     },
-      `there is a USD$ 5 a day max and a USD$ 50
+      `there is a USD$ 15 a day max and a USD$ 50
           dollar limit per the life time of an account without a
           coinbase account. A fee of 3.75% will be aplied to debit/credit cards.`),
 
@@ -138,14 +138,14 @@ function isValidAmountforCoinBase(amount) {
   amount = parseFloat(amount)
 
   if (amount) {
-    if (amount <= 5 && amount > 0) {
+    if (amount <= 15 && amount > 0) {
       return {
         valid: true,
       }
-    } else if (amount > 5) {
+    } else if (amount > 15) {
       return {
         valid: false,
-        message: 'The amount can not be greater then $5',
+        message: 'The amount can not be greater then $15',
       }
     } else {
       return {
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 5c5c0acce..31b9e109f 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -418,7 +418,7 @@ function reduceApp (state, action) {
         },
         buyView: {
           subview: 'buyForm',
-          amount: '5.00',
+          amount: '15.00',
           buyAddress: action.value,
           formView: {
             coinbase: true,
-- 
cgit 


From 6481f9ced425a03f9b5260f5d5606c506c6dfef6 Mon Sep 17 00:00:00 2001
From: Frankie <frankie.diamond@gmail.com>
Date: Sat, 14 Jan 2017 22:59:05 -0800
Subject: Dont render conf-tx if their are no txParams to show

---
 ui/app/conf-tx.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'ui')

diff --git a/ui/app/conf-tx.js b/ui/app/conf-tx.js
index 8d8285f3d..8e255a867 100644
--- a/ui/app/conf-tx.js
+++ b/ui/app/conf-tx.js
@@ -43,9 +43,11 @@ ConfirmTxScreen.prototype.render = function () {
   var unconfMsgs = state.unconfMsgs
   var unconfTxList = txHelper(unconfTxs, unconfMsgs, network)
   var index = state.index !== undefined ? state.index : 0
-  var txData = unconfTxList[index] || {txParams: {}}
-  var txParams = txData.txParams || {}
+  var txData = unconfTxList[index] || {}
+  var txParams = txData.txParams
   var isNotification = isPopupOrNotification() === 'notification'
+  if (!txParams) return null
+
   return (
 
     h('.flex-column.flex-grow', [
-- 
cgit