From 8b701e8ed7edc4633b556c1cdef1d812752abbd8 Mon Sep 17 00:00:00 2001 From: Tom Kirkpatrick Date: Tue, 6 Nov 2018 10:00:55 +0100 Subject: [PATCH] refactor: regenerate icons with unique ids --- .svgrrc | 1 + app/components/Icon/BigArrowLeft.js | 2 +- app/components/Icon/BigArrowRight.js | 2 +- app/components/Icon/Bitcoin.js | 2 +- app/components/Icon/Btcpay.js | 2 +- app/components/Icon/ChainLink.js | 6 +++--- app/components/Icon/Channels.js | 4 ++-- app/components/Icon/Check.js | 6 +++--- app/components/Icon/CheckAnimated.js | 16 +++++++++++++--- app/components/Icon/CheckCircle.js | 6 +++--- app/components/Icon/Clock.js | 6 +++--- app/components/Icon/Close.js | 2 +- app/components/Icon/CloudLightning.js | 6 +++--- app/components/Icon/Cloudbolt.js | 4 ++-- app/components/Icon/Contacts.js | 2 +- app/components/Icon/Copy.js | 6 +++--- app/components/Icon/Error.js | 2 +- app/components/Icon/Eye.js | 6 +++--- app/components/Icon/Globe.js | 6 +++--- app/components/Icon/Hand.js | 2 +- app/components/Icon/Help.js | 6 +++--- app/components/Icon/Help2.js | 2 +- app/components/Icon/IconPlus.js | 4 ++-- app/components/Icon/Lightning.js | 6 +++--- app/components/Icon/Litecoin.js | 2 +- app/components/Icon/LndLogo.js | 2 +- app/components/Icon/LtcLogo.js | 2 +- app/components/Icon/Network.js | 2 +- app/components/Icon/Onchain.js | 6 +++--- app/components/Icon/PaperPlane.js | 2 +- app/components/Icon/Peers.js | 3 +-- app/components/Icon/Plus.js | 6 +++--- app/components/Icon/PlusCircle.js | 6 +++--- app/components/Icon/Qrcode.js | 4 ++-- app/components/Icon/Search.js | 6 +++--- app/components/Icon/Settings.js | 3 +-- app/components/Icon/SkinnyBitcoin.js | 2 +- app/components/Icon/Spinner.js | 12 +++--------- app/components/Icon/Success.js | 12 +++--------- app/components/Icon/User.js | 6 +++--- app/components/Icon/Wallet.js | 2 +- app/components/Icon/Wallet2.js | 2 +- app/components/Icon/X.js | 12 +++--------- app/components/Icon/Zap.js | 6 +++--- app/components/Icon/ZapLogo.js | 2 +- app/components/Icon/ZapLogoBlack.js | 2 +- app/icons/channels.svg | 4 ++-- app/icons/icon-plus.svg | 2 +- app/icons/peers.svg | 4 ++-- app/icons/qrcode.svg | 4 ++-- app/icons/settings.svg | 4 ++-- .../UI/__snapshots__/Modal.spec.js.snap | 5 ++--- .../UI/__snapshots__/Notification.spec.js.snap | 10 ++++------ .../UI/__snapshots__/Spinner.spec.js.snap | 5 ++--- 54 files changed, 117 insertions(+), 130 deletions(-) diff --git a/.svgrrc b/.svgrrc index bd73f1e9..657a110c 100644 --- a/.svgrrc +++ b/.svgrrc @@ -2,6 +2,7 @@ "icon": true, "replaceAttrValues": { "#FFF": "currentColor", + "#FFFFFF": "currentColor", "#F5A623": "currentColor", "#010002": "currentColor", "#E63939": "currentColor", diff --git a/app/components/Icon/BigArrowLeft.js b/app/components/Icon/BigArrowLeft.js index d1a73661..92233368 100644 --- a/app/components/Icon/BigArrowLeft.js +++ b/app/components/Icon/BigArrowLeft.js @@ -1,7 +1,7 @@ import React from 'react' const SvgBigArrowLeft = props => ( - + ( - + ( - + ( - + ( diff --git a/app/components/Icon/Channels.js b/app/components/Icon/Channels.js index 529ef3ad..02d1abe8 100644 --- a/app/components/Icon/Channels.js +++ b/app/components/Icon/Channels.js @@ -1,8 +1,8 @@ import React from 'react' const SvgChannels = props => ( - - + + diff --git a/app/components/Icon/Check.js b/app/components/Icon/Check.js index f5a5ac00..8a3bdfbb 100644 --- a/app/components/Icon/Check.js +++ b/app/components/Icon/Check.js @@ -2,15 +2,15 @@ import React from 'react' const SvgCheck = props => ( diff --git a/app/components/Icon/CheckAnimated.js b/app/components/Icon/CheckAnimated.js index a49d236b..36c28e14 100644 --- a/app/components/Icon/CheckAnimated.js +++ b/app/components/Icon/CheckAnimated.js @@ -1,9 +1,19 @@ import React from 'react' const SvgCheckAnimated = props => ( - - - + + + ) diff --git a/app/components/Icon/CheckCircle.js b/app/components/Icon/CheckCircle.js index 9c1bbc30..970c5516 100644 --- a/app/components/Icon/CheckCircle.js +++ b/app/components/Icon/CheckCircle.js @@ -2,15 +2,15 @@ import React from 'react' const SvgCheckCircle = props => ( diff --git a/app/components/Icon/Clock.js b/app/components/Icon/Clock.js index 8a776a59..1d1a29cd 100644 --- a/app/components/Icon/Clock.js +++ b/app/components/Icon/Clock.js @@ -2,15 +2,15 @@ import React from 'react' const SvgClock = props => ( diff --git a/app/components/Icon/Close.js b/app/components/Icon/Close.js index df10cab4..e6511263 100644 --- a/app/components/Icon/Close.js +++ b/app/components/Icon/Close.js @@ -1,7 +1,7 @@ import React from 'react' const SvgClose = props => ( - + diff --git a/app/components/Icon/CloudLightning.js b/app/components/Icon/CloudLightning.js index 2205129a..f897fc79 100644 --- a/app/components/Icon/CloudLightning.js +++ b/app/components/Icon/CloudLightning.js @@ -2,15 +2,15 @@ import React from 'react' const SvgCloudLightning = props => ( diff --git a/app/components/Icon/Cloudbolt.js b/app/components/Icon/Cloudbolt.js index 9d568f9e..0bd59af0 100644 --- a/app/components/Icon/Cloudbolt.js +++ b/app/components/Icon/Cloudbolt.js @@ -1,9 +1,9 @@ import React from 'react' const SvgCloudbolt = props => ( - + diff --git a/app/components/Icon/Contacts.js b/app/components/Icon/Contacts.js index e8332317..7960e16f 100644 --- a/app/components/Icon/Contacts.js +++ b/app/components/Icon/Contacts.js @@ -1,7 +1,7 @@ import React from 'react' const SvgContacts = props => ( - + ( diff --git a/app/components/Icon/Error.js b/app/components/Icon/Error.js index 6e0c8d70..dfbb72b3 100644 --- a/app/components/Icon/Error.js +++ b/app/components/Icon/Error.js @@ -1,7 +1,7 @@ import React from 'react' const SvgError = props => ( - + ( diff --git a/app/components/Icon/Globe.js b/app/components/Icon/Globe.js index db6aa774..b1cf5dd9 100644 --- a/app/components/Icon/Globe.js +++ b/app/components/Icon/Globe.js @@ -2,15 +2,15 @@ import React from 'react' const SvgGlobe = props => ( diff --git a/app/components/Icon/Hand.js b/app/components/Icon/Hand.js index d8e4311c..8c8acfe5 100644 --- a/app/components/Icon/Hand.js +++ b/app/components/Icon/Hand.js @@ -1,7 +1,7 @@ import React from 'react' const SvgHand = props => ( - + diff --git a/app/components/Icon/Help.js b/app/components/Icon/Help.js index 1126305a..ccf6996c 100644 --- a/app/components/Icon/Help.js +++ b/app/components/Icon/Help.js @@ -2,15 +2,15 @@ import React from 'react' const SvgHelp = props => ( diff --git a/app/components/Icon/Help2.js b/app/components/Icon/Help2.js index a717a990..2994ec34 100644 --- a/app/components/Icon/Help2.js +++ b/app/components/Icon/Help2.js @@ -1,7 +1,7 @@ import React from 'react' const SvgHelp2 = props => ( - + ( - - + + diff --git a/app/components/Icon/Lightning.js b/app/components/Icon/Lightning.js index 03955321..d26740ab 100644 --- a/app/components/Icon/Lightning.js +++ b/app/components/Icon/Lightning.js @@ -1,15 +1,15 @@ import React from 'react' const SvgLightning = props => ( - + - + - + ( - + ) diff --git a/app/components/Icon/LndLogo.js b/app/components/Icon/LndLogo.js index 1cdb8007..077eeb21 100644 --- a/app/components/Icon/LndLogo.js +++ b/app/components/Icon/LndLogo.js @@ -1,7 +1,7 @@ import React from 'react' const SvgLndLogo = props => ( - + ( - + ( - + ( - + - + - + ( - + ( - + diff --git a/app/components/Icon/Plus.js b/app/components/Icon/Plus.js index 5c6169fb..3b17508c 100644 --- a/app/components/Icon/Plus.js +++ b/app/components/Icon/Plus.js @@ -2,15 +2,15 @@ import React from 'react' const SvgPlus = props => ( diff --git a/app/components/Icon/PlusCircle.js b/app/components/Icon/PlusCircle.js index e7de4594..0875ad1d 100644 --- a/app/components/Icon/PlusCircle.js +++ b/app/components/Icon/PlusCircle.js @@ -2,15 +2,15 @@ import React from 'react' const SvgPlusCircle = props => ( diff --git a/app/components/Icon/Qrcode.js b/app/components/Icon/Qrcode.js index 891ccdfa..53da3723 100644 --- a/app/components/Icon/Qrcode.js +++ b/app/components/Icon/Qrcode.js @@ -1,8 +1,8 @@ import React from 'react' const SvgQrcode = props => ( - - + + diff --git a/app/components/Icon/Search.js b/app/components/Icon/Search.js index 572c31a6..1a040bef 100644 --- a/app/components/Icon/Search.js +++ b/app/components/Icon/Search.js @@ -2,15 +2,15 @@ import React from 'react' const SvgSearch = props => ( diff --git a/app/components/Icon/Settings.js b/app/components/Icon/Settings.js index fdcf1572..3babe437 100644 --- a/app/components/Icon/Settings.js +++ b/app/components/Icon/Settings.js @@ -1,14 +1,13 @@ import React from 'react' const SvgSettings = props => ( - + diff --git a/app/components/Icon/SkinnyBitcoin.js b/app/components/Icon/SkinnyBitcoin.js index f935a33e..191d0cd4 100644 --- a/app/components/Icon/SkinnyBitcoin.js +++ b/app/components/Icon/SkinnyBitcoin.js @@ -1,7 +1,7 @@ import React from 'react' const SvgSkinnyBitcoin = props => ( - + diff --git a/app/components/Icon/Spinner.js b/app/components/Icon/Spinner.js index a9d72be1..a634a8df 100644 --- a/app/components/Icon/Spinner.js +++ b/app/components/Icon/Spinner.js @@ -1,20 +1,14 @@ import React from 'react' const SvgSpinner = props => ( - + - + ) diff --git a/app/components/Icon/Success.js b/app/components/Icon/Success.js index 73bf86ce..50610f99 100644 --- a/app/components/Icon/Success.js +++ b/app/components/Icon/Success.js @@ -1,20 +1,14 @@ import React from 'react' const SvgSuccess = props => ( - + - + ) diff --git a/app/components/Icon/User.js b/app/components/Icon/User.js index aa0c238c..fe067abc 100644 --- a/app/components/Icon/User.js +++ b/app/components/Icon/User.js @@ -2,15 +2,15 @@ import React from 'react' const SvgUser = props => ( diff --git a/app/components/Icon/Wallet.js b/app/components/Icon/Wallet.js index 7ddf08ff..f971d77e 100644 --- a/app/components/Icon/Wallet.js +++ b/app/components/Icon/Wallet.js @@ -1,7 +1,7 @@ import React from 'react' const SvgWallet = props => ( - + diff --git a/app/components/Icon/Wallet2.js b/app/components/Icon/Wallet2.js index 4e878e1c..d96588a6 100644 --- a/app/components/Icon/Wallet2.js +++ b/app/components/Icon/Wallet2.js @@ -1,7 +1,7 @@ import React from 'react' const SvgWallet2 = props => ( - + diff --git a/app/components/Icon/X.js b/app/components/Icon/X.js index 0259171d..d1f60288 100644 --- a/app/components/Icon/X.js +++ b/app/components/Icon/X.js @@ -1,16 +1,10 @@ import React from 'react' const SvgX = props => ( - + @@ -21,7 +15,7 @@ const SvgX = props => ( strokeLinecap="round" strokeLinejoin="round" transform="translate(1)" - xlinkHref="#a" + xlinkHref="#x_svg__a" /> ) diff --git a/app/components/Icon/Zap.js b/app/components/Icon/Zap.js index 7fa259df..4b75069b 100644 --- a/app/components/Icon/Zap.js +++ b/app/components/Icon/Zap.js @@ -2,15 +2,15 @@ import React from 'react' const SvgZap = props => ( diff --git a/app/components/Icon/ZapLogo.js b/app/components/Icon/ZapLogo.js index 953ef42c..b9a245bd 100644 --- a/app/components/Icon/ZapLogo.js +++ b/app/components/Icon/ZapLogo.js @@ -1,7 +1,7 @@ import React from 'react' const SvgZapLogo = props => ( - + ( - + Group Created with Sketch. - + @@ -17,4 +17,4 @@ - \ No newline at end of file + diff --git a/app/icons/icon-plus.svg b/app/icons/icon-plus.svg index ebbffb2e..938bc73c 100644 --- a/app/icons/icon-plus.svg +++ b/app/icons/icon-plus.svg @@ -1,5 +1,5 @@ - + diff --git a/app/icons/peers.svg b/app/icons/peers.svg index 6e30374d..38cda5bd 100644 --- a/app/icons/peers.svg +++ b/app/icons/peers.svg @@ -4,7 +4,7 @@ users Created with Sketch. - + @@ -16,4 +16,4 @@ - \ No newline at end of file + diff --git a/app/icons/qrcode.svg b/app/icons/qrcode.svg index fe674bc6..a1aab55e 100644 --- a/app/icons/qrcode.svg +++ b/app/icons/qrcode.svg @@ -4,7 +4,7 @@ Group 23 Created with Sketch. - + @@ -24,4 +24,4 @@ - \ No newline at end of file + diff --git a/app/icons/settings.svg b/app/icons/settings.svg index 04726886..44ad7aa7 100644 --- a/app/icons/settings.svg +++ b/app/icons/settings.svg @@ -4,7 +4,7 @@ settings Created with Sketch. - + @@ -14,4 +14,4 @@ - \ No newline at end of file + diff --git a/test/unit/components/UI/__snapshots__/Modal.spec.js.snap b/test/unit/components/UI/__snapshots__/Modal.spec.js.snap index d2a8a2c5..373a43fa 100644 --- a/test/unit/components/UI/__snapshots__/Modal.spec.js.snap +++ b/test/unit/components/UI/__snapshots__/Modal.spec.js.snap @@ -58,12 +58,11 @@ exports[`component.UI.Modal should render correctly 1`] = ` height="2em" viewBox="0 0 22 20" width="2em" - xmlnsXlink="http://www.w3.org/1999/xlink" > diff --git a/test/unit/components/UI/__snapshots__/Notification.spec.js.snap b/test/unit/components/UI/__snapshots__/Notification.spec.js.snap index 7e2181dd..b591ffc2 100644 --- a/test/unit/components/UI/__snapshots__/Notification.spec.js.snap +++ b/test/unit/components/UI/__snapshots__/Notification.spec.js.snap @@ -65,18 +65,17 @@ exports[`component.UI.Notification should render correctly 1`] = ` height="1em" viewBox="0 0 17 17" width="1em" - xmlnsXlink="http://www.w3.org/1999/xlink" > @@ -94,12 +93,11 @@ exports[`component.UI.Notification should render correctly 1`] = ` strokeWidth={4} viewBox="0 0 22 20" width="1em" - xmlnsXlink="http://www.w3.org/1999/xlink" > diff --git a/test/unit/components/UI/__snapshots__/Spinner.spec.js.snap b/test/unit/components/UI/__snapshots__/Spinner.spec.js.snap index 7549a0e9..26b214dd 100644 --- a/test/unit/components/UI/__snapshots__/Spinner.spec.js.snap +++ b/test/unit/components/UI/__snapshots__/Spinner.spec.js.snap @@ -18,17 +18,16 @@ exports[`component.UI.Spinner should render correctly 1`] = ` height="1em" viewBox="0 0 14 14" width="1em" - xmlnsXlink="http://www.w3.org/1999/xlink" >