From 963e3ba13ed77e2b9fb6b9a586be15edb95ebc4b Mon Sep 17 00:00:00 2001 From: Overcooked Panda <35861207+overcookedpanda@users.noreply.github.com> Date: Thu, 11 Jun 2020 02:13:03 -0500 Subject: [PATCH] =?UTF-8?q?Units:=20Added=20bitcoin=20units=20milli-bitcoi?= =?UTF-8?q?n=20(mBTC)=20and=20micro-bitcoin=20(=CE=BCBTC)=20(#24182)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update Bitcoin Currency to use proper symbol, add mBTC and μBTC * Apply suggestions from code review Co-authored-by: Marcus Andersson * Revert Bitcoin to use '฿' Co-authored-by: Marcus Andersson (cherry picked from commit d3c57ac251650c85a893c42def6ab42b501a030e) --- .../dev-dashboards-without-uid/panel_tests_polystat.json | 8 ++++++++ devenv/dev-dashboards/panel-polystat/polystat_test.json | 8 ++++++++ packages/grafana-data/src/valueFormats/categories.ts | 2 ++ 3 files changed, 18 insertions(+) diff --git a/devenv/dev-dashboards-without-uid/panel_tests_polystat.json b/devenv/dev-dashboards-without-uid/panel_tests_polystat.json index 674a55404c0..a48ab7f1b99 100644 --- a/devenv/dev-dashboards-without-uid/panel_tests_polystat.json +++ b/devenv/dev-dashboards-without-uid/panel_tests_polystat.json @@ -428,6 +428,14 @@ { "text": "Bitcoin (฿)", "value": "currencyBTC" + }, + { + "text": "Milli Bitcoin (mBTC)", + "value": "currencymBTC" + }, + { + "text": "Micro Bitcoin (μBTC)", + "value": "currencyμBTC" } ], "text": "currency" diff --git a/devenv/dev-dashboards/panel-polystat/polystat_test.json b/devenv/dev-dashboards/panel-polystat/polystat_test.json index 051a42775dc..70d66eb6ea3 100644 --- a/devenv/dev-dashboards/panel-polystat/polystat_test.json +++ b/devenv/dev-dashboards/panel-polystat/polystat_test.json @@ -428,6 +428,14 @@ { "text": "Bitcoin (฿)", "value": "currencyBTC" + }, + { + "text": "Milli Bitcoin (mBTC)", + "value": "currencymBTC" + }, + { + "text": "Micro Bitcoin (μBTC)", + "value": "currencyμBTC" } ], "text": "currency" diff --git a/packages/grafana-data/src/valueFormats/categories.ts b/packages/grafana-data/src/valueFormats/categories.ts index 816aa4bf9cf..e5b5dde1e61 100644 --- a/packages/grafana-data/src/valueFormats/categories.ts +++ b/packages/grafana-data/src/valueFormats/categories.ts @@ -115,6 +115,8 @@ export const getCategories = (): ValueFormatCategory[] => [ { name: 'Swiss franc (CHF)', id: 'currencyCHF', fn: currency('CHF') }, { name: 'Polish Złoty (PLN)', id: 'currencyPLN', fn: currency('PLN') }, { name: 'Bitcoin (฿)', id: 'currencyBTC', fn: currency('฿') }, + { name: 'Milli Bitcoin (฿)', id: 'currencymBTC', fn: currency('mBTC') }, + { name: 'Micro Bitcoin (฿)', id: 'currencyμBTC', fn: currency('μBTC') }, { name: 'South African Rand (R)', id: 'currencyZAR', fn: currency('R') }, { name: 'Indian Rupee (₹)', id: 'currencyINR', fn: currency('₹') }, { name: 'South Korean Won (₩)', id: 'currencyKRW', fn: currency('₩') },