Skip to content

Commit

Permalink
chore(merge): development
Browse files Browse the repository at this point in the history
  • Loading branch information
schnogz committed Nov 29, 2020
2 parents 5cd0953 + 107a83e commit 186de88
Show file tree
Hide file tree
Showing 81 changed files with 1,325 additions and 881 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* @schnogz @jjBlockchain @tbuchann @blockdylanb @TheLeoB @milan-bc @dsisto-bc
1 change: 0 additions & 1 deletion CODEOWNERS

This file was deleted.

32 changes: 26 additions & 6 deletions config/mocks/wallet-options-v4.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
},
"learnMoreLink": "",
"minConfirmations": 0,
"showNewTagSidenav": true,
"txListAppRoute": "/eur/transactions"
},
"GBP": {
Expand All @@ -51,7 +50,6 @@
},
"learnMoreLink": "",
"minConfirmations": 0,
"showNewTagSidenav": true,
"txListAppRoute": "/gbp/transactions"
},
"USD": {
Expand All @@ -72,7 +70,6 @@
},
"learnMoreLink": "",
"minConfirmations": 0,
"showNewTagSidenav": true,
"txListAppRoute": "/usd/transactions"
},
"BTC": {
Expand Down Expand Up @@ -319,11 +316,34 @@
"minConfirmations": 12,
"txExplorerBaseUrl": "https://www.blockchain.com/eth/tx",
"txListAppRoute": "/usdt/transactions"
},
"WDGLD": {
"availability": {
"send": true,
"request": true,
"lockbox": false,
"exchangeTo": true,
"exchangeFrom": true,
"syncToPit": true
},
"coinCode": "WDGLD",
"coinTicker": "WDGLD",
"colorCode": "wdgld",
"contractAddress": "0x123151402076fc819B7564510989e475c9cD93CA",
"displayName": "Wrapped-DGLD",
"hasLockboxSupport": false,
"showNewTagSidenav": true,
"icons": {
"default": "wdgld",
"circle": "wdgld",
"circleFilled": "wdgld"
},
"learnMoreLink": "https://support.blockchain.com/hc/en-us/articles/360052952171",
"minConfirmations": 12,
"txExplorerBaseUrl": "https://www.blockchain.com/eth/tx",
"txListAppRoute": "/wdgld/transactions"
}
},
"thePit": {
"countries": []
},
"sfox": {
"countries": ["US"],
"states": [
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": "blockchain-wallet-v4",
"version": "4.46.34",
"version": "4.46.41",
"license": "AGPL-3.0-or-later",
"private": true,
"author": {
Expand Down
2 changes: 2 additions & 0 deletions packages/blockchain-info-components/src/Colors/DarkMode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ const DarkTheme: DefaultTheme = {
'xlm-light': 'rgba(0, 0, 0, 0.15)',
usdt: '#26A17B',
'usdt-light': 'rgba(38, 161, 123, 0.15)',
wdgld: '#ffe738',
'wdgld-light': 'rgba(255, 231, 56, 0.15)',
// OLD - AVOID USE \\
// Brand
'brand-yellow': '#665227',
Expand Down
2 changes: 2 additions & 0 deletions packages/blockchain-info-components/src/Colors/Default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ const Default = {
'xlm-light': 'rgba(0, 0, 0, 0.15)',
usdt: '#26A17B',
'usdt-light': 'rgba(38, 161, 123, 0.15)',
wdgld: '#353F52',
'wdgld-light': 'rgba(255, 231, 56, 0.15)',
// OLD - AVOID USE \\
// Brand
'brand-yellow': '#FFB266',
Expand Down
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file not shown.

0 comments on commit 186de88

Please sign in to comment.