From bc096554b5a617a42adf34c06c912c1cf636ddd5 Mon Sep 17 00:00:00 2001
From: David Sun <me@bydavidsun.com>
Date: Tue, 18 Feb 2020 13:58:22 -0500
Subject: [PATCH] fixed webpack issues

---
 packages/instant/.env_example      | 5 +++--
 packages/instant/webpack.config.js | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/instant/.env_example b/packages/instant/.env_example
index abec4e5970..60c8fa70ef 100644
--- a/packages/instant/.env_example
+++ b/packages/instant/.env_example
@@ -2,9 +2,10 @@ INSTANT_ROLLBAR_PUBLISH_TOKEN=
 INSTANT_ROLLBAR_CLIENT_TOKEN=
 INSTANT_HEAP_ANALYTICS_ID_PRODUCTION=
 INSTANT_HEAP_ANALYTICS_ID_DEVELOPMENT=
+INSTANT_FORTMATIC_API_KEY_PRODUCTION=
+INSTANT_FORTMATIC_API_KEY_DEVELOPMENT=
 INSTANT_INFURA_PROJECT_ID_PRODUCTION=
 INSTANT_INFURA_PROJECT_ID_DEVELOPMENT=
 # if you want to report to heap or rollbar when building in development mode, you can use the following:
 # INSTANT_HEAP_FORCE_DEVELOPMENT=true
-# INSTANT_ROLLBAR_FORCE_DEVELOPMENT=true
-INSTANT_FORTMATIC_API_KEY=
+# INSTANT_ROLLBAR_FORCE_DEVELOPMENT=true
\ No newline at end of file
diff --git a/packages/instant/webpack.config.js b/packages/instant/webpack.config.js
index b5e20d68c7..d1f91a8f9d 100644
--- a/packages/instant/webpack.config.js
+++ b/packages/instant/webpack.config.js
@@ -94,15 +94,18 @@ const generateConfig = (dischargeTarget, heapConfigOptions, rollbarConfigOptions
             ? process.env.INSTANT_INFURA_PROJECT_ID_PRODUCTION
             : process.env.INSTANT_INFURA_PROJECT_ID_DEVELOPMENT;
 
-    const fortmaticApiKey = process.env.INSTANT_FORTMATIC_API_KEY;
+    const fortmaticApiKey =
+        dischargeTarget === 'production'
+        ? process.env.INSTANT_FORTMATIC_API_KEY_PRODUCTION
+        : process.env.INSTANT_FORTMATIC_API_KEY_DEVELOPMENT; 
 
     const envVars = {
         GIT_SHA: JSON.stringify(GIT_SHA),
         NPM_PACKAGE_VERSION: JSON.stringify(process.env.npm_package_version),
         ROLLBAR_ENABLED: rollbarEnabled,
         HEAP_ENABLED: heapEnabled,
+        INSTANT_FORTMATIC_API_KEY: JSON.stringify(fortmaticApiKey),
         INSTANT_INFURA_PROJECT_ID: JSON.stringify(infuraProjectId),
-        INSTANT_FORTMATIC_API_KEY: fortmaticApiKey,
     };
     if (dischargeTarget) {
         envVars.INSTANT_DISCHARGE_TARGET = JSON.stringify(dischargeTarget);