chore: fix origin/main merge conflicts

kibis-is · Feb 16, 2024 · 5fd6865 · 5fd6865
2 parents 63414d6 + a421832
commit 5fd6865
Show file tree

Hide file tree

Showing 62 changed files with 1,749 additions and 1,189 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report_template.yml b/.github/ISSUE_TEMPLATE/bug_report_template.yml
@@ -26,6 +26,7 @@ body:
       label: Version
       description: What version of the software are you running?
       options:
+        - 1.11.1
         - 1.11.0
         - 1.10.1
         - 1.10.0

diff --git a/.github/actions/publish-to-chrome-web-store/index.ts b/.github/actions/publish-to-chrome-web-store/index.ts
@@ -1,5 +1,4 @@
 import { info, setFailed } from '@actions/core';
-import styles from 'ansi-styles';
 import { Stats } from 'node:fs';
 import { stat } from 'node:fs/promises';
 import { resolve } from 'node:path';
@@ -19,6 +18,7 @@ import {
 } from './utils';
 
 (async () => {
+  const styles = (await import('ansi-styles')).default;
   const infoPrefix: string = `${styles.yellow.open}[INFO]${styles.yellow.close}`;
   let accessToken: string;
   let zipPath: string;

diff --git a/.github/actions/publish-to-chrome-web-store/tsconfig.json b/.github/actions/publish-to-chrome-web-store/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "allowJs": true,
     "allowSyntheticDefaultImports": true,
     "allowUnreachableCode": false,
     "alwaysStrict": true,
@@ -10,8 +11,8 @@
     "incremental": true,
     "isolatedModules": true,
     "lib": ["ESNext"],
-    "module": "CommonJS",
-    "moduleResolution": "Node",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "noImplicitAny": true,
     "noImplicitReturns": true,
     "noImplicitThis": true,

diff --git a/.github/actions/publish-to-firefox-add-ons/index.ts b/.github/actions/publish-to-firefox-add-ons/index.ts
@@ -1,5 +1,4 @@
 import { info, setFailed } from '@actions/core';
-import styles from 'ansi-styles';
 import { Stats } from 'node:fs';
 import { stat } from 'node:fs/promises';
 import { resolve } from 'node:path';
@@ -14,6 +13,7 @@ import { ActionError } from './errors';
 import { createJwt, handleError, publish, uploadZipFile } from './utils';
 
 (async () => {
+  const styles = (await import('ansi-styles')).default;
   const infoPrefix: string = `${styles.yellow.open}[INFO]${styles.yellow.close}`;
   let jwt: string;
   let uploadUuid: string;

diff --git a/.github/actions/publish-to-firefox-add-ons/tsconfig.json b/.github/actions/publish-to-firefox-add-ons/tsconfig.json
@@ -10,8 +10,8 @@
     "incremental": true,
     "isolatedModules": true,
     "lib": ["ESNext"],
-    "module": "CommonJS",
-    "moduleResolution": "Node",
+    "module": "Node16",
+    "moduleResolution": "Node16",
     "noImplicitAny": true,
     "noImplicitReturns": true,
     "noImplicitThis": true,

diff --git a/.github/actions/publish-to-microsoft-edge-add-ons/index.ts b/.github/actions/publish-to-microsoft-edge-add-ons/index.ts
@@ -1,5 +1,4 @@
 import { info, setFailed } from '@actions/core';
-import styles from 'ansi-styles';
 import { Stats } from 'node:fs';
 import { stat } from 'node:fs/promises';
 import { resolve } from 'node:path';
@@ -19,6 +18,7 @@ import {
 } from './utils';
 
 (async () => {
+  const styles = (await import('ansi-styles')).default;
   const infoPrefix: string = `${styles.yellow.open}[INFO]${styles.yellow.close}`;
   let accessToken: string;
   let operationId: string;

diff --git a/.github/actions/publish-to-microsoft-edge-add-ons/tsconfig.json b/.github/actions/publish-to-microsoft-edge-add-ons/tsconfig.json
@@ -10,8 +10,8 @@
     "incremental": true,
     "isolatedModules": true,
     "lib": ["ESNext"],
-    "module": "CommonJS",
-    "moduleResolution": "Node",
+    "module": "Node16",
+    "moduleResolution": "Node16",
     "noImplicitAny": true,
     "noImplicitReturns": true,
     "noImplicitThis": true,

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,13 @@
 
 * support arc-0026 (algorand) and arc-0300 (avm) schemes ([#163](https://github.com/agoralabs-sh/kibisis-web-extension/issues/163)) ([71526c7](https://github.com/agoralabs-sh/kibisis-web-extension/commit/71526c7b0b006f3f16ceaca0af51ffcc12592074))
 
+## [1.11.1](https://github.com/agoralabs-sh/kibisis-web-extension/compare/v1.11.0...v1.11.1) (2024-02-16)
+
+
+### Bug Fixes
+
+* allow groups of single/atomic transactions ([#172](https://github.com/agoralabs-sh/kibisis-web-extension/issues/172)) ([722f9c2](https://github.com/agoralabs-sh/kibisis-web-extension/commit/722f9c28b77f703c7ac3ebde07968d2156a31d20))
+
 # [1.11.0](https://github.com/agoralabs-sh/kibisis-web-extension/compare/v1.10.1...v1.11.0) (2024-02-08)
 
 

diff --git a/dapp-example/components/ApplicationActionsTab/ApplicationActionsTab.tsx b/dapp-example/components/ApplicationActionsTab/ApplicationActionsTab.tsx
@@ -41,9 +41,9 @@ import { IAccountInformation } from '../../types';
 // utils
 import convertToStandardUnit from '@common/utils/convertToStandardUnit';
 import {
-  algorandProviderSignTxns,
+  signAlgorandProviderTransactions,
   createAppCallTransaction,
-  useWalletSignTxns,
+  useUseWalletSignTxns,
 } from '../../utils';
 
 interface IProps {
@@ -104,7 +104,9 @@ const ApplicationActionsTab: FC<IProps> = ({
 
         switch (connectionType) {
           case ConnectionTypeEnum.AlgorandProvider:
-            result = await algorandProviderSignTxns([unsignedTransaction]);
+            result = await signAlgorandProviderTransactions([
+              unsignedTransaction,
+            ]);
 
             if (!result) {
               toast({
@@ -119,7 +121,7 @@ const ApplicationActionsTab: FC<IProps> = ({
 
             break;
           case ConnectionTypeEnum.UseWallet:
-            result = await useWalletSignTxns(
+            result = await useUseWalletSignTxns(
               signTransactions,
               [0],
               [encodeUnsignedTransaction(unsignedTransaction)]

diff --git a/dapp-example/components/AssetActionsTab/AssetActionsTab.tsx b/dapp-example/components/AssetActionsTab/AssetActionsTab.tsx
@@ -52,13 +52,13 @@ import { IAccountInformation, IAssetInformation } from '../../types';
 import convertToAtomicUnit from '@common/utils/convertToAtomicUnit';
 import convertToStandardUnit from '@common/utils/convertToStandardUnit';
 import {
-  algorandProviderSignTxns,
+  signAlgorandProviderTransactions,
   createAssetConfigTransaction,
   createAssetCreateTransaction,
   createAssetDestroyTransaction,
   createAssetFreezeTransaction,
   createAssetTransferTransaction,
-  useWalletSignTxns,
+  useUseWalletSignTxns,
 } from '../../utils';
 
 interface IProps {
@@ -229,7 +229,9 @@ const AssetActionsTab: FC<IProps> = ({
 
         switch (connectionType) {
           case ConnectionTypeEnum.AlgorandProvider:
-            result = await algorandProviderSignTxns([unsignedTransaction]);
+            result = await signAlgorandProviderTransactions([
+              unsignedTransaction,
+            ]);
 
             if (!result) {
               toast({
@@ -244,7 +246,7 @@ const AssetActionsTab: FC<IProps> = ({
 
             break;
           case ConnectionTypeEnum.UseWallet:
-            result = await useWalletSignTxns(
+            result = await useUseWalletSignTxns(
               signTransactions,
               [0],
               [encodeUnsignedTransaction(unsignedTransaction)]
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ body: @@
           label: Version
           description: What version of the software are you running?
           options:
+            - 1.11.1
             - 1.11.0
             - 1.10.1
             - 1.10.0
@@ Expand Down @@