Merge branch 'development' into feature/application-logger

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,16 @@
+# 🐛 Bug Report 🐛
+
+## Description
+Provide a clear and concise description of the issue.
+
+## Expected Behavior
+Explain what you would expect to happen.
+
+## Reproduction Steps
+Enter detailed steps to reproduce the issue.
+
+## Screenshots/Logs
+If available, please provide any relevant screenshots or logs.
+
+## Additional Information
+Add any addition information that might be useful to our team.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1 +1,25 @@
-- [ ] Spot checked
+## Description
+Add a concise explanation of the changes.
+
+## Change Type
+Please enter one or more of the following: 
+- Feature
+- Bug Fix
+- CI/CD
+- Upgrades
+- Other (add explanation)
+
+## Testing Steps
+Detail the steps required for the reviewer(s) to verify and test these changes.
+
+## PR Creator Checklist
+- [ ] Code compiles correctly
+- [ ] No lint issues exist (verified via `yarn lint`)
+- [ ] All unit tests pass (verified via `yarn test`)
+- [ ] Updated `README.md` and other documentation (if necessary)
+
+## PR Reviewer Checklist
+- [ ] Change validated and application spot checked
+- [ ] Code styles and best practices met
+- [ ] Code is readable and commented when necessary
+

packages/blockchain-info-components/src/Badges/__snapshots__/Badge.spec.js.snap

@@ -8,7 +8,8 @@ exports[`Badge component applestore renders correctly 1`] = `
   target="_blank"
 >
   <img
-    class="sc-htpNat chbhfk"
+    class="sc-htpNat gLNmzh"
+    color="auto"
     height="40px"
     src="[object Object]"
     width="auto"
@@ -24,7 +25,8 @@ exports[`Badge component googleplay renders correctly 1`] = `
   target="_blank"
 >
   <img
-    class="sc-htpNat chbhfk"
+    class="sc-htpNat gLNmzh"
+    color="auto"
     height="40px"
     src="[object Object]"
     width="auto"

packages/blockchain-info-components/src/Buttons/Button.js

@@ -14,6 +14,7 @@ const BaseButton = styled.button.attrs({
   min-width: ${props => props.width ? props.width : '140px'};
   height: ${props => props.height};
   padding: ${props => props.padding ? props.padding : '10px 15px'};
+  margin: ${props => props.margin};
   box-sizing: border-box;
   user-select: none;
   text-align: center;
@@ -87,7 +88,8 @@ Button.propTypes = {
   uppercase: PropTypes.bool,
   capitalize: PropTypes.bool,
   width: PropTypes.string,
-  padding: PropTypes.string
+  padding: PropTypes.string,
+  margin: PropTypes.string
 }
 
 Button.defaultProps = {

packages/blockchain-info-components/src/Dropdowns/ComponentDropdown/template.js

@@ -96,7 +96,10 @@ Dropdown.defaultProps = {
 }
 
 Dropdown.propTypes = {
-  selectedValue: PropTypes.number,
+  selectedValue: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.number
+  ]),
   callback: PropTypes.func.isRequired,
   toggled: PropTypes.bool,
   color: PropTypes.oneOf(keysIn(Palette())),

packages/blockchain-info-components/src/Dropdowns/SimpleDropdown/index.js

@@ -46,7 +46,7 @@ class SimpleDropdown extends React.PureComponent {
 SimpleDropdown.defaultProps = {
   color: 'brand-secondary',
   opened: false,
-  selectedValue: 0,
+  // selectedValue: 0,
   uppercase: true,
   down: false
 }

packages/blockchain-info-components/src/Dropdowns/SimpleDropdown/template.js

@@ -97,7 +97,10 @@ Dropdown.defaultProps = {
 }
 
 Dropdown.propTypes = {
-  selectedValue: PropTypes.number,
+  selectedValue: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.number
+  ]),
   items: PropTypes.arrayOf(PropTypes.shape({
     text: PropTypes.string.isRequired,
     value: PropTypes.string.isRequired

packages/blockchain-info-components/src/Images/Image.js

@@ -7,6 +7,7 @@ import Images from './Images'
 const BaseImage = styled.img`
   width: ${props => props.width};
   height: ${props => props.height};
+  color: ${props => props.color};
 `
 
 const Image = (props) => {
@@ -19,13 +20,15 @@ const Image = (props) => {
 
 Image.defaultProps = {
   width: 'auto',
-  height: 'auto'
+  height: 'auto',
+  color: 'auto'
 }
 
 Image.propTypes = {
   name: PropTypes.string.isRequired,
   width: PropTypes.string,
-  height: PropTypes.string
+  height: PropTypes.string,
+  color: PropTypes.string
 }
 
 export default Image

packages/blockchain-info-components/src/Images/Images.js

@@ -15,6 +15,8 @@ import chartPlaceholder from './img/chart-placeholder.png'
 import checkHelper from './img/check-helper.svg'
 import googleAuthenticator from './img/google-authenticator.png'
 import googlePlayBadge from './img/google-play-badge.png'
+import halfBitcoin from './img/half-bitcoin.svg'
+import halfBitcoincash from './img/half-bitcoincash.svg'
 import halfEther from './img/half-ether.svg'
 import landingPageBannerOverlay from './img/landing-page-banner-overlay.jpg'
 import landingPageBannerSmOverlay from './img/landing-page-banner-sm-overlay.jpg'
@@ -49,6 +51,8 @@ export default {
   'check-helper': checkHelper,
   'google-authenticator': googleAuthenticator,
   'google-play-badge': googlePlayBadge,
+  'half-bitcoin': halfBitcoin,
+  'half-bitcoincash': halfBitcoincash,
   'half-ether': halfEther,
   'landing-page-banner-overlay': landingPageBannerOverlay,
   'landing-page-banner-sm-overlay': landingPageBannerSmOverlay,