11 files changed, 39 insertions, 16 deletions
diff --git a/development/sentry-publish.js b/development/sentry-publish.js
index 7a6d55115..e14f3f176 100644
--- a/development/sentry-publish.js
+++ b/development/sentry-publish.js
@@ -14,21 +14,27 @@ async function start () {
   const versionAlreadyExists = await checkIfVersionExists()
   // abort if versions exists
   if (versionAlreadyExists) {
-    console.log(`Version "${VERSION}" already exists on Sentry, aborting sourcemap upload.`)
-    return
+    console.log(`Version "${VERSION}" already exists on Sentry, skipping version creation`)
+  } else {
+     // create sentry release
+    console.log(`creating Sentry release for "${VERSION}"...`)
+    await exec(`sentry-cli releases --org 'metamask' --project 'metamask' new ${VERSION}`)
+    console.log(`removing any existing files from Sentry release "${VERSION}"...`)
+    await exec(`sentry-cli releases --org 'metamask' --project 'metamask' files ${VERSION} delete --all`)
   }
 
-  // create sentry release
-  console.log(`creating Sentry release for "${VERSION}"...`)
-  await exec(`sentry-cli releases --org 'metamask' --project 'metamask' new ${VERSION}`)
-  console.log(`removing any existing files from Sentry release "${VERSION}"...`)
-  await exec(`sentry-cli releases --org 'metamask' --project 'metamask' files ${VERSION} delete --all`)
-  // upload sentry source and sourcemaps
-  console.log(`uploading source files Sentry release "${VERSION}"...`)
-  await exec(`for FILEPATH in ./dist/chrome/*.js; do [ -e $FILEPATH ] || continue; export FILE=\`basename $FILEPATH\` && echo uploading $FILE && sentry-cli releases --org 'metamask' --project 'metamask' files ${VERSION} upload $FILEPATH metamask/$FILE; done;`)
-  console.log(`uploading sourcemaps Sentry release "${VERSION}"...`)
-  await exec(`sentry-cli releases --org 'metamask' --project 'metamask' files ${VERSION} upload-sourcemaps ./dist/sourcemaps/ --url-prefix 'sourcemaps'`)
-  console.log('all done!')
+  // check if version has artifacts or not
+  const versionHasArtifacts = versionAlreadyExists && await checkIfVersionHasArtifacts()
+  if (!versionHasArtifacts) {
+    // upload sentry source and sourcemaps
+    console.log(`uploading source files Sentry release "${VERSION}"...`)
+    await exec(`for FILEPATH in ./dist/chrome/*.js; do [ -e $FILEPATH ] || continue; export FILE=\`basename $FILEPATH\` && echo uploading $FILE && sentry-cli releases --org 'metamask' --project 'metamask' files ${VERSION} upload $FILEPATH metamask/$FILE; done;`)
+    console.log(`uploading sourcemaps Sentry release "${VERSION}"...`)
+    await exec(`sentry-cli releases --org 'metamask' --project 'metamask' files ${VERSION} upload-sourcemaps ./dist/sourcemaps/ --url-prefix 'sourcemaps'`)
+    console.log('all done!')
+  } else {
+    console.log(`Version "${VERSION}" already has artifacts on Sentry, skipping sourcemap upload`)
+  }
 }
 
 async function checkIfAuthWorks () {
@@ -45,6 +51,12 @@ async function checkIfVersionExists () {
   return versionAlreadyExists
 }
 
+async function checkIfVersionHasArtifacts () {
+  const artifacts = await exec(`sentry-cli releases --org 'metamask' --project 'metamask' files ${VERSION} list`)
+  // When there's no artifacts, we get a response from the shell like this ['', '']
+  return artifacts[0] && artifacts[0].length > 0
+}
+
 async function doesNotFail (asyncFn) {
   try {
     await asyncFn()
diff --git a/development/states/add-token.json b/development/states/add-token.json
index 84ad5dd4c..d04b3a3ca 100644
--- a/development/states/add-token.json
+++ b/development/states/add-token.json
@@ -123,6 +123,7 @@
       "modalState": {},
       "previousModalState": {}
     },
+    "sidebar": {},
     "transForward": true,
     "isLoading": false,
     "warning": null,
diff --git a/development/states/confirm-new-ui.json b/development/states/confirm-new-ui.json
index 2c2e17704..fffee9893 100644
--- a/development/states/confirm-new-ui.json
+++ b/development/states/confirm-new-ui.json
@@ -141,6 +141,7 @@
     "accountDetail": {
       "subview": "transactions"
     },
+    "sidebar": {},
     "modal": {
       "modalState": {},
       "previousModalState": {}
diff --git a/development/states/confirm-sig-requests.json b/development/states/confirm-sig-requests.json
index 829f513a8..5017a4d57 100644
--- a/development/states/confirm-sig-requests.json
+++ b/development/states/confirm-sig-requests.json
@@ -162,6 +162,7 @@
     "accountDetail": {
       "subview": "transactions"
     },
+    "sidebar": {},
     "modal": {
       "modalState": {},
       "previousModalState": {}
diff --git a/development/states/currency-localization.json b/development/states/currency-localization.json
index 6848c0840..847ea11a3 100644
--- a/development/states/currency-localization.json
+++ b/development/states/currency-localization.json
@@ -120,6 +120,7 @@
     "accountDetail": {
       "subview": "transactions"
     },
+    "sidebar": {},
     "modal": {
       "modalState": {},
       "previousModalState": {}
diff --git a/development/states/first-time.json b/development/states/first-time.json
index f44148973..a31b985a3 100644
--- a/development/states/first-time.json
+++ b/development/states/first-time.json
@@ -48,6 +48,7 @@
     "accountDetail": {
       "subview": "transactions"
     },
+    "sidebar": {},
     "transForward": true,
     "isLoading": false,
     "warning": null,
diff --git a/development/states/send-edit.json b/development/states/send-edit.json
index 8e5c25a82..6330b777d 100644
--- a/development/states/send-edit.json
+++ b/development/states/send-edit.json
@@ -22,6 +22,7 @@
         "name": "Send Account 4"
       }
     },
+    "assetImages": {},
     "unapprovedTxs": {},
     "currentCurrency": "USD",
     "conversionRate": 1200.88200327,
@@ -141,6 +142,7 @@
     "accountDetail": {
       "subview": "transactions"
     },
+    "sidebar": {},
     "modal": {
       "modalState": {},
       "previousModalState": {}
diff --git a/development/states/send-new-ui.json b/development/states/send-new-ui.json
index ad2ff3d6e..bb4847155 100644
--- a/development/states/send-new-ui.json
+++ b/development/states/send-new-ui.json
@@ -61,6 +61,7 @@
         "name": "Address Book Account 1"
       }
     ],
+    "assetImages": {},
     "tokens": [],
     "transactions": {},
     "selectedAddressTxList": [],
@@ -120,6 +121,7 @@
     "accountDetail": {
       "subview": "transactions"
     },
+    "sidebar": {},
     "modal": {
       "modalState": {},
       "previousModalState": {}
diff --git a/development/states/send.json b/development/states/send.json
index 73ac62f65..4c67f8ac6 100644
--- a/development/states/send.json
+++ b/development/states/send.json
@@ -21,6 +21,7 @@
         "name": "Account 4"
       }
     },
+    "assetImages": {},
     "unapprovedTxs": {},
     "currentCurrency": "USD",
     "conversionRate": 16.88200327,
@@ -99,6 +100,7 @@
       "accountExport": "none",
       "privateKey": ""
     },
