Kwun/cherry pick fixes (forbole#415)

* update logo and version * update logo * Fixes incorrect fee * update version translation
slon36 · Nov 3, 2020 · 32c496d · 32c496d
1 parent 86bfb81
commit 32c496d
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 57 deletions.
diff --git a/both/i18n/en-us.i18n.yml b/both/i18n/en-us.i18n.yml
@@ -24,8 +24,8 @@ common:
     retry: 'Retry'
     rewards: 'Rewards'
 navbar:
-    siteName: 'The Big Dipper'
-    version: 'beta'
+    siteName: 'BIG DIPPER'
+    version: '-'
     validators: 'Validators'
     blocks: 'Blocks'
     transactions: 'Transactions'

diff --git a/both/i18n/es-es.i18n.yml b/both/i18n/es-es.i18n.yml
@@ -23,8 +23,7 @@ common:
     cancel: 'Cancelar'
     retry: 'Reintentar'
 navbar:
-    siteName: 'The Big Dipper'
-    version: 'beta'
+    siteName: 'BIG DIPPER'
     validators: 'Validadores'
     blocks: 'Bloques'
     transactions: 'Transacciones'

diff --git a/both/i18n/it-IT.i18n.yml b/both/i18n/it-IT.i18n.yml
@@ -24,8 +24,7 @@ common:
     retry: 'Riprova'
     rewards: 'Reward'
 navbar:
-    siteName: 'The Big Dipper'
-    version: 'beta'
+    siteName: 'BIG DIPPER'
     validators: 'Validatori'
     blocks: 'Blocchi'
     transactions: 'Transazioni'

diff --git a/both/i18n/pl-PL.i18n.yml b/both/i18n/pl-PL.i18n.yml
@@ -25,7 +25,6 @@ common:
     rewards: 'Nagrody'
 navbar:
     siteName: 'Wielki Wóz'
-    version: 'beta'
     validators: 'Walidatorzy'
     blocks: 'Bloki'
     transactions: 'Transakcje'

diff --git a/both/i18n/pt-BR.i18n.yml b/both/i18n/pt-BR.i18n.yml
@@ -24,8 +24,7 @@ common:
     retry: 'Tentar novamente'
     rewards: 'Recompensas'
 navbar:
-    siteName: 'The Big Dipper'
-    version: 'beta'
+    siteName: 'BIG DIPPER'
     validators: 'Validadores'
     blocks: 'Blocos'
     transactions: 'Transações'

diff --git a/both/i18n/ru-RU.i18n.yml b/both/i18n/ru-RU.i18n.yml
@@ -24,8 +24,7 @@ common:
     retry: 'Повторить попытку'
     rewards: 'награды'
 navbar:
-    siteName: 'The Big Dipper'
-    version: 'бета'
+    siteName: 'BIG DIPPER'
     validators: 'валидаторы'
     blocks: 'блоки'
     transactions: 'транзакции'

diff --git a/both/i18n/zh-hans.i18n.yml b/both/i18n/zh-hans.i18n.yml
@@ -24,7 +24,6 @@ common:
     retry: '重试'
 navbar:
     siteName: '北斗'
-    version: 'beta'
     validators: '验证人'
     blocks: '区块'
     transactions: '交易'

diff --git a/both/i18n/zh-hant.i18n.yml b/both/i18n/zh-hant.i18n.yml
@@ -24,7 +24,6 @@ common:
     retry: '重試'
 navbar:
     siteName: '北斗'
-    version: 'beta'
     validators: '驗證人'
     blocks: '區塊'
     transactions: '交易'

diff --git a/client/styles.scss b/client/styles.scss
@@ -344,7 +344,7 @@ body {
   }
 
   .progress {
-    height: inherit !important;
+    height: 1.5rem !important;
     font-size: inherit !important;
     border: 1px solid #ddd !important;
   }

diff --git a/imports/ui/components/Header.jsx b/imports/ui/components/Header.jsx
@@ -160,7 +160,7 @@ export default class Header extends Component {
         let signedInAddress = getUser();
         return (
             <Navbar color="primary" dark expand="lg" fixed="top" id="header">
-                <NavbarBrand tag={Link} to="/"><img src="/img/big-dipper.svg" className="img-fluid logo"/> <span className="d-none d-xl-inline-block"><T>navbar.siteName</T>&nbsp;</span><Badge color="secondary"><T>navbar.version</T></Badge> </NavbarBrand>
+                <NavbarBrand tag={Link} to="/"><img src="/img/big-dipper-icon-light.svg" className="img-fluid logo"/> <span className="d-none d-xl-inline-block"><T>navbar.siteName</T>&nbsp;</span><Badge color="secondary"><T>navbar.version</T></Badge> </NavbarBrand>
                 <UncontrolledDropdown className="d-inline text-nowrap">
                     <DropdownToggle caret={(this.state.networks !== "")} tag="span" size="sm" id="network-nav">{Meteor.settings.public.chainId}</DropdownToggle>
                     {this.state.networks}

diff --git a/imports/ui/ledger/LedgerActions.jsx b/imports/ui/ledger/LedgerActions.jsx
@@ -127,7 +127,7 @@ const Amount = (props) => {
 
 
 const Fee = (props) => {
-return <span><CoinAmount mint className='gas' amount={props.gas * Meteor.settings.public.gasPrice}/> as fee </span>
+    return <span><CoinAmount mint className='gas' amount={Math.ceil(props.gas * Meteor.settings.public.gasPrice)}/> as fee </span>
 }
 
 const isActiveValidator = (validator) => {

diff --git a/imports/ui/ledger/ledger.js b/imports/ui/ledger/ledger.js
@@ -14,7 +14,7 @@ import CryptoJS from "crypto-js"
 
 // TODO: discuss TIMEOUT value
 const INTERACTION_TIMEOUT = 10000
-const REQUIRED_COSMOS_APP_VERSION = "1.5.0"
+const REQUIRED_COSMOS_APP_VERSION = "2.0.0"
 const DEFAULT_DENOM = 'uatom';
 const DEFAULT_GAS = 200000;
 export const DEFAULT_GAS_PRICE = 0.025;
@@ -228,7 +228,7 @@ export class Ledger {
         // eslint-disable-next-line no-param-reassign
         unsignedTx.value.fee = {
             amount: [{
-                 amount: Math.round(gas * gasPrice).toString(),
+                 amount: Math.ceil(gas * gasPrice).toString(),
                  denom: denom,
             }],
             gas: gas.toString(),

diff --git a/public/img/big-dipper-icon-light.svg b/public/img/big-dipper-icon-light.svg
diff --git a/public/img/big-dipper-logo-light.svg b/public/img/big-dipper-logo-light.svg
diff --git a/public/img/big-dipper.png b/public/img/big-dipper.png
diff --git a/public/img/big-dipper.svg b/public/img/big-dipper.svg