Skip to content

Commit

Permalink
Merge pull request #321 from department-of-veterans-affairs/feature/3…
Browse files Browse the repository at this point in the history
…04-nr-update-icon-for-va-ussf

[Feature] Remove service emblems and VA logo from Icon component
  • Loading branch information
narin authored May 23, 2024
2 parents 4d00df8 + 7d03f24 commit 3f1bbb3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 22 deletions.
2 changes: 1 addition & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"homepage": "https://department-of-veterans-affairs.github.io/va-mobile-library",
"dependencies": {
"@department-of-veterans-affairs/mobile-assets": "^0.4.1",
"@department-of-veterans-affairs/mobile-assets": "0.6.0",
"@department-of-veterans-affairs/mobile-tokens": "0.5.1",
"@os-team/i18next-react-native-language-detector": "^1.0.31",
"i18next": "^23.8.2",
Expand Down
16 changes: 0 additions & 16 deletions packages/components/src/components/Icon/Icon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,6 @@ import React, { FC } from 'react'

import { useColorScheme } from '../../utils'

// Service emblems
import AirForce from '@department-of-veterans-affairs/mobile-assets/serviceEmblems/AirForce.svg'
import Army from '@department-of-veterans-affairs/mobile-assets/serviceEmblems/Army.svg'
import CoastGuard from '@department-of-veterans-affairs/mobile-assets/serviceEmblems/CoastGuard.svg'
import MarineCorps from '@department-of-veterans-affairs/mobile-assets/serviceEmblems/MarineCorps.svg'
import Navy from '@department-of-veterans-affairs/mobile-assets/serviceEmblems/Navy.svg'

// VA Logo
import LogoWhiteText from '@department-of-veterans-affairs/mobile-assets/VALogo/LogoWhiteText.svg'

import AccountCircle from '@department-of-veterans-affairs/mobile-assets/icons/AccountCircle.svg'
import Add from '@department-of-veterans-affairs/mobile-assets/icons/Add.svg'
import Building from '@department-of-veterans-affairs/mobile-assets/icons/Building.svg'
Expand Down Expand Up @@ -68,8 +58,6 @@ import VideoCamera from '@department-of-veterans-affairs/mobile-assets/icons/Vid
export const IconMap = {
AccountCircle,
Add,
AirForce,
Army,
Building,
Bullet,
Calendar,
Expand All @@ -83,7 +71,6 @@ export const IconMap = {
ChevronRight,
ChevronUp,
CircleCheckMark,
CoastGuard,
Compose,
Description,
DescriptionOutline,
Expand All @@ -100,12 +87,9 @@ export const IconMap = {
Inbox,
Info,
Lock,
LogoWhiteText,
MarineCorps,
MedicalServices,
MedicalServicesOutline,
Minus,
Navy,
PaperClip,
Phone,
QuestionMark,
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2061,10 +2061,10 @@ __metadata:
languageName: unknown
linkType: soft

"@department-of-veterans-affairs/mobile-assets@npm:^0.4.1":
version: 0.4.1
resolution: "@department-of-veterans-affairs/mobile-assets@npm:0.4.1"
checksum: 2ec26f136568c954d6e463ebf974af8059495b359f3aa31d938a1902029aba777e17dcab1dab6a1f0de2fdd0decf5641f202fe44234c4ffc03fca8169e0d3817
"@department-of-veterans-affairs/mobile-assets@npm:0.6.0":
version: 0.6.0
resolution: "@department-of-veterans-affairs/mobile-assets@npm:0.6.0"
checksum: 9829965e67d806fb3359fa462977d707638937bd93e05c817b9acbf03c4777fa329785fea9e3dd8baadf72e950b0a123e9c66795f372cb8a6a09d500d9de8a58
languageName: node
linkType: hard

Expand Down Expand Up @@ -2098,7 +2098,7 @@ __metadata:
"@babel/plugin-transform-react-jsx": "npm:^7.23.4"
"@babel/preset-env": "npm:^7.23.9"
"@babel/preset-typescript": "npm:^7.23.3"
"@department-of-veterans-affairs/mobile-assets": "npm:^0.4.1"
"@department-of-veterans-affairs/mobile-assets": "npm:0.6.0"
"@department-of-veterans-affairs/mobile-tokens": "npm:0.5.1"
"@expo/metro-runtime": "npm:~3.2.1"
"@expo/webpack-config": "npm:~19.0.1"
Expand Down

0 comments on commit 3f1bbb3

Please sign in to comment.