+    "sidebar": {},
     "transForward": true,
     "isLoading": false,
     "warning": null,
diff --git a/development/states/tx-list-items.json b/development/states/tx-list-items.json
index f22fd0a56..0d2273cb0 100644
--- a/development/states/tx-list-items.json
+++ b/development/states/tx-list-items.json
@@ -118,6 +118,7 @@
       "modalState": {},
       "previousModalState": {}
     },
+    "sidebar": {},
     "transForward": true,
     "isLoading": false,
     "warning": null,
diff --git a/development/verify-locale-strings.js b/development/verify-locale-strings.js
index 0eef2b35d..0f408ea39 100644
--- a/development/verify-locale-strings.js
+++ b/development/verify-locale-strings.js
@@ -20,7 +20,7 @@ const specifiedLocale = process.argv[2]
 if (specifiedLocale) {
 	console.log(`Verifying selected locale "${specifiedLocale}":\n\n`)
 	const locale = localeIndex.find(localeMeta => localeMeta.code === specifiedLocale)
-	verifyLocale({ locale })
+	verifyLocale(locale)
 } else {
 	console.log('Verifying all locales:\n\n')
 	localeIndex.forEach(localeMeta => {
@@ -30,11 +30,10 @@ if (specifiedLocale) {
 }
 
 
-function verifyLocale ({ localeMeta }) {
+function verifyLocale (localeMeta) {
 	const localeCode = localeMeta.code
 	const localeName = localeMeta.name
 	let targetLocale, englishLocale
-
 	try {
 		const localeFilePath = path.join(process.cwd(), 'app', '_locales', localeCode, 'messages.json')
 		targetLocale = JSON.parse(fs.readFileSync(localeFilePath, 'utf8'))