Skip to content

merge main in staging #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luisburigo merged 6 commits into from
May 8, 2025
Merged

merge main in staging #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1e00c60
Merge pull request #360 from infinitybase/staging
luisburigo Mar 19, 2025
b8831f7
Merge pull request #372 from infinitybase/staging
luisburigo Apr 8, 2025
b72aed2
Merge pull request #374 from infinitybase/staging
luisburigo Apr 15, 2025
22b03e4
Merge pull request #379 from infinitybase/staging
luisburigo May 5, 2025
9cdcfc5
hotfix: improve latest transaction query
luisburigo May 8, 2025
65470bb
hotfix: improve transaction list query
luisburigo May 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions packages/api/src/modules/transaction/services.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,9 @@ export class TransactionService implements ITransactionService {
});

// =============== specific for workspace ===============
if (this._filter.workspaceId || this._filter.signer) {
if (this._filter.signer) {
queryBuilder.andWhere(
new Brackets(qb => {
if (this._filter.workspaceId) {
qb.orWhere('workspace.id IN (:...workspace)', {
workspace: this._filter.workspaceId,
});
}
if (this._filter.signer) {
qb.orWhere('members.address = :signer', {
signer: this._filter.signer,
Expand Down Expand Up @@ -361,11 +356,6 @@ export class TransactionService implements ITransactionService {
if (this._filter.workspaceId || this._filter.signer) {
queryBuilder.andWhere(
new Brackets(qb => {
if (this._filter.workspaceId) {
qb.orWhere('workspace.id IN (:...workspace)', {
workspace: this._filter.workspaceId,
});
}
if (this._filter.signer) {
qb.orWhere('members.address = :signer', {
signer: this._filter.signer,
Expand Down
9 changes: 2 additions & 7 deletions packages/api/src/modules/user/controller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,12 @@ export class UserController {
async meTransactions(req: IMeRequest) {
try {
const { type } = req.query;
const { workspace, user, network } = req;
const { user, network } = req;

const { hasSingle } = await new UserService().workspacesByUser(
workspace,
user,
);
const transactions = await new TransactionService()
.filter({
type,
workspaceId: [workspace.id],
signer: hasSingle ? user.address : undefined,
signer: user.address,
network: network.url,
})
.paginate({ page: '0', perPage: '6' })
Expand Down
Loading