Skip to content

Commit

Permalink
Version update
Browse files Browse the repository at this point in the history
  • Loading branch information
ruslansalikhov committed Apr 23, 2018
1 parent 7c57729 commit b18d43e
Show file tree
Hide file tree
Showing 9 changed files with 38 additions and 21 deletions.
33 changes: 25 additions & 8 deletions app/Deprecate.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,36 @@ export default class Deprecate extends React.Component {
render() {
return (
<div className="grid-frame">
<div className="grid-block vertical" style={{paddingBottom: "3rem"}}>
<div
className="grid-block vertical"
style={{paddingBottom: "3rem"}}
>
<div className="grid-content large-offset-2 large-8 shrink">

<Translate content="migration.title" component="h2" />
<Translate content="migration.announcement_1" unsafe component="p" />
<p><a href="https://wallet.bitshares.org" target='blank' rel='noopener noreferrer'>https://wallet.bitshares.org</a></p>

{this.hasWallet() ? this.renderForWallet() : this.renderForCloud()}
<Translate
content="migration.announcement_1"
unsafe
component="p"
/>
<p>
<a
href="https://market.rudex.org"
target="blank"
rel="noopener noreferrer"
>
https://market.rudex.org
</a>
</p>

{this.hasWallet()
? this.renderForWallet()
: this.renderForCloud()}
</div>
{this.hasWallet() ? <Settings {...this.props} deprecated /> : null}
{this.hasWallet() ? (
<Settings {...this.props} deprecated />
) : null}
</div>
</div>
);
}
};
}
4 changes: 2 additions & 2 deletions app/assets/locales/locale-en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1830,9 +1830,9 @@
"In an effort to provide enhanced security for the web-based wallet, we are migrating it, effective immediately to the address below. Please be sure to update any bookmarks you may have.",
"text_1": "Local wallet detected",
"text_2":
"Please backup your wallet now and restore the backup file to <a href='https://wallet.bitshares.org' target='blank' rel='noopener noreferrer'>https://wallet.bitshares.org</a>, which will be your new address for the web wallet. Thanks for your continued support.",
"Please backup your wallet now and restore the backup file to <a href='https://market.rudex.org' target='blank' rel='noopener noreferrer'>https://wallet.bitshares.org</a>, which will be your new address for the web wallet. Thanks for your continued support.",
"text_3":
"Please use <a href='https://wallet.bitshares.org' target='blank' rel='noopener noreferrer'>https://wallet.bitshares.org</a> from now on, your existing credentials will let you login there as well."
"Please use <a href='https://wallet.bitshares.org' target='blank' rel='noopener noreferrer'>https://market.rudex.org</a> from now on, your existing credentials will let you login there as well."
},
"news": {
"news": "News",
Expand Down
4 changes: 2 additions & 2 deletions app/assets/locales/locale-es.json
Original file line number Diff line number Diff line change
Expand Up @@ -1679,8 +1679,8 @@
"En un esfuerzo por proporcionar una mayor seguridad para el monedero basado en la web, lo estamos migrando, con efecto inmediato a la dirección a continuación. Por favor, asegúrese de actualizar los marcadores que pueda tener.",
"text_1": "Cartera local detecta",
"text_2":
"Haga una copia de seguridad de su billetera ahora y restaure el archivo de respaldo a <a href='https://wallet.bitshares.org' target='blank' rel='noopener noreferrer'>https://wallet.bitshares.org</a>, cuál será su nueva dirección para la billetera web. Gracias por su apoyo continuo.",
"Haga una copia de seguridad de su billetera ahora y restaure el archivo de respaldo a <a href='https://market.rudex.org' target='blank' rel='noopener noreferrer'>https://wallet.bitshares.org</a>, cuál será su nueva dirección para la billetera web. Gracias por su apoyo continuo.",
"text_3":
"Please use <a href='https://wallet.bitshares.org' target='blank' rel='noopener noreferrer'>https://wallet.bitshares.org</a> a partir de ahora, sus credenciales existentes le permitirán iniciar sesión allí también."
"Please use <a href='https://wallet.bitshares.org' target='blank' rel='noopener noreferrer'>https://market.rudex.org</a> a partir de ahora, sus credenciales existentes le permitirán iniciar sesión allí también."
}
}
4 changes: 2 additions & 2 deletions app/assets/locales/locale-ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -1792,9 +1792,9 @@
"In an effort to provide enhanced security for the web-based wallet, we are migrating it, effective immediately to the address below. Please be sure to update any bookmarks you may have.",
"text_1": "Local wallet detected",
"text_2":
"Please backup your wallet now and restore the backup file to <a href='https://wallet.bitshares.org' target='blank' rel='noopener noreferrer'>https://wallet.bitshares.org</a>, which will be your new address for the web wallet. Thanks for your continued support.",
"Please backup your wallet now and restore the backup file to <a href='https://market.rudex.org' target='blank' rel='noopener noreferrer'>https://wallet.bitshares.org</a>, which will be your new address for the web wallet. Thanks for your continued support.",
"text_3":
"Please use <a href='https://wallet.bitshares.org' target='blank' rel='noopener noreferrer'>https://wallet.bitshares.org</a> from now on, your existing credentials will let you login there as well."
"Please use <a href='https://market.rudex.org' target='blank' rel='noopener noreferrer'>https://market.rudex.org</a> from now on, your existing credentials will let you login there as well."
},
"news": {
"news": "ニュース",
Expand Down
4 changes: 2 additions & 2 deletions app/assets/locales/locale-zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -1613,9 +1613,9 @@
"为了提高浏览器钱包的安全性,我们已经将服务迁移至以下地址。请更新您的书签。",
"text_1": "检测到本地钱包",
"text_2":
"请立刻备份钱包,并在 <a href='https://wallet.bitshares.org' target='blank' rel='noopener noreferrer'>https://wallet.bitshares.org</a>将钱包恢复。请今后使用此地址访问浏览器钱包。感谢您一贯的支持。",
"请立刻备份钱包,并在 <a href='https://market.rudex.org' target='blank' rel='noopener noreferrer'>https://market.rudex.org</a>将钱包恢复。请今后使用此地址访问浏览器钱包。感谢您一贯的支持。",
"text_3":
"请今后使用 <a href='https://wallet.bitshares.org' target='blank' rel='noopener noreferrer'>https://wallet.bitshares.org</a> 访问浏览器钱包。您当前的账户和密码不变,可以继续使用。"
"请今后使用 <a href='https://market.rudex.org' target='blank' rel='noopener noreferrer'>https://market.rudex.org</a> 访问浏览器钱包。您当前的账户和密码不变,可以继续使用。"
},
"news": {
"news": "新闻",
Expand Down
2 changes: 1 addition & 1 deletion app/components/Account/AccountMembership.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ class AccountMembership extends React.Component {
</h4>
<Translate content="account.member.referral_text" />:
<h5
>{`https://wallet.bitshares.org/?r=${
>{`https://market.rudex.org/?r=${
account.name
}`}</h5>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/components/Layout/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class Footer extends React.Component {
componentDidMount() {
this.checkNewVersionAvailable.call(this);

this.downloadLink = "https://bitshares.org/download";
this.downloadLink = "https://github.com/blckchnd/rudex-ui/releases";
}

shouldComponentUpdate(nextProps, nextState) {
Expand All @@ -56,7 +56,7 @@ class Footer extends React.Component {
checkNewVersionAvailable() {
if (__ELECTRON__) {
fetch(
"https://api.github.com/repos/bitshares/bitshares-ui/releases/latest"
"https://api.github.com/repos/blckchnd/rudex-ui/releases/latest"
)
.then(res => {
return res.json();
Expand Down
2 changes: 1 addition & 1 deletion app/lib/common/assetGatewayMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function _getCoinToGatewayMapping(boolCheck = "depositAllowed") {
function _openGatewaySite() {
let {selectedGateway, gatewayStatus} = this.state;
let win = window.open(
"https://wallet.bitshares.org/#/help/gateways/" +
"https://market.rudex.org/#/help/gateways/" +
gatewayStatus[selectedGateway].name.toLowerCase().replace("-", ""),
"_blank"
);
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "RuDEX-light",
"version": "2.0.180420",
"version": "2.0.180423",
"description": "Advanced wallet interface for the BitShares financial blockchain.",
"homepage": "https://github.com/blckchnd/rudex-ui",
"author": "RuDEX Team <[email protected]>",
Expand Down

0 comments on commit b18d43e

Please sign in to comment.