Merge branch 'master' into bugfix

near · Jun 20, 2022 · cd52252 · cd52252
2 parents 192eacc + 02eb865
commit cd52252
Show file tree

Hide file tree

Showing 92 changed files with 2,629 additions and 1,243 deletions.
diff --git a/features/features.d.ts b/features/features.d.ts
@@ -2,11 +2,6 @@
 /* This file is generated by the flag editor util. Changes will be lost! */
 
 export type Features = {
-    CREATE_IMPLICIT_ACCOUNT: boolean;
-	CREATE_USN_CONTRACT: boolean;
+    CREATE_USN_CONTRACT: boolean;
 	DONATE_TO_UKRAINE: boolean;
-	EXAMPLE_FLAG: boolean;
-	FARMING_VALIDATOR_APY_DISPLAY: boolean;
-	IMPORT_ACCOUNT_WITH_LINK_V2: boolean;
-	IMPORT_ZERO_BALANCE_ACCOUNT: boolean;
 };
diff --git a/features/flags.json b/features/flags.json
@@ -1,48 +1,4 @@
 {
-  "CREATE_IMPLICIT_ACCOUNT": {
-    "createdBy": "Patrick Tajima",
-    "createdAt": "2021-12-23T22:16:36.291Z",
-    "development": {
-      "enabled": true,
-      "lastEditedBy": "Patrick Tajima",
-      "lastEditedAt": "2021-12-23T22:16:36.291Z"
-    },
-    "testnet": {
-      "enabled": true,
-      "lastEditedBy": "Daryl Collins",
-      "lastEditedAt": "2022-01-21T05:04:22.473Z"
-    },
-    "mainnet": {
-      "enabled": true,
-      "lastEditedBy": "Daryl Collins",
-      "lastEditedAt": "2022-01-21T05:04:22.473Z"
-    },
-    "mainnet_STAGING": {
-      "enabled": true,
-      "lastEditedBy": "Patrick Tajima",
-      "lastEditedAt": "2021-12-23T22:16:36.291Z"
-    },
-    "testnet_STAGING": {
-      "enabled": true,
-      "lastEditedBy": "Andy Haynes",
-      "lastEditedAt": "2022-01-31T21:13:09.948Z"
-    },
-    "testnet_NEARORG": {
-      "enabled": true,
-      "lastEditedBy": "esaminu",
-      "lastEditedAt": "2022-05-05T18:07:50.110Z"
-    },
-    "mainnet_NEARORG": {
-      "enabled": true,
-      "lastEditedBy": "esaminu",
-      "lastEditedAt": "2022-05-05T18:06:54.374Z"
-    },
-    "mainnet_STAGING_NEARORG": {
-      "enabled": true,
-      "lastEditedBy": "esaminu",
-      "lastEditedAt": "2022-05-05T18:07:28.665Z"
-    }
-  },
   "CREATE_USN_CONTRACT": {
     "createdBy": "OlegYak ",
     "createdAt": "2022-03-24T13:11:21.223Z",
@@ -131,180 +87,48 @@
       "lastEditedAt": "2022-05-10T17:07:20.351Z"
     }
   },
