Release: 0.5.4 (#547)

* it returns to the page to show the error code and desc * show the errors depends the code * it returns the emoji but we need to define and tests the other possible errors * added translation - redux function for match the errors - moved emojiError object * removed comments and clgs * added standard in redux/send * merge conflicts solved * fix: refresh button logic / disabled state and animation * Fixed token standard in handleRequestTransfer (#541) Co-authored-by: rocky-fleek <[email protected]> * Chore/fe structure (#546) * renamed Background folder * Deleted @ui folder and moved it to @components * Removed lib folder * Created scripts folder * Created views folder * fix: dont ovewritte whitelist in case is another one present (#523) * Revert "Chore/fe structure (#546)" (#548) This reverts commit 1a55622. Seems there was a merge error and the `Popup/Views` was deleted * Replaced extension 32x32 icon (#549) Co-authored-by: rocky-fleek <[email protected]> * Revert "Revert "Chore/fe structure (#546)" (#548)" (#550) This reverts commit 1fa4118. * details done * removed string and put into translation * updated manually npm * Chore/fe structure (#551) * renamed Background folder * Deleted @ui folder and moved it to @components * Removed lib folder * Created scripts folder * Created views folder * Specified extension folder on gitignore * added extension folder * Removed extension * Moved send flow files to new location * Fixed error matching * Fixed locales error * updated dependencies versions, but no npm * Fixed amount parsing for new ledger interface. refactored flow to use standard scoped parsing * Removed unnecessary object for icp/rosetta txs * Token selection logic / Tests fixes (#557) * chore: token selection logic / test fixes * chore: logs removed * Fixed transactionId and object proptypes * Auto fix with --fix * Fixed remaining issues * Updated controller to 0.19.8 and bumped plug version to 0.5.4 * Moved whitelist population to requestConnect * Removed whitelist population * fix: DIP20_AMOUNT_MAP * Fix/timeout on get balances (#572) * Fixed error parsing to take into account Error in amount field * Changed fetchAssets to take into account assets loading Co-authored-by: Cancu <[email protected]> Co-authored-by: Max ⚡️ <[email protected]> Co-authored-by: Cancu <[email protected]> Co-authored-by: tomiir <[email protected]> Co-authored-by: angarita-dev <[email protected]> Co-authored-by: Alejo Acevedo <[email protected]> Co-authored-by: Alina Sytnik <[email protected]>
Psychedelic · Aug 25, 2022 · 7ab980e · 7ab980e
1 parent b13b2ca
commit 7ab980e
Show file tree

Hide file tree

Showing 333 changed files with 1,672 additions and 1,534 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -47,7 +47,6 @@ module.exports = {
     'import/resolver': {
       alias: {
         map: [
-          ['@ui', './source/ui'],
           ['@components', './source/components'],
           ['@modules', './source/Modules'],
           ['@assets', './source/assets'],

diff --git a/.gitignore b/.gitignore
@@ -102,6 +102,9 @@ public/
 
 ## Build directory
 extension/
+!source/views/Extension
+!source/views/Extension/*
+!source/views/Extension/**
 dist/
 .awcache
 

diff --git a/.storybook/main.js b/.storybook/main.js
@@ -29,7 +29,6 @@ module.exports = {
     ];
 
     config.resolve.alias = {
-      "@ui": path.join(path.resolve(__dirname, "../source/ui")),
       "@components": path.join(path.resolve(__dirname, "../source/components")),
       "@assets": path.join(path.resolve(__dirname, "../source/assets")),
       "@shared": path.join(path.resolve(__dirname, "../source/shared")),

diff --git a/jsconfig.json b/jsconfig.json
@@ -2,8 +2,6 @@
   "compilerOptions": {
     "baseUrl": "./",
     "paths": {
-      "@ui": ["source/ui"],
-      "@ui/*": ["source/ui/*"],
       "@components": ["source/components"],
       "@components/*": ["source/components/*"],
       "@assets": ["source/assets"],
@@ -14,8 +12,8 @@
       "@hooks/*": ["source/hooks/*"],
       "@redux": ["source/redux"],
       "@redux/*": ["source/redux/*"],
-      "@background": ["source/Background"],
-      "@background/*": ["source/Background/*"],
+      "@background": ["source/background"],
+      "@background/*": ["source/background/*"],
       "@modules/*": ["source/Modules/*"]
     }
   },

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "plug",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "Your plug into the Internet Computer",
   "private": true,
   "repository": "https://github.com/Psychedelic/plug",
@@ -38,7 +38,7 @@
     "@metamask/post-message-stream": "^4.0.0",
     "@psychedelic/browser-rpc": "2.1.0",
     "@psychedelic/dab-js": "1.4.5",
-    "@psychedelic/plug-controller": "0.19.7",
+    "@psychedelic/plug-controller": "0.19.8",
     "@psychedelic/plug-inpage-provider": "^2.3.0",
     "@reduxjs/toolkit": "^1.6.0",
     "advanced-css-reset": "^1.2.2",

diff --git a/source/Background/script.js b/source/Background/script.js
@@ -6,9 +6,9 @@ import {
   ConnectionModule,
   TransactionModule,
   InformationModule,
+  NotificationManager,
 } from '@modules';
 
-import NotificationManager from '../lib/NotificationManager';
 import {
   getKeyringHandler,
   HANDLER_TYPES,

diff --git a/source/Background/utils.js b/source/Background/utils.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import PlugController from '@psychedelic/plug-controller';
 
 import { validateCanisterId, validatePrincipalId, validateAccountId } from '@shared/utils/ids';
@@ -183,7 +184,7 @@ export const handleCallRequest = async ({
     if (redirected) callback(null, true);
     return true;
   } catch (e) {
-    console.log('Error when executing update transaction', e);
+    console.warn('Error when executing update transaction', e);
     callback(ERRORS.SERVER_ERROR(e), null, [{ portId, callId }]);
     if (redirected) callback(null, false);
     return false;

diff --git a/source/Modules/Controller/connection.js b/source/Modules/Controller/connection.js
@@ -9,7 +9,8 @@ import {
   getApp,
   removeApp,
 } from '../storageManager';
-import SIZES from '../../Pages/Notification/components/Transfer/constants';
+import SIZES from '../../views/Popup/components/Transfer/constants';
+
 import { ControllerModuleBase } from './controllerBase';
 
 export class ConnectionModule extends ControllerModuleBase {
@@ -130,6 +131,11 @@ export class ConnectionModule extends ControllerModuleBase {
 
         const date = new Date().toISOString();
 
+        const populatedWhitelist = canistersInfo.reduce(
+          (accum, canisterInfo) => ({ ...accum, [canisterInfo.id]: canisterInfo }),
+          {},
+        );
+
         getApps(this.keyring?.currentWalletId.toString(), (apps = {}) => {
           const newApps = {
             ...apps,
@@ -143,7 +149,7 @@ export class ConnectionModule extends ControllerModuleBase {
               events: [
                 ...apps[domainUrl]?.events || [],
               ],
-              whitelist,
+              whitelist: populatedWhitelist,
               host,
             },
           };
@@ -208,7 +214,7 @@ export class ConnectionModule extends ControllerModuleBase {
             ? CONNECTION_STATUS.accepted
             : response.status;
           const whitelist = response.status === CONNECTION_STATUS.accepted
-            ? response.whitelist
+            ? apps[url]?.whitelist
             : [];
 
           const date = new Date().toISOString();
@@ -219,7 +225,7 @@ export class ConnectionModule extends ControllerModuleBase {
               ...apps[url],
               status: status || CONNECTION_STATUS.rejected,
               date,
-              whitelist,
+              whitelist: { ...apps[url]?.whitelist, ...whitelist },
               events: [
                 ...apps[url]?.events || [],
                 {

diff --git a/source/Modules/Controller/controllerBase.js b/source/Modules/Controller/controllerBase.js
@@ -3,7 +3,7 @@ import extension from 'extensionizer';
 
 import { checkPendingTransaction, createPendingTransaction, removePendingTransaction } from '@modules/storageManager';
 import ERRORS from '@background/errors';
-import SIZES from '../../Pages/Notification/components/Transfer/constants';
+import SIZES from '../../views/Popup/components/Transfer/constants';
 
 export class ControllerModuleBase {
   constructor(backgroundController, secureController, keyring) {

diff --git a/source/Modules/Controller/transaction.js b/source/Modules/Controller/transaction.js
@@ -18,7 +18,8 @@ import { XTC_FEE } from '@shared/constants/addresses';
 import { getKeyringHandler, HANDLER_TYPES } from '@background/Keyring';
 import { blobFromBuffer, blobToUint8Array } from '@dfinity/candid';
 
-import SIZES from '../../Pages/Notification/components/Transfer/constants';
+import SIZES from '../../views/Popup/components/Transfer/constants';
+
 import {
   getBatchTransactions, getProtectedIds, setBatchTransactions, getApp,
 } from '../storageManager';
@@ -136,7 +137,7 @@ export class TransactionModule extends ControllerModuleBase {
               ...transfer,
               amount: parsedAmount,
               canisterId: ICP_CANISTER_ID,
-              standard: 'icp',
+              standard: 'ROSETTA',
             });
 
             if (response.error) {

diff --git a/source/lib/NotificationManager.js → source/Modules/NotificationManager.js b/source/lib/NotificationManager.js → source/Modules/NotificationManager.js
@@ -1,6 +1,6 @@
 import extension from 'extensionizer';
 
-class NotificationManager {
+export class NotificationManager {
   constructor(image) {
     this.iconUrl = image;
   }

diff --git a/source/Modules/index.js b/source/Modules/index.js
@@ -2,3 +2,4 @@ export * from './storageManager';
 export * from './Controller/connection';
 export * from './Controller/transaction';
 export * from './Controller/information';
+export * from './NotificationManager';