From 175a98d50fb0e0deffde64143ecf2e1b44d727e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= Date: Wed, 10 Feb 2021 18:49:57 +0000 Subject: [PATCH] fix: autocomplete input not showing available options fix: remove log --- .../src/components/inputs/base/Autocomplete.js | 6 ++++-- new-lamassu-admin/src/pages/Cashout/Wizard.js | 14 ++++++++++++-- .../src/pages/Services/schemas/bitgo.js | 7 ++++++- .../src/pages/Services/schemas/singlebitgo.js | 7 ++++++- 4 files changed, 28 insertions(+), 6 deletions(-) diff --git a/new-lamassu-admin/src/components/inputs/base/Autocomplete.js b/new-lamassu-admin/src/components/inputs/base/Autocomplete.js index 589b1808..5b71c0cf 100644 --- a/new-lamassu-admin/src/components/inputs/base/Autocomplete.js +++ b/new-lamassu-admin/src/components/inputs/base/Autocomplete.js @@ -49,8 +49,10 @@ const Autocomplete = ({ return multiple ? value : [value] } - const filter = (array, input) => - sort(array, input, { keys: [valueProp, labelProp] }) + const filter = (array, input) => { + if (!input) return array + return sort(array, input, { keys: [valueProp, labelProp] }) + } const filterOptions = (array, { inputValue }) => R.union( diff --git a/new-lamassu-admin/src/pages/Cashout/Wizard.js b/new-lamassu-admin/src/pages/Cashout/Wizard.js index fb8f1d39..11259af1 100644 --- a/new-lamassu-admin/src/pages/Cashout/Wizard.js +++ b/new-lamassu-admin/src/pages/Cashout/Wizard.js @@ -54,12 +54,22 @@ const Wizard = ({ machine, locale, onClose, save, error }) => { { type: 'top', display: 'Cassette 1 (Top)', - component: Autocomplete + component: Autocomplete, + inputProps: { + options: R.map(it => ({ code: it, display: it }))(options), + labelProp: 'display', + valueProp: 'code' + } }, { type: 'bottom', display: 'Cassette 2', - component: Autocomplete + component: Autocomplete, + inputProps: { + options: R.map(it => ({ code: it, display: it }))(options), + labelProp: 'display', + valueProp: 'code' + } }, { type: 'zeroConfLimit', diff --git a/new-lamassu-admin/src/pages/Services/schemas/bitgo.js b/new-lamassu-admin/src/pages/Services/schemas/bitgo.js index d79d1e2f..ec9cf17c 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/bitgo.js +++ b/new-lamassu-admin/src/pages/Services/schemas/bitgo.js @@ -25,7 +25,12 @@ export default { display: 'Environment', component: Autocomplete, inputProps: { - options: ['prod', 'test'] + options: [ + { code: 'prod', display: 'prod' }, + { code: 'test', display: 'test' } + ], + labelProp: 'display', + valueProp: 'code' }, face: true }, diff --git a/new-lamassu-admin/src/pages/Services/schemas/singlebitgo.js b/new-lamassu-admin/src/pages/Services/schemas/singlebitgo.js index 368cc798..a8d11ed2 100644 --- a/new-lamassu-admin/src/pages/Services/schemas/singlebitgo.js +++ b/new-lamassu-admin/src/pages/Services/schemas/singlebitgo.js @@ -23,7 +23,12 @@ const singleBitgo = code => ({ display: 'Environment', component: Autocomplete, inputProps: { - options: ['prod', 'test'] + options: [ + { code: 'prod', display: 'prod' }, + { code: 'test', display: 'test' } + ], + labelProp: 'display', + valueProp: 'code' }, face: true },