Skip to content

Commit

Permalink
Merge pull request #460 from torusresearch/develop
Browse files Browse the repository at this point in the history
Release
  • Loading branch information
himanshuchawla009 authored Dec 2, 2024
2 parents cea9330 + 35a31d9 commit cee8156
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"files.trimFinalNewlines": true,
"files.insertFinalNewline": true,
"editor.codeActionsOnSave": {
"source.fixAll": true
}
"source.fixAll": "explicit"
}
}
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Copyright Web3Auth Inc. 2022. All rights reserved.
Copyright Torus Labs Private Limited 2022. All rights reserved.

You acknowledge and agree that Web3Auth Inc. (Web3Auth) (or Web3Auth's licensors) own all legal rights, titles and interests in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.
You acknowledge and agree that Torus Labs Private Limited (Web3Auth) (or Web3Auth's licensors) own all legal rights, titles and interests in and to the work, software, application, source code, documentation and any other documents in this repository (collectively, the “Program”), including any intellectual property rights which subsist in the Program (whether those rights happen to be registered or not, and wherever in the world those rights may exist), whether in source code or any other form.

Subject to the limited license below, you may not (and you may not permit anyone else to) distribute, publish, copy, modify, merge, combine with another program, create derivative works of, reverse engineer, decompile or otherwise attempt to extract the source code of, the Program or any part thereof, except that you may contribute to this repository.

Expand Down
9 changes: 9 additions & 0 deletions src/globalValue.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { broadcastChannelOptions } from "@toruslabs/base-controllers";
import { MethodType } from "@toruslabs/broadcast-channel";

(
broadcastChannelOptions as {
type?: MethodType;
webWorkerSupport: boolean;
}
).type = undefined;
3 changes: 3 additions & 0 deletions src/main.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// eslint-disable-next-line
import "@/globalValue";

import "@/main.css";

import { createGtm } from "@gtm-support/vue-gtm";
Expand Down
15 changes: 11 additions & 4 deletions src/pages/wallet/Transfer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -389,10 +389,17 @@ const confirmTransfer = async () => {
});
} catch (error) {
log.error(error);
showMessageModal({
messageTitle: `${t("walletTransfer.submitFailed")}: ${(error as Error)?.message || t("walletSettings.somethingWrong")}`,
messageStatus: STATUS.ERROR,
});
if ((error as Error).message.match("found no record of a prior credit")) {
showMessageModal({
messageTitle: t("walletTransfer.insufficientSol"),
messageStatus: STATUS.ERROR,
});
} else {
showMessageModal({
messageTitle: `${t("walletTransfer.submitFailed")}: ${(error as Error)?.message || t("walletSettings.somethingWrong")}`,
messageStatus: STATUS.ERROR,
});
}
}
};
Expand Down

0 comments on commit cee8156

Please sign in to comment.