Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release: Version v0.6.8 RC #345

Merged
merged 4 commits into from
May 27, 2021
Merged

Release: Version v0.6.8 RC #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b279d13
Merge pull request #343 from Conflux-Chain/master
yqrashawn May 27, 2021
f1911ef
feat: new domain for testnet faucet (#344)
yqrashawn May 27, 2021
4c9eefa
docs: changelog
yqrashawn May 27, 2021
f703295
Version v0.6.8
ConfluxBot May 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@

## Current Develop Branch

## 0.6.8 Thu May 27 2021

- feat: new domain for testnet faucet (#344)

## 0.6.7 Thu May 27 2021

- feat: @conflux-chain to @confluxnetwork (#341)

## 0.6.6 Tue May 18 2021
Expand Down
2 changes: 1 addition & 1 deletion app/_locales/bn/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -738,7 +738,7 @@
"message": "আপনার সীড ফ্রেজ বিষয়ে সাবধান থাকুন — এমন ওয়েবসাইটগুলির রিপোর্ট পাওয়া গেছে যেগুলি ConfluxPortal কে অনুকরণ করার চেষ্টা করে। ConfluxPortal কখনও আপনার সীড ফ্রেজ জিজ্ঞাসা করবে না।"
},
"protectYourKeysMessage2": {
"message": "আপনার ফ্রেজটিকে নিরাপদে রাখুন।সন্দেহজনক কিছু দেখলে, বা একটি ওয়েবসাইট সম্পর্কে নিশ্চিত না হলে, portal@conflux-chain.org এ ইমেল করুন"
"message": "আপনার ফ্রেজটিকে নিরাপদে রাখুন।সন্দেহজনক কিছু দেখলে, বা একটি ওয়েবসাইট সম্পর্কে নিশ্চিত না হলে, portal@confluxnetwork.org এ ইমেল করুন"
},
"rpcUrl": {
"message": "নতুন RPC URL"
Expand Down
6 changes: 3 additions & 3 deletions app/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "ConfluxPortal",
"short_name": "ConfluxPortal",
"version": "0.6.7",
"version": "0.6.8",
"manifest_version": 2,
"author": "https://conflux-chain.org",
"author": "https://confluxnetwork.org",
"description": "__MSG_appDescription__",
"commands": {
"_execute_browser_action": {
Expand Down Expand Up @@ -92,7 +92,7 @@
"matches": [
"https://confluxscan.io/*",
"https://testnet.confluxscan.io/*",
"https://conflux-chain.org/*",
"https://confluxnetwork.org/*",
"https://portal-main.confluxrpc.com/*",
"https://portal-test.confluxrpc.com/*"
],
Expand Down
8 changes: 4 additions & 4 deletions app/scripts/lib/buy-eth-url.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export default getBuyEthUrl
* network does not match any of the specified cases, or if no network is given, returns undefined.
*
*/
function getBuyEthUrl ({ network, /* amount, */ address, service, type }) {
function getBuyEthUrl({ network, /* amount, */ address, service, type }) {
// default service by network if not specified
if (type && !service) {
service = getDefaultServiceForType(type)
Expand All @@ -26,13 +26,13 @@ function getBuyEthUrl ({ network, /* amount, */ address, service, type }) {
case 'conflux-main-faucet':
return `https://confluxscan.io/sponsor`
case 'conflux-test-faucet':
return `http://test-faucet.conflux-chain.org:18088/dev/ask?address=${address}`
return `http://test-faucet.confluxnetwork.org:18088/dev/ask?address=${address}`
default:
throw new Error(`Unknown cryptocurrency exchange or faucet: "${service}"`)
}
}

function getDefaultServiceForNetwork (network) {
function getDefaultServiceForNetwork(network) {
switch (network) {
case '1029':
return 'conflux-main-faucet'
Expand All @@ -43,7 +43,7 @@ function getDefaultServiceForNetwork (network) {
}
}

function getDefaultServiceForType (type) {
function getDefaultServiceForType(type) {
switch (type) {
case 'mainnet':
return 'conflux-main-faucet'
Expand Down
2 changes: 1 addition & 1 deletion test/unit/app/buy-eth-url.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ describe('buy-eth-url', function() {
const testnetUrl = getBuyEthUrl(testnet)
assert.equal(
testnetUrl,
'http://test-faucet.conflux-chain.org:18088/dev/ask?address=0x1dcd5d886577d5081b0c52e242ef29e70be3e7bc'
'http://test-faucet.confluxnetwork.org:18088/dev/ask?address=0x1dcd5d886577d5081b0c52e242ef29e70be3e7bc'
)
})

Expand Down