-  "EXAMPLE_FLAG": {
-    "createdBy": "Daryl Collins",
-    "createdAt": "2021-05-24T09:33:27.489Z",
+  "SHOW_MIGRATION_BANNER": {
+    "createdBy": "gutsyphilip",
+    "createdAt": "2022-05-25T01:11:55.121Z",
     "development": {
       "enabled": true,
-      "lastEditedBy": "Daryl Collins",
-      "lastEditedAt": "2021-05-24T09:33:27.489Z"
+      "lastEditedBy": "gutsyphilip",
+      "lastEditedAt": "2022-05-25T01:11:55.121Z"
     },
     "testnet": {
       "enabled": true,
-      "lastEditedBy": "Daryl Collins",
-      "lastEditedAt": "2021-11-09T04:34:12.847Z"
+      "lastEditedBy": "gutsyphilip",
+      "lastEditedAt": "2022-05-25T01:11:55.121Z"
     },
     "mainnet": {
-      "enabled": true,
-      "lastEditedBy": "Andy Haynes",
-      "lastEditedAt": "2021-10-22T23:08:35.672Z"
+      "enabled": false,
+      "lastEditedBy": "gutsyphilip",
+      "lastEditedAt": "2022-05-25T01:11:55.121Z"
     },
     "mainnet_STAGING": {
       "enabled": false,
-      "lastEditedBy": "Daryl Collins",
-      "lastEditedAt": "2021-05-24T09:33:27.489Z"
+      "lastEditedBy": "gutsyphilip",
+      "lastEditedAt": "2022-05-25T01:11:55.121Z"
     },
     "testnet_STAGING": {
-      "enabled": true,
-      "lastEditedBy": "Andy Haynes",
-      "lastEditedAt": "2022-01-31T21:13:09.948Z"
-    },
-    "testnet_NEARORG": {
-      "enabled": true,
-      "lastEditedBy": "esaminu",
-      "lastEditedAt": "2022-05-05T18:07:50.110Z"
-    },
-    "mainnet_NEARORG": {
-      "enabled": true,
-      "lastEditedBy": "esaminu",
-      "lastEditedAt": "2022-05-05T18:06:54.374Z"
-    },
-    "mainnet_STAGING_NEARORG": {
       "enabled": false,
-      "lastEditedBy": "esaminu",
-      "lastEditedAt": "2022-05-05T18:07:28.665Z"
-    }
-  },
-  "FARMING_VALIDATOR_APY_DISPLAY": {
-    "createdBy": "esaminu",
-    "createdAt": "2022-03-09T21:26:58.971Z",
-    "development": {
-      "enabled": true,
-      "lastEditedBy": "Arsen Kulikov",
-      "lastEditedAt": "2022-03-22T20:12:55.968Z"
-    },
-    "testnet": {
-      "enabled": true,
-      "lastEditedBy": "Arsen Kulikov",
-      "lastEditedAt": "2022-03-22T20:12:55.968Z"
-    },
-    "mainnet": {
-      "enabled": true,
-      "lastEditedBy": "Arsen Kulikov",
-      "lastEditedAt": "2022-03-22T20:12:55.968Z"
-    },
-    "mainnet_STAGING": {
-      "enabled": true,
-      "lastEditedBy": "Arsen Kulikov",
-      "lastEditedAt": "2022-03-22T20:12:55.968Z"
-    },
-    "testnet_STAGING": {
-      "enabled": true,
-      "lastEditedBy": "Arsen Kulikov",
-      "lastEditedAt": "2022-03-22T20:12:55.968Z"
+      "lastEditedBy": "gutsyphilip",
+      "lastEditedAt": "2022-05-25T01:11:55.121Z"
     },
     "testnet_NEARORG": {
       "enabled": true,
-      "lastEditedBy": "esaminu",
-      "lastEditedAt": "2022-05-05T18:07:50.110Z"
-    },
-    "mainnet_NEARORG": {
-      "enabled": true,
-      "lastEditedBy": "esaminu",
-      "lastEditedAt": "2022-05-05T18:06:54.374Z"
-    },
-    "mainnet_STAGING_NEARORG": {
-      "enabled": true,
-      "lastEditedBy": "esaminu",
-      "lastEditedAt": "2022-05-05T18:07:28.665Z"
-    }
-  },
-  "IMPORT_ACCOUNT_WITH_LINK_V2": {
-    "createdBy": "Patrick Tajima",
-    "createdAt": "2022-03-12T01:30:32.577Z",
-    "development": {
-      "enabled": true,
-      "lastEditedBy": "Patrick Tajima",
-      "lastEditedAt": "2022-03-12T01:30:32.577Z"
-    },
-    "testnet": {
-      "enabled": true,
-      "lastEditedBy": "Patrick Tajima",
-      "lastEditedAt": "2022-04-07T02:50:24.122Z"
-    },
-    "mainnet": {
-      "enabled": true,
-      "lastEditedBy": "Patrick Tajima",
-      "lastEditedAt": "2022-04-07T02:50:24.123Z"
-    },
-    "mainnet_STAGING": {
-      "enabled": true,
-      "lastEditedBy": "Patrick Tajima",
-      "lastEditedAt": "2022-04-07T02:50:24.123Z"
-    },
-    "testnet_STAGING": {
-      "enabled": true,
-      "lastEditedBy": "Patrick Tajima",
-      "lastEditedAt": "2022-04-07T02:50:24.123Z"
-    },
-    "testnet_NEARORG": {
-      "enabled": true,
-      "lastEditedBy": "esaminu",
-      "lastEditedAt": "2022-05-05T18:07:50.110Z"
+      "lastEditedBy": "gutsyphilip",
+      "lastEditedAt": "2022-05-25T01:11:55.121Z"
     },
     "mainnet_NEARORG": {
       "enabled": true,
-      "lastEditedBy": "esaminu",
-      "lastEditedAt": "2022-05-05T18:06:54.374Z"
-    },
-    "mainnet_STAGING_NEARORG": {
-      "enabled": true,
-      "lastEditedBy": "esaminu",
-      "lastEditedAt": "2022-05-05T18:07:28.665Z"
-    }
-  },
-  "IMPORT_ZERO_BALANCE_ACCOUNT": {
-    "createdBy": "Patrick Tajima",
-    "createdAt": "2022-05-06T17:30:49.430Z",
-    "development": {
-      "enabled": true,
-      "lastEditedBy": "Patrick Tajima",
-      "lastEditedAt": "2022-05-24T23:56:29.721Z"
-    },
-    "testnet": {
-      "enabled": true,
-      "lastEditedBy": "Patrick Tajima",
-      "lastEditedAt": "2022-05-24T23:56:29.721Z"
-    },
-    "mainnet": {
-      "enabled": true,
-      "lastEditedBy": "Patrick Tajima",
-      "lastEditedAt": "2022-05-27T17:30:49.430Z"
-    },
-    "mainnet_STAGING": {
-      "enabled": true,
-      "lastEditedBy": "Patrick Tajima",
-      "lastEditedAt": "2022-05-24T23:56:29.721Z"
-    },
-    "testnet_STAGING": {
-      "enabled": true,
-      "lastEditedBy": "Patrick Tajima",
-      "lastEditedAt": "2022-05-24T23:56:29.721Z"
-    },
-    "testnet_NEARORG": {
-      "enabled": true,
-      "lastEditedBy": "Patrick Tajima",
-      "lastEditedAt": "2022-05-24T23:56:29.721Z"
-    },
-    "mainnet_NEARORG": {
-      "enabled": true,
-      "lastEditedBy": "esaminu",
-      "lastEditedAt": "2022-05-27T23:34:05.414Z"
+      "lastEditedBy": "gutsyphilip",
+      "lastEditedAt": "2022-05-25T01:11:55.121Z"
     },
     "mainnet_STAGING_NEARORG": {
       "enabled": true,
-      "lastEditedBy": "Patrick Tajima",
-      "lastEditedAt": "2022-05-24T23:56:29.721Z"
+      "lastEditedBy": "gutsyphilip",
+      "lastEditedAt": "2022-05-25T01:11:55.121Z"
     }
   }
 }
diff --git a/packages/feature-flags/src/index.js b/packages/feature-flags/src/index.js
@@ -4,7 +4,10 @@ function initFeatureFlags({ flagState, currentEnvironment, environments }) {
     }
 
     if (!Object.values(environments).includes(currentEnvironment)) {
-        throw Error(`invalid environment: "${currentEnvironment}"`);
+        throw Error(`
+invalid environment "${currentEnvironment}", the NEAR_WALLET_ENV environment variable must be set to one of:
+${Object.values(environments).join(', ')}
+        `);
     }
 
     return new Proxy(flagState, {

diff --git a/packages/frontend/jest.config.js b/packages/frontend/jest.config.js
@@ -1,4 +1,8 @@
 module.exports = {
     setupFilesAfterEnv: ['./jest.setup.js'],
     setupFiles: ['dotenv/config'],
+    testEnvironment: 'jsdom',
+    moduleNameMapper: {
+        '^.+\\.svg$': 'jest-svg-transformer'
+    }
 };
diff --git a/packages/frontend/netlify.toml b/packages/frontend/netlify.toml
@@ -26,7 +26,7 @@
     NETLIFY_USE_YARN = "true"
 
 [context.production.environment]
-    BROWSER_MIXPANEL_TOKEN = "d5bbbbcc3a77ef8427f2b806b5689bf8"
+    BROWSER_MIXPANEL_TOKEN = "7c5730e5b3556a06b73829b3c3b40a86"
     SENTRY_PROJECT = "mainnet-wallet"
 
 [[headers]]

diff --git a/packages/frontend/package.json b/packages/frontend/package.json
@@ -60,7 +60,8 @@
     "regenerator-runtime": "^0.13.5",
     "reselect": "^4.0.0",
     "styled-components": "^5.3.0",
-    "timeago.js": "^4.0.2"
+    "timeago.js": "^4.0.2",
+    "use-immer": "^0.7.0"
   },
   "scripts": {
     "predeploy": "yarn build",
@@ -105,6 +106,7 @@
     "eslint-plugin-jsx-a11y": "^6.4.1",
     "eslint-plugin-react": "^7.23.2",
     "jest": "^27.0.1",
+    "jest-svg-transformer": "^1.0.0",
     "parcel-bundler": "^1.12.4",
     "parcel-plugin-bundle-visualiser": "^1.2.0",
     "react-is": "^17.0.2"

diff --git a/packages/frontend/src/ExampleFlag.js b/packages/frontend/src/ExampleFlag.js